You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/18 06:32:20 UTC

[isis] branch v2-antora updated (8c64d86 -> f6c9429)

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

danhaywood pushed a change to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 8c64d86  ISIS-2062: splits ug into separate components
     new d266d5a  ISIS-2062: moves unittestsupport and integtestsupport into subdirectory
     new df53c64  ISIS-2062: ISIS-2062: moves viewer-restfulobjects-* into own subdir
     new 6adeb55  ISIS-2062: ISIS-2062: moves viewer-wicket-* into own subdir
     new be00768  ISIS-2062: moves ug-vw alongside code, and renames to just 'Wicket Viewer'.
     new 3d58ce2  ISIS-2062: moves ug-vro alongside code, and renames to just 'Restful Objects Viewer'.
     new 26beca1  ISIS-2062: moves plugins/jdo-* into own subdir
     new 182353d  ISIS-2062: moves ug-odn alongside code, and renames to just 'DataNucleus ObjectStore".
     new e144172  ISIS-2062: moves core/security to core/security/api-and-bypass
     new 792eaca  ISIS-2062: moves plugins/security-shiro to core/security/plugins/shiro
     new 30a7024  ISIS-2062: moves ug-sec alongside code, and renames to just 'Security" (and changes ug-sec to security)
     new 47fd428  ISIS-2062: moves ug-tst alongside code, and renames to just 'Testing" (and changes ug-tst to testing)
     new 9c52630  ISIS-2062: moves ug alongside code, renamed to _adoc-ug
     new f6c9429  ISIS-2062: moves rg alongside code, renamed to _adoc-rg

The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 antora/components/rg/modules/ROOT/pages/about.adoc |  29 -
 antora/components/rg/modules/ant/pages/Action.adoc | 135 ---
 .../rg/modules/ant/pages/Action/hidden.adoc        |  55 --
 .../rg/modules/ant/pages/Action/semantics.adoc     |  89 --
 .../rg/modules/ant/pages/ActionLayout.adoc         | 113 ---
 .../ant/pages/ActionLayout/bookmarking.adoc        |  58 --
 .../modules/ant/pages/ActionLayout/cssClass.adoc   |  42 -
 .../modules/ant/pages/ActionLayout/cssClassFa.adoc |  41 -
 .../ant/pages/ActionLayout/describedAs.adoc        |  38 -
 .../rg/modules/ant/pages/ActionLayout/hidden.adoc  |  59 --
 .../rg/modules/ant/pages/ActionLayout/named.adoc   |  46 -
 .../modules/ant/pages/ActionLayout/position.adoc   |  72 --
 .../ant/pages/ActionLayout/promptStyle.adoc        |  60 --
 .../modules/ant/pages/ActionLayout/redirect.adoc   |  60 --
 .../modules/ant/pages/Collection/domainEvent.adoc  | 175 ----
 .../rg/modules/ant/pages/Collection/editing.adoc   |  56 --
 .../rg/modules/ant/pages/Collection/hidden.adoc    |  61 --
 .../rg/modules/ant/pages/CollectionLayout.adoc     | 110 ---
 .../ant/pages/CollectionLayout/cssClass.adoc       |  39 -
 .../ant/pages/CollectionLayout/defaultView.adoc    |  37 -
 .../ant/pages/CollectionLayout/describedAs.adoc    |  29 -
 .../modules/ant/pages/CollectionLayout/hidden.adoc |  61 --
 .../modules/ant/pages/CollectionLayout/named.adoc  |  53 --
 .../modules/ant/pages/CollectionLayout/paged.adoc  |  44 -
 .../ant/pages/CollectionLayout/sortedBy.adoc       |  48 --
 .../rg/modules/ant/pages/Discriminator.adoc        |  72 --
 .../modules/ant/pages/DomainObject/bounding.adoc   |  38 -
 .../modules/ant/pages/DomainObject/objectType.adoc |  62 --
 .../rg/modules/ant/pages/DomainObjectLayout.adoc   | 124 ---
 .../ant/pages/DomainObjectLayout/bookmarking.adoc  |  69 --
 .../ant/pages/DomainObjectLayout/describedAs.adoc  |  32 -
 .../ant/pages/DomainObjectLayout/paged.adoc        |  40 -
 .../rg/modules/ant/pages/DomainService.adoc        |  67 --
 .../rg/modules/ant/pages/DomainService/nature.adoc |  92 --
 .../ant/pages/DomainService/objectType.adoc        |  56 --
 .../rg/modules/ant/pages/DomainServiceLayout.adoc  |  73 --
 .../ant/pages/DomainServiceLayout/menuBar.adoc     |  41 -
 .../ant/pages/DomainServiceLayout/menuOrder.adoc   |  67 --
 .../components/rg/modules/ant/pages/HomePage.adoc  |  50 --
 antora/components/rg/modules/ant/pages/Inject.adoc | 145 ----
 .../rg/modules/ant/pages/MemberOrder.adoc          |  25 -
 .../rg/modules/ant/pages/MemberOrder/name.adoc     |  11 -
 .../rg/modules/ant/pages/MemberOrder/sequence.adoc |  10 -
 .../rg/modules/ant/pages/ParameterLayout.adoc      | 110 ---
 .../ant/pages/ParameterLayout/describedAs.adoc     |  30 -
 .../ant/pages/ParameterLayout/labelPosition.adoc   |  43 -
 .../ant/pages/ParameterLayout/typicalLength.adoc   |  37 -
 .../rg/modules/ant/pages/PersistenceCapable.adoc   | 102 ---
 .../rg/modules/ant/pages/Property/hidden.adoc      |  75 --
 .../rg/modules/ant/pages/PropertyLayout.adoc       | 143 ----
 .../modules/ant/pages/PropertyLayout/cssClass.adoc |  37 -
 .../ant/pages/PropertyLayout/describedAs.adoc      |  23 -
 .../modules/ant/pages/PropertyLayout/hidden.adoc   |  79 --
 .../ant/pages/PropertyLayout/labelPosition.adoc    |  92 --
 .../ant/pages/PropertyLayout/multiLine.adoc        |  33 -
 .../rg/modules/ant/pages/PropertyLayout/named.adoc |  52 --
 .../ant/pages/PropertyLayout/navigable.adoc        |  24 -
 .../ant/pages/PropertyLayout/promptStyle.adoc      |  27 -
 .../pages/PropertyLayout/renderedAsDayBefore.adoc  |  44 -
 .../ant/pages/PropertyLayout/typicalLength.adoc    |  29 -
 .../rg/modules/ant/pages/ViewModel/objectType.adoc |  62 --
 .../rg/modules/ant/pages/ViewModelLayout.adoc      | 113 ---
 .../ant/pages/ViewModelLayout/describedAs.adoc     |   9 -
 .../rg/modules/ant/pages/XmlRootElement.adoc       |  81 --
 .../components/rg/modules/ant/pages/aaa/jdo.adoc   | 111 ---
 .../components/rg/modules/ant/pages/aaa/jee.adoc   |  84 --
 .../components/rg/modules/ant/pages/aaa/main.adoc  | 101 ---
 .../components/rg/modules/ant/pages/aaa/other.adoc |  49 --
 antora/components/rg/modules/cfg/pages/about.adoc  |  25 -
 .../rg/modules/cfg/pages/configuration-files.adoc  |  38 -
 .../rg/modules/cfg/pages/configuring-core.adoc     | 731 ----------------
 .../rg/modules/cfg/pages/deployment-types.adoc     | 100 ---
 .../modules/cfg/pages/specifying-components.adoc   |  68 --
 .../components/rg/modules/cms/pages/classes.adoc   |  10 -
 .../pages/classes/AppManifest-bootstrapping.adoc   | 321 -------
 .../pages/classes/AppManifest2-bootstrapping.adoc  | 189 -----
 .../rg/modules/cms/pages/classes/layout.adoc       | 130 ---
 .../rg/modules/cms/pages/classes/menubars.adoc     |  85 --
 .../modules/cms/pages/classes/mixins/Object.adoc   | 125 ---
 .../cms/pages/classes/super/FixtureScript.adoc     |  19 -
 .../cms/pages/classes/super/FixtureScripts.adoc    |   9 -
 .../rg/modules/cms/pages/methods/prefixes.adoc     | 203 -----
 .../modules/cms/pages/methods/prefixes/addTo.adoc  |  35 -
 .../cms/pages/methods/prefixes/removeFrom.adoc     |  35 -
 .../cms/pages/methods/prefixes/validateAddTo.adoc  |  44 -
 .../pages/methods/prefixes/validateRemoveFrom.adoc |  44 -
 .../cms/pages/methods/reserved/cssClass.adoc       |  52 --
 .../modules/cms/pages/methods/reserved/getId.adoc  |  55 --
 .../cms/pages/methods/reserved/iconName.adoc       |  46 -
 .../modules/cms/pages/methods/reserved/layout.adoc |  46 -
 .../ContentNegotiationService.adoc                 | 204 -----
 .../presentation-layer/RepresentationService.adoc  |  93 --
 antora/components/rg/modules/mvn/pages/intro.adoc  |  87 --
 .../components/rg/modules/mvn/pages/swagger.adoc   | 105 ---
 .../ActionInvocationContext.adoc                   | 100 ---
 .../application-layer-api/CommandContext.adoc      | 220 -----
 .../application-layer-api/MessageService.adoc      |  63 --
 .../application-layer-api/TransactionService.adoc  | 116 ---
 .../application-layer-api/WrapperFactory.adoc      | 187 -----
 .../application-layer-spi/CommandService.adoc      | 106 ---
 .../svc/pages/core-domain-api/Scratchpad.adoc      | 113 ---
 .../svc/pages/core-domain-api/UserService.adoc     |  64 --
 .../svc/pages/integration-api/EmailService.adoc    | 244 ------
 antora/components/rg/modules/svc/pages/intro.adoc  | 204 -----
 .../rg/modules/svc/pages/metadata-api.adoc         |  91 --
 .../svc/pages/metadata-api/SwaggerService.adoc     |  64 --
 .../persistence-layer-api/IsisJdoSupport.adoc      | 280 -------
 .../UserRegistrationService.adoc                   |  92 --
 .../modules/svc/pages/presentation-layer-api.adoc  |  75 --
 .../AcceptHeaderService.adoc                       |  63 --
 .../presentation-layer-api/BookmarkUiService.adoc  |  30 -
 .../presentation-layer-api/DeepLinkService.adoc    |  36 -
 .../presentation-layer-api/GuiceBeanProvider.adoc  |  86 --
 .../modules/svc/pages/presentation-layer-spi.adoc  | 200 -----
 .../ContentMappingService.adoc                     |  77 --
 .../EmailNotificationService.adoc                  |  66 --
 .../ExceptionRecognizer.adoc                       | 148 ----
 .../presentation-layer-spi/GridSystemService.adoc  |  62 --
 .../pages/presentation-layer-spi/HintStore.adoc    |  98 ---
 .../presentation-layer-spi/LocaleProvider.adoc     |  56 --
 .../presentation-layer-spi/MenuBarsService.adoc    |  33 -
 .../presentation-layer-spi/RoutingService.adoc     |  69 --
 .../TranslationsResolver.adoc                      |  52 --
 .../presentation-layer-spi/UserProfileService.adoc |  46 -
 .../modules/svc/pages/testing/FixtureScripts.adoc  |  60 --
 .../rg/modules/svc/pages/testing/SudoService.adoc  | 124 ---
 .../svc/pages/testing/SwitchUserService.adoc       |  39 -
 .../support/modules/ROOT/pages/about.adoc          |  10 +-
 .../modules/dg/pages/asciidoc-templates.adoc       |  24 +-
 .../support/modules/dg/pages/hints-and-tips.adoc   |   8 +-
 .../how-run-fixtures-on-app-startup.adoc           |   2 +-
 .../support/modules/dg/pages/ide/intellij.adoc     |   2 +-
 antora/components/toc/modules/ROOT/nav.adoc        |  10 +-
 .../_partials/_powered-by_gesconsultor-grc.adoc    |   4 +-
 .../components/toc/modules/ROOT/pages/about.adoc   |  10 +-
 .../toc/modules/ROOT/pages/going-deeper/books.adoc |   4 +-
 .../what-is-apache-isis/common-use-cases.adoc      |   4 +-
 .../pages/what-is-apache-isis/screencasts.adoc     |  30 +-
 antora/components/ug-odn/antora.yml                |   6 -
 .../modules/ROOT/pages/configuring/bulk-load.adoc  |  34 -
 .../modules/ROOT/pages/configuring/properties.adoc |  97 ---
 .../ug-odn/modules/ROOT/pages/db-schemas.adoc      | 139 ---
 .../ug-odn/modules/ROOT/pages/hints-and-tips.adoc  |  24 -
 .../pages/hints-and-tips/diagnosing-n-plus-1.adoc  |  14 -
 .../typesafe-queries-and-fetchgroups.adoc          | 110 ---
 antora/components/ug-sec/antora.yml                |   6 -
 .../ROOT/pages/configuring-isis-to-use-shiro.adoc  | 108 ---
 .../ug-sec/modules/ROOT/pages/hints-and-tips.adoc  |  26 -
 .../shiro-isis-enhanced-wildcard-permission.adoc   |  59 --
 .../shiro-realm-implementations/ini-realm.adoc     | 138 ---
 .../modules/ROOT/pages/usage-by-isis-viewers.adoc  | 219 -----
 antora/components/ug-tst/antora.yml                |   6 -
 .../ROOT/pages/fixture-scripts/api-and-usage.adoc  | 355 --------
 .../pages/integ-test-support/abstract-class.adoc   |  77 --
 .../pages/integ-test-support/wrapper-factory.adoc  | 172 ----
 antora/components/ug-vro/antora.yml                |   6 -
 .../ug-vro/modules/ROOT/pages/architecture.adoc    |  54 --
 .../ROOT/pages/configuration-properties.adoc       | 191 -----
 .../ug-vro/modules/ROOT/pages/hints-and-tips.adoc  |  27 -
 .../modules/ROOT/pages/layout-resources.adoc       | 252 ------
 .../ug-vro/modules/ROOT/pages/ro-spec.adoc         | 189 -----
 .../ROOT/pages/simplified-representations.adoc     |  20 -
 .../action-invocation.adoc                         | 123 ---
 .../configuration-properties.adoc                  |  16 -
 antora/components/ug-vw/antora.yml                 |   6 -
 .../ROOT/pages/configuration-properties.adoc       | 933 ---------------------
 .../ROOT/pages/customisation/about-page.adoc       |  93 --
 .../customisation/cheap-n-cheerful-theme.adoc      |  27 -
 .../pages/customisation/custom-javascript.adoc     |  31 -
 .../pages/customisation/tweaking-css-classes.adoc  | 244 ------
 .../ROOT/pages/customisation/welcome-page.adoc     |  35 -
 .../ug-vw/modules/ROOT/pages/extending.adoc        |  21 -
 .../pages/extending/custom-bootstrap-theme.adoc    |  35 -
 .../modules/ROOT/pages/extending/custom-pages.adoc |  93 --
 .../pages/extending/replacing-page-elements.adoc   | 183 ----
 .../ROOT/pages/features/blob-attachments.adoc      | 116 ---
 .../ROOT/pages/features/bookmarked-pages.adoc      | 102 ---
 .../ROOT/pages/features/hints-and-copy-url.adoc    |  74 --
 .../modules/ROOT/pages/features/recent-pages.adoc  |  49 --
 .../pages/features/sidebar-vs-modal-dialogs.adoc   |  32 -
 .../ROOT/pages/features/titles-in-tables.adoc      |  77 --
 .../ROOT/pages/features/user-registration.adoc     |  79 --
 .../modules/ROOT/pages/features/where-am-i.adoc    | 105 ---
 .../ug-vw/modules/ROOT/pages/hints-and-tips.adoc   |  24 -
 .../ug-vw/modules/ROOT/pages/incode-platform.adoc  |  32 -
 .../ug-vw/modules/ROOT/pages/layout.adoc           |  14 -
 .../ROOT/pages/layout/annotation-based.adoc        | 190 -----
 .../modules/ROOT/pages/layout/file-based.adoc      | 464 ----------
 .../ROOT/pages/menubars-layout/file-based.adoc     | 103 ---
 antora/components/ug/antora.yml                    |   8 -
 antora/components/ug/modules/ROOT/pages/about.adoc |  30 -
 .../deployment/externalized-configuration.adoc     | 256 ------
 .../ug/modules/btb/pages/headless-access.adoc      |  20 -
 .../ug/modules/btb/pages/hints-and-tips.adoc       |  23 -
 .../btb/pages/hints-and-tips/are-you-sure.adoc     |  73 --
 .../hints-and-tips/transactions-and-errors.adoc    |  76 --
 antora/components/ug/modules/btb/pages/i18n.adoc   | 694 ---------------
 .../components/ug/modules/btb/pages/web-xml.adoc   | 519 ------------
 antora/components/ug/modules/fun/pages/about.adoc  |  10 -
 .../fun/pages/building-blocks/identifiers/oid.adoc |  41 -
 .../identifiers/title-and-icon-and-css-class.adoc  |  33 -
 .../fun/pages/building-blocks/metamodel.adoc       |  30 -
 .../types-of-domain-objects/domain-services.adoc   |  56 --
 .../types-of-domain-objects/view-models.adoc       | 164 ----
 .../pages/core-concepts/apache-isis-vs/cqrs.adoc   |  47 --
 .../apache-isis-vs/mvc-server-side.adoc            |  27 -
 .../pages/core-concepts/deployment-options.adoc    |  91 --
 .../fun/pages/core-concepts/principles.adoc        |  14 -
 .../principles/for-the-long-term.adoc              |  64 --
 antora/components/ug/modules/fun/pages/crud.adoc   |  14 -
 .../ug/modules/fun/pages/programming-model.adoc    |  69 --
 .../fun/pages/programming-model/collections.adoc   | 117 ---
 .../pages/programming-model/domain-entities.adoc   | 142 ----
 .../programming-model/domain-services/menu.adoc    |  72 --
 .../domain-services/organizing-services.adoc       |  19 -
 .../fun/pages/programming-model/properties.adoc    | 355 --------
 .../view-models/dto/dto-consumers.adoc             |  30 -
 .../fun/pages/ui-hints/action-icons-and-css.adoc   |  95 ---
 .../ug/modules/fun/pages/ui-hints/layout.adoc      |  12 -
 .../pages/ui-hints/object-titles-and-icons.adoc    | 338 --------
 {antora/components/rg => core/_adoc-rg}/antora.yml |   0
 .../components/ug => core/_adoc-rg}/examples.csv   |   0
 .../_adoc-rg}/modules/ROOT/_attributes.adoc        |   0
 .../ug => core/_adoc-rg}/modules/ROOT/nav.adoc     |   0
 .../_adoc-rg/modules/ROOT}/pages/_attributes.adoc  |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 core/_adoc-rg/modules/ROOT/pages/about.adoc        |  29 +
 .../_adoc-rg/modules/ant}/_attributes.adoc         |   0
 .../modules/ant/assets/attachments}/.gitkeep       |   0
 .../_adoc-rg/modules/ant/assets/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
 .../_adoc-rg/modules/ant/examples}/.gitkeep        |   0
 .../rg => core/_adoc-rg}/modules/ant/nav.adoc      |   0
 core/_adoc-rg/modules/ant/pages/Action.adoc        | 135 +++
 .../modules/ant/pages/Action}/_attributes.adoc     |   0
 .../modules/ant/pages/Action/associateWith.adoc    |   0
 .../modules/ant/pages/Action/command.adoc          |   0
 .../modules/ant/pages/Action/domainEvent.adoc      |   0
 core/_adoc-rg/modules/ant/pages/Action/hidden.adoc |  55 ++
 .../modules/ant/pages/Action/invokeOn.adoc         |   0
 .../modules/ant/pages/Action/publishing.adoc       |   0
 .../modules/ant/pages/Action/restrictTo.adoc       |   0
 .../modules/ant/pages/Action/semantics.adoc        |  89 ++
 .../_adoc-rg}/modules/ant/pages/Action/typeOf.adoc |   0
 core/_adoc-rg/modules/ant/pages/ActionLayout.adoc  | 113 +++
 .../ant/pages/ActionLayout}/_attributes.adoc       |   0
 .../ant/pages/ActionLayout/bookmarking.adoc        |  58 ++
 .../ant/pages/ActionLayout/contributedAs.adoc      |   0
 .../modules/ant/pages/ActionLayout/cssClass.adoc   |  42 +
 .../modules/ant/pages/ActionLayout/cssClassFa.adoc |  41 +
 .../ant/pages/ActionLayout/describedAs.adoc        |  38 +
 .../modules/ant/pages/ActionLayout/hidden.adoc     |  59 ++
 .../modules/ant/pages/ActionLayout/named.adoc      |  46 +
 .../modules/ant/pages/ActionLayout/position.adoc   |  72 ++
 .../ant/pages/ActionLayout/promptStyle.adoc        |  60 ++
 .../modules/ant/pages/ActionLayout/redirect.adoc   |  60 ++
 .../_adoc-rg}/modules/ant/pages/Collection.adoc    |   0
 .../modules/ant/pages/Collection}/_attributes.adoc |   0
 .../modules/ant/pages/Collection/domainEvent.adoc  | 175 ++++
 .../modules/ant/pages/Collection/editing.adoc      |  56 ++
 .../modules/ant/pages/Collection/hidden.adoc       |  61 ++
 .../modules/ant/pages/Collection/notPersisted.adoc |   0
 .../modules/ant/pages/Collection/typeOf.adoc       |   0
 .../modules/ant/pages/CollectionLayout.adoc        | 110 +++
 .../ant/pages/CollectionLayout}/_attributes.adoc   |   0
 .../ant/pages/CollectionLayout/cssClass.adoc       |  39 +
 .../ant/pages/CollectionLayout/defaultView.adoc    |  37 +
 .../ant/pages/CollectionLayout/describedAs.adoc    |  29 +
 .../modules/ant/pages/CollectionLayout/hidden.adoc |  61 ++
 .../modules/ant/pages/CollectionLayout/named.adoc  |  53 ++
 .../modules/ant/pages/CollectionLayout/paged.adoc  |  44 +
 .../ant/pages/CollectionLayout/sortedBy.adoc       |  48 ++
 .../_adoc-rg}/modules/ant/pages/Column.adoc        |   0
 .../_adoc-rg}/modules/ant/pages/Digits.adoc        |   0
 core/_adoc-rg/modules/ant/pages/Discriminator.adoc |  72 ++
 .../_adoc-rg}/modules/ant/pages/DomainObject.adoc  |   0
 .../ant/pages/DomainObject}/_attributes.adoc       |   0
 .../ant/pages/DomainObject/actionDomainEvent.adoc  |   0
 .../modules/ant/pages/DomainObject/auditing.adoc   |   0
 .../pages/DomainObject/autoCompleteRepository.adoc |   0
 .../modules/ant/pages/DomainObject/bounding.adoc   |  38 +
 .../pages/DomainObject/collectionDomainEvent.adoc  |   0
 .../pages/DomainObject/createdLifecycleEvent.adoc  |   0
 .../modules/ant/pages/DomainObject/editing.adoc    |   0
 .../pages/DomainObject/loadedLifecycleEvent.adoc   |   0
 .../ant/pages/DomainObject/mixinMethod.adoc        |   0
 .../modules/ant/pages/DomainObject/nature.adoc     |   0
 .../modules/ant/pages/DomainObject/objectType.adoc |  62 ++
 .../DomainObject/persistedLifecycleEvent.adoc      |   0
 .../DomainObject/persistingLifecycleEvent.adoc     |   0
 .../pages/DomainObject/propertyDomainEvent.adoc    |   0
 .../modules/ant/pages/DomainObject/publishing.adoc |   0
 .../pages/DomainObject/removingLifecycleEvent.adoc |   0
 .../pages/DomainObject/updatedLifecycleEvent.adoc  |   0
 .../pages/DomainObject/updatingLifecycleEvent.adoc |   0
 .../modules/ant/pages/DomainObjectLayout.adoc      | 124 +++
 .../ant/pages/DomainObjectLayout}/_attributes.adoc |   0
 .../ant/pages/DomainObjectLayout/bookmarking.adoc  |  69 ++
 .../ant/pages/DomainObjectLayout/cssClass.adoc     |   0
 .../ant/pages/DomainObjectLayout/cssClassFa.adoc   |   0
 .../pages/DomainObjectLayout/cssClassUiEvent.adoc  |   0
 .../ant/pages/DomainObjectLayout/describedAs.adoc  |  32 +
 .../ant/pages/DomainObjectLayout/iconUiEvent.adoc  |   0
 .../pages/DomainObjectLayout/layoutUiEvent.adoc    |   0
 .../ant/pages/DomainObjectLayout/named.adoc        |   0
 .../ant/pages/DomainObjectLayout/paged.adoc        |  40 +
 .../ant/pages/DomainObjectLayout/plural.adoc       |   0
 .../ant/pages/DomainObjectLayout/titleUiEvent.adoc |   0
 core/_adoc-rg/modules/ant/pages/DomainService.adoc |  67 ++
 .../ant/pages/DomainService}/_attributes.adoc      |   0
 .../modules/ant/pages/DomainService/nature.adoc    |  92 ++
 .../ant/pages/DomainService/objectType.adoc        |  56 ++
 .../ant/pages/DomainService/repositoryFor.adoc     |   0
 .../modules/ant/pages/DomainServiceLayout.adoc     |  73 ++
 .../pages/DomainServiceLayout}/_attributes.adoc    |   0
 .../ant/pages/DomainServiceLayout/menuBar.adoc     |  41 +
 .../ant/pages/DomainServiceLayout/menuOrder.adoc   |  67 ++
 .../ant/pages/DomainServiceLayout/named.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/Facets.adoc        |   0
 core/_adoc-rg/modules/ant/pages/HomePage.adoc      |  50 ++
 core/_adoc-rg/modules/ant/pages/Inject.adoc        | 145 ++++
 .../modules/ant/pages/MemberGroupLayout.adoc       |   0
 core/_adoc-rg/modules/ant/pages/MemberOrder.adoc   |  25 +
 .../ant/pages/MemberOrder}/_attributes.adoc        |   0
 .../modules/ant/pages/MemberOrder/name.adoc        |  11 +
 .../modules/ant/pages/MemberOrder/sequence.adoc    |  10 +
 .../_adoc-rg}/modules/ant/pages/MinLength.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/Mixin.adoc         |   0
 .../modules/ant/pages/Mixin}/_attributes.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/Mixin/method.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/NotPersistent.adoc |   0
 .../_adoc-rg}/modules/ant/pages/Nullable.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/Parameter.adoc     |   0
 .../modules/ant/pages/Parameter}/_attributes.adoc  |   0
 .../modules/ant/pages/Parameter/fileAccept.adoc    |   0
 .../modules/ant/pages/Parameter/maxLength.adoc     |   0
 .../modules/ant/pages/Parameter/mustSatisfy.adoc   |   0
 .../modules/ant/pages/Parameter/optionality.adoc   |   0
 .../modules/ant/pages/Parameter/regexPattern.adoc  |   0
 .../modules/ant/pages/ParameterLayout.adoc         | 110 +++
 .../ant/pages/ParameterLayout}/_attributes.adoc    |   0
 .../ant/pages/ParameterLayout/cssClass.adoc        |   0
 .../ant/pages/ParameterLayout/describedAs.adoc     |  30 +
 .../ant/pages/ParameterLayout/labelPosition.adoc   |  43 +
 .../ant/pages/ParameterLayout/multiLine.adoc       |   0
 .../modules/ant/pages/ParameterLayout/named.adoc   |   0
 .../pages/ParameterLayout/renderedAsDayBefore.adoc |   0
 .../ant/pages/ParameterLayout/typicalLength.adoc   |  37 +
 .../_adoc-rg}/modules/ant/pages/Pattern.adoc       |   0
 .../modules/ant/pages/PersistenceCapable.adoc      | 102 +++
 .../_adoc-rg}/modules/ant/pages/PostConstruct.adoc |   0
 .../_adoc-rg}/modules/ant/pages/PreDestroy.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/PrimaryKey.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/Programmatic.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/Property.adoc      |   0
 .../modules/ant/pages/Property}/_attributes.adoc   |   0
 .../modules/ant/pages/Property/command.adoc        |   0
 .../modules/ant/pages/Property/domainEvent.adoc    |   0
 .../modules/ant/pages/Property/editing.adoc        |   0
 .../modules/ant/pages/Property/fileAccept.adoc     |   0
 .../modules/ant/pages/Property/hidden.adoc         |  75 ++
 .../modules/ant/pages/Property/maxLength.adoc      |   0
 .../modules/ant/pages/Property/mustSatisfy.adoc    |   0
 .../modules/ant/pages/Property/notPersisted.adoc   |   0
 .../modules/ant/pages/Property/optionality.adoc    |   0
 .../modules/ant/pages/Property/projecting.adoc     |   0
 .../modules/ant/pages/Property/publishing.adoc     |   0
 .../modules/ant/pages/Property/regexPattern.adoc   |   0
 .../_adoc-rg/modules/ant/pages/PropertyLayout.adoc | 143 ++++
 .../ant/pages/PropertyLayout}/_attributes.adoc     |   0
 .../modules/ant/pages/PropertyLayout/cssClass.adoc |  37 +
 .../ant/pages/PropertyLayout/describedAs.adoc      |  23 +
 .../modules/ant/pages/PropertyLayout/hidden.adoc   |  79 ++
 .../ant/pages/PropertyLayout/labelPosition.adoc    |  92 ++
 .../ant/pages/PropertyLayout/multiLine.adoc        |  33 +
 .../modules/ant/pages/PropertyLayout/named.adoc    |  52 ++
 .../ant/pages/PropertyLayout/navigable.adoc        |  24 +
 .../ant/pages/PropertyLayout/promptStyle.adoc      |  27 +
 .../pages/PropertyLayout/renderedAsDayBefore.adoc  |  44 +
 .../ant/pages/PropertyLayout/typicalLength.adoc    |  29 +
 .../ant/pages/PropertyLayout/unchanging.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/RequestScoped.adoc |   0
 .../_adoc-rg}/modules/ant/pages/Title.adoc         |   0
 .../_adoc-rg}/modules/ant/pages/ViewModel.adoc     |   0
 .../modules/ant/pages/ViewModel}/_attributes.adoc  |   0
 .../modules/ant/pages/ViewModel/objectType.adoc    |  62 ++
 .../modules/ant/pages/ViewModelLayout.adoc         | 113 +++
 .../ant/pages/ViewModelLayout}/_attributes.adoc    |   0
 .../ant/pages/ViewModelLayout/bookmarking.adoc     |   0
 .../ant/pages/ViewModelLayout/cssClass.adoc        |   0
 .../ant/pages/ViewModelLayout/cssClassFa.adoc      |   0
 .../ant/pages/ViewModelLayout/cssClassUiEvent.adoc |   0
 .../ant/pages/ViewModelLayout/describedAs.adoc     |   9 +
 .../ant/pages/ViewModelLayout/iconUiEvent.adoc     |   0
 .../ant/pages/ViewModelLayout/layoutUiEvent.adoc   |   0
 .../modules/ant/pages/ViewModelLayout/named.adoc   |   0
 .../modules/ant/pages/ViewModelLayout/paged.adoc   |   0
 .../modules/ant/pages/ViewModelLayout/plural.adoc  |   0
 .../ant/pages/ViewModelLayout/titleUiEvent.adoc    |   0
 .../modules/ant/pages/XmlJavaTypeAdapter.adoc      |   0
 .../_adoc-rg/modules/ant/pages/XmlRootElement.adoc |  81 ++
 .../_adoc-rg/modules/ant}/pages/_attributes.adoc   |   0
 .../modules/ant/pages/_partials}/_attributes.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/aaa.adoc           |   0
 .../modules/ant/pages/aaa}/_attributes.adoc        |   0
 core/_adoc-rg/modules/ant/pages/aaa/jdo.adoc       | 111 +++
 core/_adoc-rg/modules/ant/pages/aaa/jee.adoc       |  84 ++
 core/_adoc-rg/modules/ant/pages/aaa/main.adoc      | 101 +++
 core/_adoc-rg/modules/ant/pages/aaa/other.adoc     |  49 ++
 .../_adoc-rg}/modules/ant/pages/aaa/partial.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/about.adoc         |   0
 .../_adoc-rg/modules/cfg}/_attributes.adoc         |   0
 .../modules/cfg/assets/attachments}/.gitkeep       |   0
 .../_adoc-rg/modules/cfg/assets/images}/.gitkeep   |   0
 .../_adoc-rg/modules/cfg}/examples/.gitkeep        |   0
 .../rg => core/_adoc-rg}/modules/cfg/nav.adoc      |   0
 .../_adoc-rg/modules/cfg}/pages/_attributes.adoc   |   0
 .../modules/cfg/pages/_partials}/_attributes.adoc  |   0
 core/_adoc-rg/modules/cfg/pages/about.adoc         |  25 +
 .../modules/cfg/pages/configuration-files.adoc     |  38 +
 .../modules/cfg/pages/configuring-core.adoc        | 731 ++++++++++++++++
 .../modules/cfg/pages/deployment-types.adoc        | 100 +++
 .../modules/cfg/pages/specifying-components.adoc   |  68 ++
 .../_adoc-rg/modules/cms}/_attributes.adoc         |   0
 .../modules/cms}/assets/attachments/.gitkeep       |   0
 .../reference-classes/issue-in-more-detail.png     | Bin
 .../prefixes/choices/dependent.png                 | Bin
 .../reserved/cssClass/strikethrough.png            | Bin
 .../reserved/iconName/differing.pdn                | Bin
 .../reserved/iconName/differing.png                | Bin
 .../reserved/iconName/png-files.png                | Bin
 .../cms/assets/images/value-types/markup.png       | Bin
 .../_adoc-rg/modules/cms}/examples/.gitkeep        |   0
 .../rg => core/_adoc-rg}/modules/cms/nav.adoc      |   0
 .../_adoc-rg/modules/cms}/pages/_attributes.adoc   |   0
 .../modules/cms}/pages/_partials/_attributes.adoc  |   0
 .../_adoc-rg}/modules/cms/pages/about.adoc         |   0
 core/_adoc-rg/modules/cms/pages/classes.adoc       |  10 +
 .../pages/classes/AppManifest-bootstrapping.adoc   | 321 +++++++
 .../pages/classes/AppManifest2-bootstrapping.adoc  | 189 +++++
 .../modules/cms/pages/classes}/_attributes.adoc    |   0
 .../modules/cms/pages/classes/contributee.adoc     |   0
 .../classes/contributee/HasTransactionId.adoc      |   0
 .../cms/pages/classes/contributee/HasUserName.adoc |   0
 .../pages/classes/contributee}/_attributes.adoc    |   0
 .../modules/cms/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
 .../pages/classes/domainevent}/_attributes.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/classes/i18n.adoc  |   0
 .../cms/pages/classes/i18n/TranslatableString.adoc |   0
 .../cms/pages/classes/i18n}/_attributes.adoc       |   0
 .../_adoc-rg/modules/cms/pages/classes/layout.adoc | 130 +++
 .../modules/cms/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
 .../pages/classes/lifecycleevent}/_attributes.adoc |   0
 .../modules/cms/pages/classes/menubars.adoc        |  85 ++
 .../modules/cms/pages/classes/mixins.adoc          |   0
 .../modules/cms/pages/classes/mixins/Dto.adoc      |   0
 .../modules/cms/pages/classes/mixins/Object.adoc   | 125 +++
 .../cms/pages/classes/mixins/Persistable.adoc      |   0
 .../cms/pages/classes/mixins}/_attributes.adoc     |   0
 .../_adoc-rg}/modules/cms/pages/classes/roles.adoc |   0
 .../cms/pages/classes/roles/HoldsUpdatedAt.adoc    |   0
 .../cms/pages/classes/roles/HoldsUpdatedBy.adoc    |   0
 .../cms/pages/classes/roles/Timestampable.adoc     |   0
 .../cms/pages/classes/roles}/_attributes.adoc      |   0
 .../_adoc-rg}/modules/cms/pages/classes/spec.adoc  |   0
 .../_adoc-rg}/modules/cms/pages/classes/super.adoc |   0
 .../cms/pages/classes/super/AbstractService.adoc   |   0
 .../pages/classes/super/AbstractSubscriber.adoc    |   0
 .../cms/pages/classes/super/AbstractViewModel.adoc |   0
 .../cms/pages/classes/super/FixtureScript.adoc     |  19 +
 .../cms/pages/classes/super/FixtureScripts.adoc    |   9 +
 .../cms/pages/classes/super}/_attributes.adoc      |   0
 .../modules/cms/pages/classes/uievent.adoc         |   0
 .../cms/pages/classes/uievent/CssClassUiEvent.adoc |   0
 .../cms/pages/classes/uievent/IconUiEvent.adoc     |   0
 .../cms/pages/classes/uievent/TitleUiEvent.adoc    |   0
 .../cms/pages/classes/uievent}/_attributes.adoc    |   0
 .../modules/cms/pages/classes/utility.adoc         |   0
 .../modules/cms/pages/classes/utility/Enums.adoc   |   0
 .../cms/pages/classes/utility/ObjectContracts.adoc |   0
 .../modules/cms/pages/classes/utility/Reasons.adoc |   0
 .../cms/pages/classes/utility/TitleBuffer.adoc     |   0
 .../cms/pages/classes/utility}/_attributes.adoc    |   0
 .../modules/cms/pages/classes/value-types.adoc     |   0
 .../cms/pages/classes/value-types/Blob.adoc        |   0
 .../cms/pages/classes/value-types/Clob.adoc        |   0
 .../cms/pages/classes/value-types/Color.adoc       |   0
 .../cms/pages/classes/value-types/Markup.adoc      |   0
 .../cms/pages/classes/value-types/Money.adoc       |   0
 .../cms/pages/classes/value-types/Password.adoc    |   0
 .../pages/classes/value-types}/_attributes.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/methods.adoc       |   0
 .../modules/cms/pages/methods}/_attributes.adoc    |   0
 .../modules/cms/pages/methods/lifecycle.adoc       |   0
 .../cms/pages/methods/lifecycle}/_attributes.adoc  |   0
 .../cms/pages/methods/lifecycle/created.adoc       |   0
 .../cms/pages/methods/lifecycle/jdo-api.adoc       |   0
 .../cms/pages/methods/lifecycle/loaded.adoc        |   0
 .../cms/pages/methods/lifecycle/persisted.adoc     |   0
 .../cms/pages/methods/lifecycle/persisting.adoc    |   0
 .../cms/pages/methods/lifecycle/removed.adoc       |   0
 .../cms/pages/methods/lifecycle/removing.adoc      |   0
 .../cms/pages/methods/lifecycle/updated.adoc       |   0
 .../cms/pages/methods/lifecycle/updating.adoc      |   0
 .../modules/cms/pages/methods/prefixes.adoc        | 203 +++++
 .../cms/pages/methods/prefixes/_attributes.adoc    |   0
 .../modules/cms/pages/methods/prefixes/addTo.adoc  |  35 +
 .../cms/pages/methods/prefixes/autoComplete.adoc   |   0
 .../cms/pages/methods/prefixes/choices.adoc        |   0
 .../modules/cms/pages/methods/prefixes/clear.adoc  |   0
 .../cms/pages/methods/prefixes/default.adoc        |   0
 .../cms/pages/methods/prefixes/disable.adoc        |   0
 .../modules/cms/pages/methods/prefixes/get.adoc    |   0
 .../modules/cms/pages/methods/prefixes/hide.adoc   |   0
 .../modules/cms/pages/methods/prefixes/modify.adoc |   0
 .../cms/pages/methods/prefixes/removeFrom.adoc     |  35 +
 .../modules/cms/pages/methods/prefixes/set.adoc    |   0
 .../cms/pages/methods/prefixes/validate.adoc       |   0
 .../cms/pages/methods/prefixes/validateAddTo.adoc  |  44 +
 .../pages/methods/prefixes/validateRemoveFrom.adoc |  44 +
 .../modules/cms/pages/methods/reserved.adoc        |   0
 .../cms/pages/methods/reserved}/_attributes.adoc   |   0
 .../cms/pages/methods/reserved/cssClass.adoc       |  52 ++
 .../cms/pages/methods/reserved/disable.adoc        |   0
 .../modules/cms/pages/methods/reserved/getId.adoc  |  55 ++
 .../modules/cms/pages/methods/reserved/hide.adoc   |   0
 .../cms/pages/methods/reserved/iconName.adoc       |  46 +
 .../modules/cms/pages/methods/reserved/layout.adoc |  46 +
 .../modules/cms/pages/methods/reserved/title.adoc  |   0
 .../cms/pages/methods/reserved/validate.adoc       |   0
 .../_adoc-rg}/modules/cms/pages/rgcms.adoc         |   0
 .../_adoc-rg}/modules/cms/pages/schema.adoc        |   0
 .../modules/cms/pages/schema}/_attributes.adoc     |   0
 .../_adoc-rg}/modules/cms/pages/schema/aim.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/schema/chg.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/schema/cmd.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/schema/common.adoc |   0
 .../_adoc-rg}/modules/cms/pages/schema/ixn.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/schema/mml.adoc    |   0
 .../_adoc-rg/modules/fis}/_attributes.adoc         |   0
 .../modules/fis}/assets/attachments/.gitkeep       |   0
 .../ContentNegotiationService/accept-json.png      | Bin
 .../ContentNegotiationService/accept-xml.png       | Bin
 .../ContentNegotiationService/facade-choices.png   | Bin
 .../ContentNegotiationService/facade-choices.pptx  | Bin
 .../service-collaborations.png                     | Bin
 .../service-collaborations.pptx                    | Bin
 .../_adoc-rg/modules/fis}/examples/.gitkeep        |   0
 .../rg => core/_adoc-rg}/modules/fis/nav.adoc      |   0
 .../_adoc-rg/modules/fis}/pages/_attributes.adoc   |   0
 .../modules/fis/pages/_partials}/_attributes.adoc  |   0
 .../_adoc-rg}/modules/fis/pages/about.adoc         |   0
 .../modules/fis/pages/application-layer.adoc       |   0
 .../AuthenticationSessionProvider.adoc             |   0
 .../CommandDtoServiceInternal.adoc                 |   0
 .../InteractionDtoServiceInternal.adoc             |   0
 .../fis/pages/application-layer}/_attributes.adoc  |   0
 .../modules/fis/pages/persistence-layer.adoc       |   0
 .../persistence-layer/AuditingServiceInternal.adoc |   0
 .../ChangedObjectsServiceInternal.adoc             |   0
 .../PersistenceSessionServiceInternal.adoc         |   0
 .../PublishingServiceInternal.adoc                 |   0
 .../fis/pages/persistence-layer}/_attributes.adoc  |   0
 .../modules/fis/pages/presentation-layer.adoc      |   0
 .../ContentNegotiationService.adoc                 | 204 +++++
 .../presentation-layer/RepresentationService.adoc  |  93 ++
 .../fis/pages/presentation-layer}/_attributes.adoc |   0
 .../_adoc-rg/modules/mvn}/_attributes.adoc         |   0
 .../modules/mvn}/assets/attachments/.gitkeep       |   0
 .../mvn/assets/images/maven-plugin/xsd-goal.png    | Bin
 .../mvn/assets/images/maven-plugin/xsd-goal.pptx   | Bin
 .../_adoc-rg/modules/mvn}/examples/.gitkeep        |   0
 .../rg => core/_adoc-rg}/modules/mvn/nav.adoc      |   0
 .../_adoc-rg/modules/mvn}/pages/_attributes.adoc   |   0
 .../modules/mvn}/pages/_partials/_attributes.adoc  |   0
 .../_adoc-rg}/modules/mvn/pages/about.adoc         |   0
 core/_adoc-rg/modules/mvn/pages/intro.adoc         |  87 ++
 core/_adoc-rg/modules/mvn/pages/swagger.adoc       | 105 +++
 .../_adoc-rg}/modules/mvn/pages/validate.adoc      |   0
 .../_adoc-rg}/modules/mvn/pages/xsd.adoc           |   0
 .../_adoc-rg/modules/svc}/_attributes.adoc         |   0
 .../modules/svc}/assets/attachments/.gitkeep       |   0
 .../reference-services-api/acceptheaderservice.png | Bin
 .../acceptheaderservice.pptx                       | Bin
 .../ErrorReportingService/kitchensink-example.png  | Bin
 .../action-invocation-published-to-stderr.png      | Bin
 .../changed-object-published-to-stderr.png         | Bin
 .../PublishingService/yuml.me-23db58a4.png         | Bin
 .../UserProfileService/todoapp.png                 | Bin
 .../images/reference-services/categories.png       | Bin
 .../images/reference-services/categories.pptx      | Bin
 .../reference-services/commands-and-events.png     | Bin
 .../reference-services/commands-and-events.pptx    | Bin
 .../_adoc-rg}/modules/svc/examples/.gitkeep        |   0
 .../rg => core/_adoc-rg}/modules/svc/nav.adoc      |   0
 .../_adoc-rg/modules/svc}/pages/_attributes.adoc   |   0
 .../modules/svc/pages/_partials}/_attributes.adoc  |   0
 .../_adoc-rg}/modules/svc/pages/about.adoc         |   0
 .../modules/svc/pages/application-layer-api.adoc   |   0
 .../ActionInvocationContext.adoc                   | 100 +++
 .../application-layer-api/BackgroundService.adoc   |   0
 .../BackgroundCommandExecution.adoc                |   0
 .../BackgroundService/Quartz.adoc                  |   0
 .../BackgroundService}/_attributes.adoc            |   0
 .../application-layer-api/CommandContext.adoc      | 220 +++++
 .../CommandExecutorService.adoc                    |   0
 .../application-layer-api/DtoMappingHelper.adoc    |   0
 .../application-layer-api/InteractionContext.adoc  |   0
 .../application-layer-api/MessageService.adoc      |  63 ++
 .../SessionManagementService.adoc                  |   0
 .../pages/application-layer-api/TitleService.adoc  |   0
 .../application-layer-api/TransactionService.adoc  | 116 +++
 .../application-layer-api/WrapperFactory.adoc      | 187 +++++
 .../pages/application-layer-api}/_attributes.adoc  |   0
 .../modules/svc/pages/application-layer-spi.adoc   |   0
 .../BackgroundCommandService.adoc                  |   0
 .../application-layer-spi/CommandService.adoc      | 106 +++
 .../application-layer-spi/HealthCheckService.adoc  |   0
 .../HomePageProviderService.adoc                   |   0
 .../pages/application-layer-spi}/_attributes.adoc  |   0
 .../modules/svc/pages/bootstrapping-spi.adoc       |   0
 .../bootstrapping-spi/ClassDiscoveryService.adoc   |   0
 .../svc/pages/bootstrapping-spi}/_attributes.adoc  |   0
 .../modules/svc/pages/core-domain-api.adoc         |   0
 .../svc/pages/core-domain-api/ClockService.adoc    |   0
 .../core-domain-api/ConfigurationService.adoc      |   0
 .../svc/pages/core-domain-api/EventBusService.adoc |   0
 .../svc/pages/core-domain-api/FactoryService.adoc  |   0
 .../svc/pages/core-domain-api/Scratchpad.adoc      | 113 +++
 .../svc/pages/core-domain-api/UserService.adoc     |  64 ++
 .../svc/pages/core-domain-api}/_attributes.adoc    |   0
 .../modules/svc/pages/integration-api.adoc         |   0
 .../svc/pages/integration-api/BookmarkService.adoc |   0
 .../svc/pages/integration-api/EmailService.adoc    | 244 ++++++
 .../svc/pages/integration-api/JaxbService.adoc     |   0
 .../svc/pages/integration-api/MementoService.adoc  |   0
 .../pages/integration-api/XmlSnapshotService.adoc  |   0
 .../svc/pages/integration-api}/_attributes.adoc    |   0
 core/_adoc-rg/modules/svc/pages/intro.adoc         | 204 +++++
 core/_adoc-rg/modules/svc/pages/metadata-api.adoc  |  91 ++
 .../metadata-api/ApplicationFeatureRepository.adoc |   0
 .../svc/pages/metadata-api/LayoutService.adoc      |   0
 .../svc/pages/metadata-api/MetamodelService.adoc   |   0
 .../svc/pages/metadata-api/ServiceRegistry.adoc    |   0
 .../svc/pages/metadata-api/SwaggerService.adoc     |  64 ++
 .../svc/pages/metadata-api}/_attributes.adoc       |   0
 .../modules/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      | 280 +++++++
 .../persistence-layer-api/MetricsService.adoc      |   0
 .../persistence-layer-api/QueryResultsCache.adoc   |   0
 .../persistence-layer-api/RepositoryService.adoc   |   0
 .../pages/persistence-layer-api}/_attributes.adoc  |   0
 .../modules/svc/pages/persistence-layer-spi.adoc   |   0
 .../persistence-layer-spi/AuditerService.adoc      |   0
 .../persistence-layer-spi/PublisherService.adoc    |   0
 .../UserRegistrationService.adoc                   |  92 ++
 .../pages/persistence-layer-spi}/_attributes.adoc  |   0
 .../modules/svc/pages/presentation-layer-api.adoc  |  75 ++
 .../AcceptHeaderService.adoc                       |  63 ++
 .../presentation-layer-api/BookmarkUiService.adoc  |  30 +
 .../ConfigurationViewService.adoc                  |   0
 .../presentation-layer-api/DeepLinkService.adoc    |  36 +
 .../presentation-layer-api/GuiceBeanProvider.adoc  |  86 ++
 .../pages/presentation-layer-api/_attributes.adoc  |   0
 .../modules/svc/pages/presentation-layer-spi.adoc  | 200 +++++
 .../ContentMappingService.adoc                     |  77 ++
 .../EmailNotificationService.adoc                  |  66 ++
 .../ErrorReportingService.adoc                     |   0
 .../ExceptionRecognizer.adoc                       | 148 ++++
 .../presentation-layer-spi/GridLoaderService.adoc  |   0
 .../pages/presentation-layer-spi/GridService.adoc  |   0
 .../presentation-layer-spi/GridSystemService.adoc  |  62 ++
 .../pages/presentation-layer-spi/HintStore.adoc    |  98 +++
 .../presentation-layer-spi/LocaleProvider.adoc     |  56 ++
 .../MenuBarsLoaderService.adoc                     |   0
 .../presentation-layer-spi/MenuBarsService.adoc    |  33 +
 .../presentation-layer-spi/RoutingService.adoc     |  69 ++
 .../SessionLoggingService.adoc                     |   0
 .../TableColumnOrderService.adoc                   |   0
 .../presentation-layer-spi/TranslationService.adoc |   0
 .../TranslationsResolver.adoc                      |  52 ++
 .../presentation-layer-spi/UrlEncodingService.adoc |   0
 .../presentation-layer-spi/UserProfileService.adoc |  46 +
 .../pages/presentation-layer-spi}/_attributes.adoc |   0
 .../_adoc-rg}/modules/svc/pages/testing.adoc       |   0
 .../pages/testing/ExecutionParametersService.adoc  |   0
 .../modules/svc/pages/testing/FixtureScripts.adoc  |  60 ++
 .../FixtureScriptsSpecificationProvider.adoc       |   0
 .../modules/svc/pages/testing/SudoService.adoc     | 124 +++
 .../svc/pages/testing/SwitchUserService.adoc       |  39 +
 .../modules/svc/pages/testing}/_attributes.adoc    |   0
 .../ug => core/_adoc-rg}/sync_examples.sh          |   0
 core/_adoc-ug/antora.yml                           |   8 +
 .../ug-vw => core/_adoc-ug}/examples.csv           |   0
 .../_adoc-ug}/modules/ROOT/_attributes.adoc        |   0
 .../rg => core/_adoc-ug}/modules/ROOT/nav.adoc     |   0
 .../_adoc-ug}/modules/ROOT/pages/_attributes.adoc  |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 core/_adoc-ug/modules/ROOT/pages/about.adoc        |  30 +
 .../_adoc-ug/modules/btb}/_attributes.adoc         |   0
 .../modules/btb}/assets/attachments/.gitkeep       |   0
 .../headless-access/BackgroundCommandExecution.png | Bin
 ...andExecutionFromBackgroundCommandServiceJdo.png | Bin
 .../action-semantics-are-you-sure.png              | Bin
 .../hints-and-tips/are-you-sure-happy-case.png     | Bin
 .../hints-and-tips/are-you-sure-sad-case.png       | Bin
 .../assets/images/hints-and-tips/are-you-sure.png  | Bin
 .../images/hints-and-tips/view-model-fail.png      | Bin
 .../images/hints-and-tips/view-model-success.png   | Bin
 .../btb/assets/images/runtime/web-xml/key.png      | Bin
 .../btb/assets/images/runtime/web-xml/parts.pptx   | Bin
 .../btb/assets/images/runtime/web-xml/ro-only.png  | Bin
 .../images/runtime/web-xml/wicket-and-ro.png       | Bin
 .../assets/images/runtime/web-xml/wicket-only.png  | Bin
 .../_adoc-ug/modules/btb}/examples/.gitkeep        |   0
 .../ug => core/_adoc-ug}/modules/btb/nav.adoc      |   0
 .../_adoc-ug/modules/btb}/pages/_attributes.adoc   |   0
 .../modules/btb/pages/_partials}/_attributes.adoc  |   0
 .../_adoc-ug}/modules/btb/pages/about.adoc         |   0
 .../_adoc-ug}/modules/btb/pages/deployment.adoc    |   0
 .../modules/btb/pages/deployment}/_attributes.adoc |   0
 .../modules/btb/pages/deployment/cmd-line.adoc     |   0
 .../modules/btb/pages/deployment/docker.adoc       |   0
 .../deployment/externalized-configuration.adoc     | 256 ++++++
 .../modules/btb/pages/deployment/gae.adoc          |   0
 .../modules/btb/pages/deployment/jvm-flags.adoc    |   0
 .../modules/btb/pages/deployment/neo4j.adoc        |   0
 .../modules/btb/pages/deployment/tomcat.adoc       |   0
 .../modules/btb/pages/headless-access.adoc         |  20 +
 .../AbstractIsisSessionTemplate.adoc               |   0
 .../BackgroundCommandExecution.adoc                |   0
 .../btb/pages/headless-access}/_attributes.adoc    |   0
 .../_adoc-ug/modules/btb/pages/hints-and-tips.adoc |  23 +
 .../btb/pages/hints-and-tips}/_attributes.adoc     |   0
 .../btb/pages/hints-and-tips/are-you-sure.adoc     |  73 ++
 .../how-to-handle-void-and-null-results.adoc       |   0
 .../how-to-implement-a-spellchecker.adoc           |   0
 .../btb/pages/hints-and-tips/multi-tenancy.adoc    |   0
 .../btb/pages/hints-and-tips/persisted-title.adoc  |   0
 .../btb/pages/hints-and-tips/pushing-changes.adoc  |   0
 .../replacing-default-service-implementations.adoc |   0
 .../simulating-collections-of-values.adoc          |   0
 .../subclass-properties-in-tables.adoc             |   0
 .../hints-and-tips/transactions-and-errors.adoc    |  76 ++
 .../pages/hints-and-tips/vetoing-visibility.adoc   |   0
 .../hints-and-tips/view-model-instantiation.adoc   |   0
 core/_adoc-ug/modules/btb/pages/i18n.adoc          | 694 +++++++++++++++
 .../modules/btb/pages/other-techniques.adoc        |   0
 .../modules/btb/pages/programming-model.adoc       |   0
 .../btb/pages/programming-model}/_attributes.adoc  |   0
 .../pages/programming-model/custom-validator.adoc  |   0
 .../btb/pages/programming-model/finetuning.adoc    |   0
 core/_adoc-ug/modules/btb/pages/web-xml.adoc       | 519 ++++++++++++
 .../_adoc-ug/modules/fun}/_attributes.adoc         |   0
 .../core-concepts/Pawson-Naked-Objects-thesis.pdf  | Bin
 .../core-concepts/philosophy/build-vs-buy.png      | Bin
 .../core-concepts/philosophy/build-vs-buy.pptx     | Bin
 .../philosophy/decoupled-applications.png          | Bin
 .../philosophy/decoupled-applications.pptx         | Bin
 .../philosophy/hexagonal-architecture-addons.png   | Bin
 .../philosophy/hexagonal-architecture.png          | Bin
 .../philosophy/hexagonal-architecture.pptx         | Bin
 .../images/programming-model/todoapp-Dashboard.png | Bin
 .../_adoc-ug/modules/fun/examples}/.gitkeep        |   0
 .../ug => core/_adoc-ug}/modules/fun/nav.adoc      |   0
 .../_adoc-ug/modules/fun}/pages/_attributes.adoc   |   0
 .../modules/fun}/pages/_partials/_attributes.adoc  |   0
 core/_adoc-ug/modules/fun/pages/about.adoc         |  10 +
 .../fun/pages/available-domain-services.adoc       |   0
 .../available-domain-services}/_attributes.adoc    |   0
 .../framework-provided.adoc                        |   0
 .../available-domain-services/incode-platform.adoc |   0
 .../modules/fun/pages/building-blocks.adoc         |   0
 .../fun/pages/building-blocks}/_attributes.adoc    |   0
 .../modules/fun/pages/building-blocks/events.adoc  |   0
 .../pages/building-blocks/events}/_attributes.adoc |   0
 .../building-blocks/events/domain-events.adoc      |   0
 .../building-blocks/events/lifecycle-events.adoc   |   0
 .../pages/building-blocks/events/ui-events.adoc    |   0
 .../fun/pages/building-blocks/identifiers.adoc     |   0
 .../building-blocks/identifiers}/_attributes.adoc  |   0
 .../fun/pages/building-blocks/identifiers/oid.adoc |  41 +
 .../identifiers/title-and-icon-and-css-class.adoc  |  33 +
 .../fun/pages/building-blocks/metamodel.adoc       |  30 +
 .../modules/fun/pages/building-blocks/modules.adoc |   0
 .../fun/pages/building-blocks/object-members.adoc  |   0
 .../building-blocks/types-of-domain-objects.adoc   |   0
 .../types-of-domain-objects}/_attributes.adoc      |   0
 .../types-of-domain-objects/domain-entities.adoc   |   0
 .../types-of-domain-objects/domain-services.adoc   |  56 ++
 .../types-of-domain-objects/mixins.adoc            |   0
 .../types-of-domain-objects/view-models.adoc       | 164 ++++
 .../modules/fun/pages/business-rules.adoc          |   0
 .../fun/pages/business-rules}/_attributes.adoc     |   0
 .../modules/fun/pages/business-rules/actions.adoc  |   0
 .../fun/pages/business-rules/side-effects.adoc     |   0
 .../fun/pages/business-rules/usability.adoc        |   0
 .../modules/fun/pages/business-rules/validity.adoc |   0
 .../fun/pages/business-rules/visibility.adoc       |   0
 .../_adoc-ug}/modules/fun/pages/core-concepts.adoc |   0
 .../fun/pages/core-concepts}/_attributes.adoc      |   0
 .../fun/pages/core-concepts/apache-isis-vs.adoc    |   0
 .../core-concepts/apache-isis-vs}/_attributes.adoc |   0
 .../pages/core-concepts/apache-isis-vs/cqrs.adoc   |  47 ++
 .../apache-isis-vs/event-sourcing.adoc             |   0
 .../apache-isis-vs/mvc-server-side.adoc            |  27 +
 .../pages/core-concepts/deployment-options.adoc    |  91 ++
 .../fun/pages/core-concepts/philosophy.adoc        |   0
 .../core-concepts/philosophy}/_attributes.adoc     |   0
 .../fun/pages/core-concepts/philosophy/aop.adoc    |   0
 .../fun/pages/core-concepts/philosophy/dci.adoc    |   0
 .../philosophy/domain-driven-design.adoc           |   0
 .../philosophy/hexagonal-architecture.adoc         |   0
 .../core-concepts/philosophy/how-eases-ddd.adoc    |   0
 .../philosophy/naked-objects-pattern.adoc          |   0
 .../fun/pages/core-concepts/principles.adoc        |  14 +
 .../core-concepts/principles}/_attributes.adoc     |   0
 .../core-concepts/principles/build-not-buy.adoc    |   0
 .../principles/for-the-long-term.adoc              |  64 ++
 .../core-concepts/principles/isis-itself.adoc      |   0
 .../principles/isis-itself}/_attributes.adoc       |   0
 .../principles/isis-itself/focuses-on-its-usp.adoc |   0
 .../isis-itself/full-stack-but-extensible.adoc     |   0
 .../core-concepts/principles/lego-blocks.adoc      |   0
 .../pages/core-concepts/principles/testable.adoc   |   0
 core/_adoc-ug/modules/fun/pages/crud.adoc          |  14 +
 .../modules/fun/pages/crud}/_attributes.adoc       |   0
 .../_adoc-ug}/modules/fun/pages/crud/deleting.adoc |   0
 .../_adoc-ug}/modules/fun/pages/crud/finding.adoc  |   0
 .../modules/fun/pages/crud/instantiating.adoc      |   0
 .../modules/fun/pages/crud/persisting.adoc         |   0
 .../_adoc-ug}/modules/fun/pages/crud/updating.adoc |   0
 .../modules/fun/pages/drop-downs-and-defaults.adoc |   0
 .../modules/fun/pages/programming-model.adoc       |  69 ++
 .../fun/pages/programming-model}/_attributes.adoc  |   0
 .../fun/pages/programming-model/actions.adoc       |   0
 .../fun/pages/programming-model/collections.adoc   | 117 +++
 .../pages/programming-model/domain-entities.adoc   | 142 ++++
 .../pages/programming-model/domain-services.adoc   |   0
 .../domain-services}/_attributes.adoc              |   0
 .../domain-services/event-subscribers.adoc         |   0
 .../domain-services/initialization.adoc            |   0
 .../programming-model/domain-services/menu.adoc    |  72 ++
 .../domain-services/organizing-services.adoc       |  19 +
 .../domain-services/registering.adoc               |   0
 .../domain-services/repository-and-factory.adoc    |   0
 .../domain-services/scoped-services.adoc           |   0
 .../pages/programming-model/inject-services.adoc   |   0
 .../fun/pages/programming-model/mixins.adoc        |   0
 .../programming-model/mixins}/_attributes.adoc     |   0
 .../mixins/contributed-action.adoc                 |   0
 .../mixins/contributed-collection.adoc             |   0
 .../mixins/contributed-property.adoc               |   0
 .../programming-model/mixins/inferred-name.adoc    |   0
 .../mixins/nested-static-classes.adoc              |   0
 .../mixins/programmatic-usage.adoc                 |   0
 .../properties-vs-parameters.adoc                  |   0
 .../fun/pages/programming-model/properties.adoc    | 355 ++++++++
 .../fun/pages/programming-model/view-models.adoc   |   0
 .../view-models}/_attributes.adoc                  |   0
 .../pages/programming-model/view-models/dto.adoc   |   0
 .../view-models/dto/_attributes.adoc               |   0
 .../view-models/dto/dto-consumers.adoc             |  30 +
 .../view-models/dto/generating-xsds.adoc           |   0
 .../view-models/dto/versioning.adoc                |   0
 .../pages/programming-model/view-models/jaxb.adoc  |   0
 .../view-models/jaxb}/_attributes.adoc             |   0
 .../view-models/jaxb/joda-datatypes.adoc           |   0
 .../jaxb/referencing-domain-entities.adoc          |   0
 .../programming-model/view-models/non-jaxb.adoc    |   0
 .../_adoc-ug}/modules/fun/pages/ui-hints.adoc      |   0
 .../modules/fun/pages/ui-hints}/_attributes.adoc   |   0
 .../fun/pages/ui-hints/action-icons-and-css.adoc   |  95 +++
 .../fun/pages/ui-hints/eager-rendering.adoc        |   0
 .../modules/fun/pages/ui-hints/layout.adoc         |  12 +
 .../fun/pages/ui-hints/names-and-descriptions.adoc |   0
 .../pages/ui-hints/object-titles-and-icons.adoc    | 338 ++++++++
 .../ug-vw => core/_adoc-ug}/sync_examples.sh       |   0
 core/plugins/jdo/_adoc/antora.yml                  |   6 +
 .../ug-vro => core/plugins/jdo/_adoc}/examples.csv |   0
 .../jdo/_adoc/modules/ROOT}/_attributes.adoc       |   0
 .../modules/ROOT/assets/attachments}/.gitkeep      |   0
 .../images/hints-n-tips/diagnosing-n-plus-1.png    | Bin
 .../party-agreementrole-agreement.png              | Bin
 .../jdo/_adoc/modules/ROOT/examples}/.gitkeep      |   0
 .../plugins/jdo/_adoc}/modules/ROOT/nav.adoc       |   0
 .../jdo/_adoc/modules/ROOT}/pages/_attributes.adoc |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../jdo/_adoc}/modules/ROOT/pages/about.adoc       |   0
 .../jdo/_adoc}/modules/ROOT/pages/configuring.adoc |   0
 .../ROOT/pages/configuring}/_attributes.adoc       |   0
 .../modules/ROOT/pages/configuring/bulk-load.adoc  |  34 +
 .../disabling-persistence-by-reachability.adoc     |   0
 .../ROOT/pages/configuring/persistence-xml.adoc    |   0
 .../modules/ROOT/pages/configuring/properties.adoc |  97 +++
 .../pages/configuring/using-jndi-data-source.adoc  |   0
 .../jdo/_adoc/modules/ROOT/pages/db-schemas.adoc   | 139 +++
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc   |  24 +
 .../ROOT/pages/hints-and-tips}/_attributes.adoc    |   0
 .../pages/hints-and-tips/diagnosing-n-plus-1.adoc  |  14 +
 .../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          | 110 +++
 .../_adoc}/modules/ROOT/pages/jdo-mappings.adoc    |   0
 .../1-to-m-bidirectional-relationships.adoc        |   0
 .../ROOT/pages/jdo-mappings}/_attributes.adoc      |   0
 .../mandatory-properties-in-subtypes.adoc          |   0
 .../ROOT/pages/jdo-mappings/mapping-to-a-view.adoc |   0
 .../plugins/jdo/_adoc}/sync_examples.sh            |   0
 core/plugins/{jdo-common => jdo/common}/pom.xml    |   0
 .../isis/jdo/datanucleus/DataNucleusException.java |   0
 .../datanucleus/DataNucleusPropertiesAware.java    |   0
 .../isis/jdo/datanucleus/JdoRuntimeException.java  |   0
 .../datanucleus/metamodel/JdoPropertyUtils.java    |   0
 .../commands/AbstractDataNucleusObjectCommand.java |   0
 .../commands/DataNucleusCreateObjectCommand.java   |   0
 .../commands/DataNucleusDeleteObjectCommand.java   |   0
 .../queries/PersistenceQueryProcessor.java         |   0
 .../service/support/TimestampService.java          |   0
 .../isis/jdo/entities/JdoEntityTypeRegistry.java   |   0
 ...eptionRecognizerCompositeForJdoObjectStore.java |   0
 ...xceptionRecognizerForJDODataStoreException.java |   0
 ...traintViolationForeignKeyNoActionException.java |   0
 ...ionRecognizerForJDOObjectNotFoundException.java |   0
 ...yConstraintViolationUniqueOrIndexException.java |   0
 ...JdoDatastoreIdentityAnnotationFacetFactory.java |   0
 .../JdoDatastoreIdentityFacet.java                 |   0
 .../JdoDatastoreIdentityFacetAbstract.java         |   0
 .../JdoDatastoreIdentityFacetAnnotation.java       |   0
 .../JdoDatastoreIdentityFacetImpl.java             |   0
 .../object/datastoreidentity/package-info.java     |   0
 .../JdoDiscriminatorAnnotationFacetFactory.java    |   0
 .../discriminator/JdoDiscriminatorFacet.java       |   0
 .../JdoDiscriminatorFacetDefault.java              |   0
 ...nferredFromJdoDiscriminatorValueAnnotation.java |   0
 .../facets/object/discriminator/package-info.java  |   0
 ...cIdFacetForJdoPersistenceCapableAnnotation.java |   0
 ...doPersistenceCapableAnnotationFacetFactory.java |   0
 .../JdoPersistenceCapableFacet.java                |   0
 .../JdoPersistenceCapableFacetAbstract.java        |   0
 .../JdoPersistenceCapableFacetAnnotation.java      |   0
 .../JdoPersistenceCapableFacetImpl.java            |   0
 .../object/persistencecapable/package-info.java    |   0
 .../facets/object/query/JdoNamedQuery.java         |   0
 .../object/query/JdoQueriesFacetAnnotation.java    |   0
 .../query/JdoQueryAnnotationFacetFactory.java      |   0
 .../facets/object/query/JdoQueryFacet.java         |   0
 .../facets/object/query/JdoQueryFacetAbstract.java |   0
 .../object/query/JdoQueryFacetAnnotation.java      |   0
 .../object/query/VisitorForClauseAbstract.java     |   0
 .../facets/object/query/VisitorForFromClause.java  |   0
 .../object/query/VisitorForVariablesClause.java    |   0
 .../version/JdoVersionAnnotationFacetFactory.java  |   0
 .../facets/object/version/JdoVersionFacet.java     |   0
 .../version/JdoVersionFacetFromAnnotation.java     |   0
 .../facets/object/version/package-info.java        |   0
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |   0
 .../BigDecimalFacetDerivedFromJdoColumn.java       |   0
 .../prop/column/BigDecimalFacetFallback.java       |   0
 .../column/MandatoryFacetDerivedFromJdoColumn.java |   0
 ...ndatoryFacetInferredFromAbsenceOfJdoColumn.java |   0
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java |   0
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |   0
 .../column/MaxLengthFacetDerivedFromJdoColumn.java |   0
 .../JdoNotPersistentAnnotationFacetFactory.java    |   0
 .../prop/notpersistent/JdoNotPersistentFacet.java  |   0
 .../JdoNotPersistentFacetAbstract.java             |   0
 .../JdoNotPersistentFacetAnnotation.java           |   0
 .../notpersistent/JdoNotPersistentFacetImpl.java   |   0
 ...FacetDerivedFromJdoNotPersistentAnnotation.java |   0
 ...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java |   0
 .../JdoPrimaryKeyAnnotationFacetFactory.java       |   0
 .../facets/prop/primarykey/JdoPrimaryKeyFacet.java |   0
 .../primarykey/JdoPrimaryKeyFacetAbstract.java     |   0
 .../primarykey/JdoPrimaryKeyFacetAnnotation.java   |   0
 .../prop/primarykey/JdoPrimaryKeyFacetImpl.java    |   0
 ...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java |   0
 .../facets/prop/primarykey/package-info.java       |   0
 .../validator/JdoMetaModelValidator.java           |   0
 .../util/JdoPrimaryKeyPropertyPredicate.java       |   0
 .../IsisPlatformTransactionManagerForJdo.java      |   0
 .../isis/jdo/persistence/IsisTransactionJdo.java   |   0
 .../jdo/persistence/IsisTransactionManagerJdo.java |   0
 .../jdo/persistence/PersistenceSessionBase.java    |   0
 .../PersistenceSessionFactoryMetamodelRefiner.java |   0
 ...onRecognizerCompositeForJdoObjectStoreTest.java |   0
 ...LIntegrityConstraintViolationExceptionTest.java |   0
 ...AnnotationFacetFactoryTest_refineMetaModel.java |   0
 .../datanucleus-5}/pom.xml                         |   0
 .../org/apache/isis/jdo/IsisBootDataNucleus.java   |   0
 .../CreateSchemaObjectFromClassMetadata.java       |   0
 .../datanucleus/DataNucleusLifeCycleHelper.java    |   0
 .../jdo/datanucleus/JDOStateManagerForIsis.java    |   0
 .../PersistenceQueryFindAllInstancesProcessor.java |   0
 ...sistenceQueryFindUsingApplibQueryProcessor.java |   0
 .../queries/PersistenceQueryProcessorAbstract.java |   0
 .../datanucleus/persistence/queries/QueryUtil.java |   0
 .../persistence/spi/JdoObjectIdSerializer.java     |   0
 .../service/eventbus/EventBusServiceJdo.java       |   0
 .../typeconverters/IsisMarkupConverter.java        |   0
 .../typeconverters/IsisPasswordConverter.java      |   0
 .../valuemappings/ByteArrayBlobRdbmsMapping.java   |   0
 .../datanucleus/valuetypes/IsisBlobMapping.java    |   0
 .../datanucleus/valuetypes/IsisClobMapping.java    |   0
 .../datanucleus/valuetypes/IsisMoneyMapping.java   |   0
 .../isis/jdo/jdosupport/IsisJdoSupportDN5.java     |   0
 .../isis/jdo/jdosupport/IsisJdoSupportPlugin5.java |   0
 .../isis/jdo/jdosupport/IsisJdoSupport_v3_2.java   |   0
 .../mixins/Persistable_datanucleusIdLong.java      |   0
 .../mixins/Persistable_datanucleusVersionLong.java |   0
 .../Persistable_datanucleusVersionTimestamp.java   |   0
 .../mixins/Persistable_downloadJdoMetadata.java    |   0
 .../isis/jdo/metrics/MetricsServiceDefault.java    |   0
 .../isis/jdo/persistence/DNStoreManagerType.java   |   0
 .../DataNucleusApplicationComponents5.java         |   0
 .../jdo/persistence/IsisLifecycleListener.java     |   0
 .../isis/jdo/persistence/PersistenceSession5.java  |   0
 .../persistence/PersistenceSessionFactory5.java    |   0
 .../org/apache/isis/jdo/persistence/Utils.java     |   0
 .../src/main/resources/META-INF/MANIFEST.MF        |   0
 ...rg.apache.isis.metamodel.IsisJdoMetamodelPlugin |   0
 ...e.isis.runtime.persistence.IsisJdoRuntimePlugin |   0
 .../datanucleus-5}/src/main/resources/plugin.xml   |   0
 ...atastoreIdentityAnnotationFacetFactoryTest.java |   0
 ...JdoDiscriminatorAnnotationFacetFactoryTest.java |   0
 ...rsistenceCapableAnnotationFacetFactoryTest.java |   0
 .../query/JdoQueryAnnotationFacetFactoryTest.java  |   0
 .../JdoVersionAnnotationFacetFactoryTest.java      |   0
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |   0
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |   0
 ...impleObjectWithBigDecimalColumnAnnotations.java |   0
 ...impleObjectWithColumnAllowsNullAnnotations.java |   0
 ...JdoNotPersistentAnnotationFacetFactoryTest.java |   0
 .../SimpleObjectWithNotPersistentColumn.java       |   0
 ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java |   0
 .../primarykey/SimpleObjectWithPrimaryKey.java     |   0
 .../ObjectReflectorDefaultTest_object.java         |   0
 .../adapterfactory/pojo/PojoAdapterTest.java       |   0
 .../transaction/PojoAdapterBuilder.java            |   0
 .../runtime/system/ObjectMemberAbstractTest.java   |   0
 .../WrapperFactoryDefaultTest_wrappedObject.java   |   0
 ...FactoryDefaultTest_wrappedObject_transient.java |   0
 core/pom.xml                                       |  24 +-
 core/security/_adoc/antora.yml                     |   6 +
 .../ug-tst => core/security/_adoc}/examples.csv    |   0
 .../security/_adoc/modules/ROOT}/_attributes.adoc  |   0
 .../modules/ROOT/assets/attachments}/.gitkeep      |   0
 .../ldap/activeds-ldap-groups.png                  | Bin
 .../ldap/activeds-ldap-mojo-partition.png          | Bin
 .../ldap/activeds-ldap-mojo-root-dse.png           | Bin
 .../ldap/activeds-ldap-sasl-authentication.png     | Bin
 .../configuring-shiro/ldap/activeds-ldap-users.png | Bin
 .../configure-isis-to-use-bypass.PNG               | Bin
 .../configure-isis-to-use-shiro.png                | Bin
 .../configure-shiro-to-use-custom-jdbc-realm.png   | Bin
 .../configure-shiro-to-use-ini-realm.PNG           | Bin
 .../configure-shiro-to-use-isis-ldap-realm.PNG     | Bin
 ...s-security-module-realm-with-delegate-realm.PNG | Bin
 ...iro-to-use-isisaddons-security-module-realm.PNG | Bin
 .../security-apis-impl/security-apis-impl.pptx     | Bin
 .../security/_adoc/modules/ROOT/examples}/.gitkeep |   0
 .../security/_adoc}/modules/ROOT/nav.adoc          |   0
 .../_adoc/modules/ROOT}/pages/_attributes.adoc     |   0
 .../modules/ROOT}/pages/_partials/_attributes.adoc |   0
 .../security/_adoc}/modules/ROOT/pages/about.adoc  |   0
 .../modules/ROOT/pages/api-for-applications.adoc   |   0
 .../ROOT/pages/configuring-isis-to-use-shiro.adoc  | 108 +++
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc   |  26 +
 .../ROOT/pages/hints-and-tips}/_attributes.adoc    |   0
 .../configuring-isis-to-use-bypass.adoc            |   0
 .../modules/ROOT/pages/hints-and-tips/run-as.adoc  |   0
 .../ROOT/pages/hints-and-tips/shiro-caching.adoc   |   0
 .../shiro-isis-enhanced-wildcard-permission.adoc   |  59 ++
 .../ROOT/pages/shiro-realm-implementations.adoc    |   0
 .../shiro-realm-implementations}/_attributes.adoc  |   0
 .../shiro-realm-implementations/ini-realm.adoc     | 138 +++
 .../isis-ldap-realm.adoc                           |   0
 .../isisaddons-security-module-realm.adoc          |   0
 .../shiro-realm-implementations/jdbc-realm.adoc    |   0
 .../modules/ROOT/pages/usage-by-isis-viewers.adoc  | 219 +++++
 .../security/_adoc}/sync_examples.sh               |   0
 core/security/{ => api-and-bypass}/pom.xml         |   0
 .../isis/security/IsisBootSecurityBypass.java      |   0
 .../authentication/AuthenticationRequest.java      |   0
 .../AuthenticationRequestAbstract.java             |   0
 .../AuthenticationRequestPassword.java             |   0
 .../authentication/AuthenticationSession.java      |   0
 .../AuthenticationSessionAbstract.java             |   0
 .../AuthenticationSessionProvider.java             |   0
 .../security/authentication/MessageBroker.java     |   0
 .../authentication/bypass/AuthenticatorBypass.java |   0
 .../AuthenticationRequestLogonFixture.java         |   0
 .../fixtures/LogonFixtureAuthenticator.java        |   0
 .../authentication/health/HealthAuthSession.java   |   0
 .../manager/AuthenticationManager.java             |   0
 .../manager/AuthorizationManagerStandard.java      |   0
 .../manager/RegistrationDetails.java               |   0
 .../isis/security/authentication/package-info.java |   0
 .../AuthenticationRequestSingleUser.java           |   0
 .../singleuser/SingleUserSession.java              |   0
 .../standard/AuthenticationManagerStandard.java    |   0
 .../authentication/standard/Authenticator.java     |   0
 .../standard/AuthenticatorAbstract.java            |   0
 .../standard/AuthenticatorDefault.java             |   0
 .../standard/NoAuthenticatorException.java         |   0
 .../PasswordRequestAuthenticatorAbstract.java      |   0
 .../standard/RandomCodeGenerator.java              |   0
 .../standard/RandomCodeGenerator10Chars.java       |   0
 .../standard/RandomCodeGeneratorUUID.java          |   0
 .../authentication/standard/Registrar.java         |   0
 .../standard/RegistrationDetailsPassword.java      |   0
 .../authentication/standard/SimpleSession.java     |   0
 .../authorization/bypass/AuthorizorBypass.java     |   0
 .../manager/AuthorizationManager.java              |   0
 .../standard/AuthorizationConstants.java           |   0
 .../authorization/standard/Authorizor.java         |   0
 .../isis/security/EncodabilityContractTest.java    |   0
 .../fixture/LogonFixtureAuthenticatorTest.java     |   0
 .../standard/AuthenticatorDefaultTest.java         |   0
 .../SimpleSessionEncodabilityNoRolesTest.java      |   0
 .../SimpleSessionEncodabilityTestAbstract.java     |   0
 .../SimpleSessionEncodabilityWithRolesTest.java    |   0
 ...rdAuthenticationManager_AuthenticationTest.java |   0
 ...rdAuthenticationManager_AuthenticatorsTest.java |   0
 .../plugins/shiro}/NOTICE                          |   0
 .../plugins/shiro}/pom.xml                         |   0
 .../appended-resources/supplemental-models.xml     |   0
 .../isis/security/shiro/IsisBootSecurityShiro.java |   0
 .../security/shiro/IsisLdapContextFactory.java     |   0
 .../apache/isis/security/shiro/IsisLdapRealm.java  |   0
 .../isis/security/shiro/ShiroSecurityContext.java  |   0
 .../apache/isis/security/shiro/WebModuleShiro.java |   0
 .../shiro/authentication/ShiroAuthenticator.java   |   0
 .../shiro/authorization/IsisPermission.java        |   0
 .../authorization/IsisPermissionResolver.java      |   0
 .../shiro/authorization/ShiroAuthorizor.java       |   0
 .../permrolemapper/PermissionToRoleMapper.java     |   0
 .../PermissionToRoleMapperFromIni.java             |   0
 .../PermissionToRoleMapperFromString.java          |   0
 .../isis/security/shiro/permrolemapper/Util.java   |   0
 .../shiro/IsisPermissionTest_setParts.java         |   0
 .../shiro/IsisPermissionTest_typicalUsage.java     |   0
 ...AuthenticatorOrAuthorizorTest_authenticate.java |   0
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |   0
 .../authorization/IsisPermissionTest_equals.java   |   0
 .../PermissionToRoleMapperFromIniTest.java         |   0
 .../PermissionToRoleMapperFromStringTest.java      |   0
 .../shiro/permrolemapper/UtilTest_parse.java       |   0
 .../isis/security/shiro/permrolemapper/my.ini      |   0
 .../plugins/shiro}/src/test/resources/shiro.ini    |   0
 core/testsupport/_adoc/antora.yml                  |   6 +
 .../ug-sec => core/testsupport/_adoc}/examples.csv |   0
 .../_adoc/modules/ROOT}/_attributes.adoc           |   0
 .../modules/ROOT/assets/attachments}/.gitkeep      |   0
 .../images/testing/fixture-scripts/composite.png   | Bin
 .../images/testing/fixture-scripts/flat-1.png      | Bin
 .../images/testing/fixture-scripts/flat-2.png      | Bin
 .../organizing-fixture-scripts.pptx                | Bin
 .../fixture-scripts/prompt-specifying-number.png   | Bin
 .../images/testing/fixture-scripts/prompt.png      | Bin
 .../testing/fixture-scripts/prototyping-menu.png   | Bin
 .../images/testing/fixture-scripts/result-list.png | Bin
 .../ROOT/assets/images/testing/integ-tests.png     | Bin
 .../ROOT/assets/images/testing/integ-tests.pptx    | Bin
 .../ROOT/assets/images/testing/wrapper-factory.png | Bin
 .../_adoc/modules/ROOT/examples}/.gitkeep          |   0
 .../testsupport/_adoc}/modules/ROOT/nav.adoc       |   0
 .../_adoc/modules/ROOT}/pages/_attributes.adoc     |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../_adoc}/modules/ROOT/pages/about.adoc           |   0
 .../modules/ROOT/pages/bdd-spec-support.adoc       |   0
 .../ROOT/pages/bdd-spec-support}/_attributes.adoc  |   0
 .../ROOT/pages/bdd-spec-support/how-it-works.adoc  |   0
 .../bdd-spec-support/maven-configuration.adoc      |   0
 .../pages/bdd-spec-support/writing-a-bdd-spec.adoc |   0
 .../_adoc}/modules/ROOT/pages/fixture-scripts.adoc |   0
 .../ROOT/pages/fixture-scripts}/_attributes.adoc   |   0
 .../ROOT/pages/fixture-scripts/api-and-usage.adoc  | 355 ++++++++
 .../ROOT/pages/fixture-scripts/sudo-service.adoc   |   0
 .../fixture-scripts/ticking-clock-fixture.adoc     |   0
 .../modules/ROOT/pages/integ-test-support.adoc     |   0
 .../pages/integ-test-support}/_attributes.adoc     |   0
 .../pages/integ-test-support/abstract-class.adoc   |  77 ++
 .../pages/integ-test-support/bootstrapping.adoc    |   0
 .../configuration-properties.adoc                  |   0
 .../integ-test-support/maven-configuration.adoc    |   0
 .../pages/integ-test-support/typical-usage.adoc    |   0
 .../pages/integ-test-support/wrapper-factory.adoc  | 172 ++++
 .../_adoc}/modules/ROOT/pages/overview.adoc        |   0
 .../modules/ROOT/pages/unit-test-support.adoc      |   0
 .../ROOT/pages/unit-test-support}/_attributes.adoc |   0
 .../pages/unit-test-support/contract-tests.adoc    |   0
 .../pages/unit-test-support/jmock-extensions.adoc  |   0
 .../unit-test-support/maven-configuration.adoc     |   0
 .../soap-fake-server-junit-rule.adoc               |   0
 .../testsupport/_adoc}/sync_examples.sh            |   0
 core/{ => testsupport}/integtestsupport/pom.xml    |   0
 .../ExceptionRecognizerTranslate.java              |   0
 .../IsisIntegrationTestAbstact.java                |   0
 .../isis/integtestsupport/ThrowableMatchers.java   |   0
 .../components/AuthenticationManagerNull.java      |   0
 .../components/AuthorizationManagerAllowAll.java   |   0
 .../validate/ValidateDomainModel.java              |   0
 .../apache/isis/mavenplugin/IsisMojoAbstract.java  |   0
 .../apache/isis/mavenplugin/IsisMojoSwagger.java   |   0
 .../apache/isis/mavenplugin/IsisMojoValidate.java  |   0
 .../org/apache/isis/mavenplugin/IsisMojoXsd.java   |   0
 .../isis/mavenplugin/MetaModelProcessor.java       |   0
 .../IsisMavenPlugin_SpringContextConfig.java       |   0
 .../IsisMavenPlugin_SpringContextLauncher.java     |   0
 core/{ => testsupport}/integtestsupport/test.data  |   0
 core/{ => testsupport}/unittestsupport/.gitignore  |   0
 core/{ => testsupport}/unittestsupport/pom.xml     |   0
 .../AbstractApplyToAllContractTest.java            |   0
 ...irectionalRelationshipContractTestAbstract.java |   0
 .../apache/isis/unittestsupport/bidir/Child.java   |   0
 .../isis/unittestsupport/bidir/Instantiator.java   |   0
 .../unittestsupport/bidir/InstantiatorMap.java     |   0
 .../unittestsupport/bidir/InstantiatorSimple.java  |   0
 .../isis/unittestsupport/bidir/Instantiators.java  |   0
 .../apache/isis/unittestsupport/bidir/Parent.java  |   0
 .../ComparableContractTest_compareTo.java          |   0
 .../comparable/ComparableContractTester.java       |   0
 .../apache/isis/unittestsupport/files/Files.java   |   0
 ...rviceMethodMustBeFinalContractTestAbstract.java |   0
 .../isis/unittestsupport/jaxb/JaxbMatchers.java    |   0
 .../jmocking/ImposteriserUsingCodegenPlugin.java   |   0
 .../unittestsupport/jmocking/Imposterisers.java    |   0
 .../jmocking/InjectIntoJMockAction.java            |   0
 .../isis/unittestsupport/jmocking/IsisActions.java |   0
 .../unittestsupport/jmocking/JMockActions.java     |   0
 .../jmocking/JUnitRuleMockery2.java                |   0
 .../unittestsupport/jmocking/MyMockomatic.java     |   0
 .../unittestsupport/jmocking/PostponedAction.java  |   0
 .../unittestsupport/soap/PublishedEndpoints.java   |   0
 .../isis/unittestsupport/soap/SoapEndpoint.java    |   0
 .../soap/SoapEndpointPublishingRule.java           |   0
 .../unittestsupport/soap/SoapEndpointSpec.java     |   0
 .../sortedsets/SortedSetsContractTestAbstract.java |   0
 .../unittestsupport/streams/NullPrintStream.java   |   0
 .../isis/unittestsupport/utils/CollectUtils.java   |   0
 .../isis/unittestsupport/utils/IndentPrinter.java  |   0
 .../isis/unittestsupport/utils/ReflectUtils.java   |   0
 .../isis/unittestsupport/utils/StringUtils.java    |   0
 .../value/ValueTypeContractTestAbstract.java       |   0
 core/viewer-restfulobjects/_adoc/antora.yml        |   6 +
 .../viewer-restfulobjects/_adoc}/examples.csv      |   0
 .../_adoc/modules/ROOT}/_attributes.adoc           |   0
 .../modules/ROOT}/assets/attachments/.gitkeep      |   0
 .../ro-spec-resources-and-representations.png      | Bin
 .../images/rgfis}/service-collaborations.png       | Bin
 .../_adoc/modules/ROOT}/examples/.gitkeep          |   0
 .../_adoc}/modules/ROOT/nav.adoc                   |   0
 .../_adoc/modules/ROOT}/pages/_attributes.adoc     |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../_adoc}/modules/ROOT/pages/about.adoc           |   0
 .../_adoc/modules/ROOT/pages/architecture.adoc     |  54 ++
 .../ROOT/pages/configuration-properties.adoc       | 191 +++++
 .../_adoc}/modules/ROOT/pages/health-check.adoc    |   0
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc   |  27 +
 .../ROOT/pages/hints-and-tips}/_attributes.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
 .../_adoc/modules/ROOT/pages/layout-resources.adoc | 252 ++++++
 .../_adoc/modules/ROOT/pages/ro-spec.adoc          | 189 +++++
 .../ROOT/pages/simplified-representations.adoc     |  20 +
 .../simplified-representations}/_attributes.adoc   |   0
 .../action-invocation.adoc                         | 123 +++
 .../apache-isis-profile.adoc                       |   0
 .../configuration-properties.adoc                  |  16 +
 .../simplified-representations/domain-object.adoc  |   0
 .../object-collection.adoc                         |   0
 .../other-representations.adoc                     |   0
 .../viewer-restfulobjects/_adoc}/sync_examples.sh  |   0
 .../applib}/pom.xml                                |   0
 .../services/acceptheader/AcceptHeaderService.java |   0
 .../applib/services/acceptheader/package-info.java |   0
 .../apache/isis/viewer/legacy/ClientExecutor.java  |   0
 .../apache/isis/viewer/legacy/ClientRequest.java   |   0
 .../isis/viewer/legacy/ClientRequestFactory.java   |   0
 .../apache/isis/viewer/legacy/RestEasyLegacy.java  |   0
 .../restfulobjects/applib/JsonRepresentation.java  |   0
 .../restfulobjects/applib/LinkRepresentation.java  |   0
 .../isis/viewer/restfulobjects/applib/Rel.java     |   0
 .../restfulobjects/applib/RelDefinition.java       |   0
 .../restfulobjects/applib/RepresentationType.java  |   0
 .../restfulobjects/applib/RestfulHttpMethod.java   |   0
 .../restfulobjects/applib/RestfulMediaType.java    |   0
 .../applib/boot/BootstrapResource.java             |   0
 .../applib/client/ClientRequestConfigurer.java     |   0
 .../applib/client/RepresentationWalker.java        |   0
 .../applib/client/RestfulClient.java               |   0
 .../applib/client/RestfulClientException.java      |   0
 .../applib/client/RestfulRequest.java              |   0
 .../applib/client/RestfulResponse.java             |   0
 .../applib/client/UriBuilderPlugin.java            |   0
 .../AbstractObjectMemberRepresentation.java        |   0
 .../domainobjects/ActionResultRepresentation.java  |   0
 .../DomainObjectMemberRepresentation.java          |   0
 .../domainobjects/DomainObjectRepresentation.java  |   0
 .../applib/domainobjects/DomainObjectResource.java |   0
 .../applib/domainobjects/DomainRepresentation.java |   0
 .../domainobjects/DomainServiceResource.java       |   0
 .../applib/domainobjects/ListRepresentation.java   |   0
 .../domainobjects/ObjectActionRepresentation.java  |   0
 .../ObjectCollectionRepresentation.java            |   0
 .../ObjectPropertyRepresentation.java              |   0
 .../domainobjects/ScalarValueRepresentation.java   |   0
 .../AbstractTypeMemberRepresentation.java          |   0
 .../ActionDescriptionRepresentation.java           |   0
 .../ActionParameterDescriptionRepresentation.java  |   0
 .../CollectionDescriptionRepresentation.java       |   0
 .../domaintypes/DomainTypeRepresentation.java      |   0
 .../applib/domaintypes/DomainTypeResource.java     |   0
 .../PropertyDescriptionRepresentation.java         |   0
 .../TypeActionResultRepresentation.java            |   0
 .../applib/domaintypes/TypeListRepresentation.java |   0
 .../applib/errors/ErrorRepresentation.java         |   0
 .../applib/health/HealthRepresentation.java        |   0
 .../applib/health/HealthResource.java              |   0
 .../applib/homepage/HomePageRepresentation.java    |   0
 .../applib/homepage/HomePageResource.java          |   0
 .../applib/menubars/MenuBarsResource.java          |   0
 .../applib/user/UserRepresentation.java            |   0
 .../restfulobjects/applib/user/UserResource.java   |   0
 .../restfulobjects/applib/util/JsonMapper.java     |   0
 .../restfulobjects/applib/util/JsonNodeUtils.java  |   0
 .../restfulobjects/applib/util/MediaTypes.java     |   0
 .../viewer/restfulobjects/applib/util/Parser.java  |   0
 .../restfulobjects/applib/util/PathNode.java       |   0
 .../applib/util/UrlEncodingUtils.java              |   0
 .../applib/version/VersionRepresentation.java      |   0
 .../applib/version/VersionResource.java            |   0
 .../viewer/restfulobjects/applib/JsonFixture.java  |   0
 ...resentationTest_arrayGet_arraySetElementAt.java |   0
 .../JsonRepresentationTest_asInputStream.java      |   0
 .../applib/JsonRepresentationTest_getArray.java    |   0
 .../JsonRepresentationTest_getBigDecimal.java      |   0
 .../JsonRepresentationTest_getBigInteger.java      |   0
 .../applib/JsonRepresentationTest_getBoolean.java  |   0
 .../applib/JsonRepresentationTest_getDouble.java   |   0
 .../applib/JsonRepresentationTest_getInt.java      |   0
 .../JsonRepresentationTest_getLink_isLink.java     |   0
 .../applib/JsonRepresentationTest_getLong.java     |   0
 .../JsonRepresentationTest_getNull_isNull.java     |   0
 .../JsonRepresentationTest_getRepresentation.java  |   0
 .../JsonRepresentationTest_getString_isString.java |   0
 ...onRepresentationTest_isArray_isMap_isValue.java |   0
 .../applib/JsonRepresentationTest_mapHas.java      |   0
 .../applib/JsonRepresentationTest_newArray.java    |   0
 .../applib/JsonRepresentationTest_newObject.java   |   0
 .../applib/JsonRepresentationTest_putXxx.java      |   0
 .../applib/JsonRepresentationTest_size.java        |   0
 ...JsonRepresentationTest_streamArrayElements.java |   0
 .../JsonRepresentationTest_streamMapEntries.java   |   0
 .../applib/JsonRepresentationTest_urlEncoding.java |   0
 .../applib/LinkRepresentationTest_equals.java      |   0
 .../restfulobjects/applib/Rel_getName_Test.java    |   0
 ...entationTypeTest_getMediaType_ContractTest.java |   0
 ...epresentationTypeTest_getName_ContractTest.java |   0
 ...RepresentationTypeTest_lookup_ContractTest.java |   0
 ...RepresentationTypeTest_parser_ContractTest.java |   0
 .../applib/RestfulHttpMethodTest_setUp.java        |   0
 .../RestfulRequest_DomainModelTest_parser.java     |   0
 ...equestParameterTest_valueOf_xrodomainmodel.java |   0
 ...equestParameterTest_valueOf_xrofollowlinks.java |   0
 .../client/RestfulResponse_HeaderTest_Warning.java |   0
 .../client/RestfulResponse_HttpStatusCodeTest.java |   0
 ...mainObjectRepresentationTest_getCollection.java |   0
 ...ainObjectRepresentationTest_getCollections.java |   0
 ...mainObjectRepresentationTest_getProperties.java |   0
 ...DomainObjectRepresentationTest_getProperty.java |   0
 .../restfulobjects/applib/util/Parser_Test.java    |   0
 .../util/Parser_forCacheControl_ContractTest.java  |   0
 .../Parser_forJaxRsMediaType_ContractTest.java     |   0
 .../applib/util/PathNodeTest_equalsHashcode.java   |   0
 .../applib/util/PathNodeTest_parse.java            |   0
 .../applib/util/PathNodeTest_split.java            |   0
 .../applib/domainObjectRepresentation.json         |   0
 .../viewer/restfulobjects/applib/emptyList.json    |   0
 .../viewer/restfulobjects/applib/emptyMap.json     |   0
 .../isis/viewer/restfulobjects/applib/list.json    |   0
 .../restfulobjects/applib/listOfStrings.json       |   0
 .../isis/viewer/restfulobjects/applib/map.json     |   0
 .../viewer/restfulobjects/applib/servicesList.json |   0
 .../rendering}/pom.xml                             |   0
 .../viewer/restfulobjects/rendering/Caching.java   |   0
 .../rendering/ExceptionWithBody.java               |   0
 .../rendering/ExceptionWithHttpStatusCode.java     |   0
 .../restfulobjects/rendering/LinkBuilder.java      |   0
 .../restfulobjects/rendering/LinkFollowSpecs.java  |   0
 .../viewer/restfulobjects/rendering/OidUtils.java  |   0
 .../restfulobjects/rendering/RendererContext.java  |   0
 .../restfulobjects/rendering/RendererFactory.java  |   0
 .../restfulobjects/rendering/ReprRenderer.java     |   0
 .../rendering/ReprRendererAbstract.java            |   0
 .../rendering/ReprRendererException.java           |   0
 .../viewer/restfulobjects/rendering/Responses.java |   0
 .../RestfulObjectsApplicationException.java        |   0
 .../restfulobjects/rendering/UrlDecoderUtils.java  |   0
 .../AbstractObjectMemberReprRenderer.java          |   0
 .../domainobjects/ActionResultReprRenderer.java    |   0
 .../rendering/domainobjects/BodyArgs.java          |   0
 .../domainobjects/CollectionSemantics.java         |   0
 .../domainobjects/DomainObjectLinkTo.java          |   0
 .../domainobjects/DomainObjectReprRenderer.java    |   0
 .../domainobjects/DomainServiceLinkTo.java         |   0
 .../rendering/domainobjects/InvokeKeys.java        |   0
 .../rendering/domainobjects/JsonValueEncoder.java  |   0
 .../rendering/domainobjects/ListReprRenderer.java  |   0
 .../rendering/domainobjects/MemberReprMode.java    |   0
 .../rendering/domainobjects/MemberType.java        |   0
 .../rendering/domainobjects/MutatorSpec.java       |   0
 .../domainobjects/ObjectActionReprRenderer.java    |   0
 .../domainobjects/ObjectAdapterLinkTo.java         |   0
 .../rendering/domainobjects/ObjectAndAction.java   |   0
 .../domainobjects/ObjectAndActionInvocation.java   |   0
 .../domainobjects/ObjectAndCollection.java         |   0
 .../domainobjects/ObjectAndCollection2.java        |   0
 .../rendering/domainobjects/ObjectAndMember.java   |   0
 .../rendering/domainobjects/ObjectAndProperty.java |   0
 .../domainobjects/ObjectAndProperty2.java          |   0
 .../ObjectCollectionReprRenderer.java              |   0
 .../domainobjects/ObjectPropertyReprRenderer.java  |   0
 .../rendering/domainobjects/OidUtils.java          |   0
 .../domainobjects/ScalarValueReprRenderer.java     |   0
 .../AbstractTypeFeatureReprRenderer.java           |   0
 .../AbstractTypeMemberReprRenderer.java            |   0
 .../domaintypes/ActionDescriptionReprRenderer.java |   0
 .../ActionParameterDescriptionReprRenderer.java    |   0
 .../CollectionDescriptionReprRenderer.java         |   0
 .../domaintypes/DomainTypeReprRenderer.java        |   0
 .../domaintypes/ObjectSpecAndSuperSpec.java        |   0
 .../rendering/domaintypes/ParentSpecAndAction.java |   0
 .../domaintypes/ParentSpecAndActionParam.java      |   0
 .../domaintypes/ParentSpecAndCollection.java       |   0
 .../domaintypes/ParentSpecAndFeature.java          |   0
 .../domaintypes/ParentSpecAndProperty.java         |   0
 .../PropertyDescriptionReprRenderer.java           |   0
 .../domaintypes/TypeActionResultReprRenderer.java  |   0
 .../domaintypes/TypeListReprRenderer.java          |   0
 .../rendering/service/RepresentationService.java   |   0
 .../RepresentationServiceContentNegotiator.java    |   0
 .../acceptheader/AcceptHeaderServiceForRest.java   |   0
 .../service/conneg/ContentNegotiationService.java  |   0
 .../conneg/ContentNegotiationServiceAbstract.java  |   0
 ...entNegotiationServiceForRestfulObjectsV1_0.java |   0
 .../ContentNegotiationServiceOrgApacheIsisV1.java  |   0
 .../ContentNegotiationServiceXRoDomainType.java    |   0
 .../rendering/util/FollowSpecUtil.java             |   0
 .../rendering/util/JsonWriterUtil.java             |   0
 .../restfulobjects/rendering/util/ListUtils.java   |   0
 .../restfulobjects/rendering/util/MapUtils.java    |   0
 .../viewer/restfulobjects/rendering/util/Util.java |   0
 .../rendering/LinkFollowSpecsTest_follow.java      |   0
 .../JsonValueEncoderTest_appendValueAndFormat.java |   0
 .../JsonValueEncoderTest_asAdapter.java            |   0
 .../JsonValueEncoderTest_asObject.java             |   0
 .../rendering/util/MapUtilsTest.java               |   0
 .../server}/pom.xml                                |   0
 .../restfulobjects/IsisBootWebRestfulObjects.java  |   0
 .../IsisRestfulObjectsSessionFilter.java           |   0
 .../restfulobjects/WebModuleRestfulObjects.java    |   0
 .../server/AbstractJaxRsApplication.java           |   0
 .../server/IsisJaxrsServerPlugin.java              |   0
 .../restfulobjects/server/ResourceContext.java     |   0
 .../server/RestfulObjectsApplication.java          |   0
 .../server/RestfulObjectsApplicationException.java |   0
 .../server/mappers/ExceptionMapperAbstract.java    |   0
 .../mappers/ExceptionMapperForObjectNotFound.java  |   0
 ...xceptionMapperForRestfulObjectsApplication.java |   0
 .../ExceptionMapperForRuntimeException.java        |   0
 .../server/mappers/entity/ExceptionDetail.java     |   0
 .../server/mappers/entity/ExceptionPojo.java       |   0
 .../server/mappers/entity/package-info.java        |   0
 .../resources/DomainObjectResourceServerside.java  |   0
 .../server/resources/DomainResourceHelper.java     |   0
 .../resources/DomainServiceResourceServerside.java |   0
 .../resources/DomainServicesListReprRenderer.java  |   0
 .../resources/DomainTypeResourceServerside.java    |   0
 .../server/resources/HealthReprRenderer.java       |   0
 .../server/resources/HealthResourceServerside.java |   0
 .../server/resources/HomePageReprRenderer.java     |   0
 .../resources/HomePageResourceServerside.java      |   0
 .../server/resources/ImageResourceServerside.java  |   0
 .../server/resources/JsonParserHelper.java         |   0
 .../resources/MenuBarsResourceServerside.java      |   0
 .../server/resources/ObjectActionArgHelper.java    |   0
 .../resources/ObjectAdapterAccessHelper.java       |   0
 .../resources/ObjectAdapterUpdateHelper.java       |   0
 .../server/resources/ResourceAbstract.java         |   0
 .../server/resources/SwaggerSpecResource.java      |   0
 .../server/resources/UserReprRenderer.java         |   0
 .../server/resources/UserResourceServerside.java   |   0
 .../server/resources/VersionReprRenderer.java      |   0
 .../resources/VersionResourceServerside.java       |   0
 .../serialization/SerializationStrategy.java       |   0
 .../restfulobjects/server/util/UrlParserUtils.java |   0
 .../IsisTransactionFilterForRestfulObjects.java    |   0
 ...ulObjectsSessionFilter_lookupPassThru_Test.java |   0
 .../server/ResourceContextTest_getArg.java         |   0
 .../server/ResourceContextTest_stripQuotes.java    |   0
 ..._ensureCompatibleAcceptHeader_ContractTest.java |   0
 ...tsApplicationExceptionMapper_Test_Contract.java |   0
 .../DomainResourceHelperTest_readBodyAsMap.java    |   0
 .../server/resources/JsonParserHelpTest.java       |   0
 .../server/util/UrlParserUtilsTest.java            |   0
 core/viewer-wicket/_adoc/antora.yml                |   6 +
 .../rg => core/viewer-wicket/_adoc}/examples.csv   |   0
 .../_adoc/modules/ROOT}/_attributes.adoc           |   0
 .../modules/ROOT/assets/attachments}/.gitkeep      |   0
 .../ROOT/assets/images/about-page/about-page.png   | Bin
 .../assets/images/application-menu/dividers.png    | Bin
 .../images/application-menu/layout-menus.pdn       | Bin
 .../images/application-menu/layout-menus.png       | Bin
 .../assets/images/application-menu/tertiary.png    | Bin
 .../blob-attachments/010-attachment-field-940.png  | Bin
 .../blob-attachments/010-attachment-field.png      | Bin
 .../blob-attachments/020-edit-choose-file-940.png  | Bin
 .../blob-attachments/020-edit-choose-file.png      | Bin
 .../030-choose-file-using-browser-520.png          | Bin
 .../030-choose-file-using-browser.png              | Bin
 .../040-edit-chosen-file-indicated-940.png         | Bin
 .../040-edit-chosen-file-indicated.png             | Bin
 .../050-ok-if-image-then-rendered-940.png          | Bin
 .../050-ok-if-image-then-rendered.png              | Bin
 .../images/blob-attachments/060-download-940.png   | Bin
 .../images/blob-attachments/060-download.png       | Bin
 .../images/blob-attachments/070-edit-clear-940.png | Bin
 .../images/blob-attachments/070-edit-clear.png     | Bin
 .../assets/images/bookmarked-pages/panel-940.png   | Bin
 .../images/bookmarked-pages/panel-estatio-940.png  | Bin
 .../images/bookmarked-pages/panel-estatio.png      | Bin
 .../ROOT/assets/images/bookmarked-pages/panel.png  | Bin
 .../assets/images/brand-logo/brand-logo-signin.png | Bin
 .../ROOT/assets/images/brand-logo/brand-logo.png   | Bin
 .../images/copy-link/010-copy-link-button-940.png  | Bin
 .../images/copy-link/010-copy-link-button.png      | Bin
 .../images/copy-link/020-copy-link-dialog-940.png  | Bin
 .../images/copy-link/020-copy-link-dialog.png      | Bin
 .../ROOT/assets/images/copy-link/030-hints-940.png | Bin
 .../ROOT/assets/images/copy-link/030-hints.png     | Bin
 .../copy-link/040-copy-link-with-hints-940.png     | Bin
 .../images/copy-link/040-copy-link-with-hints.png  | Bin
 .../assets/images/copy-link/050-title-url-940.png  | Bin
 .../ROOT/assets/images/copy-link/050-title-url.png | Bin
 .../ROOT/assets/images/dialog-mode/modal.png       | Bin
 .../ROOT/assets/images/dialog-mode/sidebar.png     | Bin
 .../ROOT/assets/images/embedded-view/no-footer.png | Bin
 .../images/embedded-view/no-header-no-footer.png   | Bin
 .../ROOT/assets/images/embedded-view/no-header.png | Bin
 .../ROOT/assets/images/embedded-view/regular.png   | Bin
 .../images/features/recent-pages/recent-pages.png  | Bin
 .../object-titles-and-icons/cust-order-product.png | Bin
 .../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
 .../assets/images/layout-dynamic-xml/ToDoItem.png  | Bin
 .../ROOT/assets/images/layouts/customer-order.png  | Bin
 .../ROOT/assets/images/layouts/estatio-Invoice.png | Bin
 .../ROOT/assets/images/layouts/estatio-Lease.png   | Bin
 .../assets/images/layouts/estatio-LeaseItem.png    | Bin
 .../assets/images/layouts/todoapp-ToDoItem.png     | Bin
 .../ROOT/assets/images/menubars/010-download.png   | Bin
 .../ROOT/assets/images/menubars/020-download.png   | Bin
 .../assets/images/reference-layout/4-0-8-0.png     | Bin
 .../assets/images/reference-layout/4-4-4-12.png    | Bin
 .../assets/images/reference-layout/6-6-0-12.png    | Bin
 .../reference-layout/isis-layout-show-facets.css   |   0
 .../assets/images/reference-layout/isis-layout.css |   0
 .../images/reference-layout/layout-4-0-8-0.html    |   0
 .../images/reference-layout/layout-4-4-4-12.html   |   0
 .../images/reference-layout/layout-6-6-0-12.html   |   0
 .../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/assets/images/theme-chooser/example-1.png | Bin
 .../ROOT/assets/images/theme-chooser/example-2.png | Bin
 .../user-registration}/login-page-default.png      | Bin
 .../sign-up-after-registration.png                 | Bin
 .../sign-up-email-with-verification-link.png       | Bin
 .../sign-up-login-page-after-sign-up.png           | Bin
 .../images/user-registration/sign-up-page.png      | Bin
 .../sign-up-registration-page.png                  | Bin
 .../assets/images/where-am-i/hello_grey_bg.png     | Bin
 .../_adoc/modules/ROOT/examples}/.gitkeep          |   0
 .../viewer-wicket/_adoc}/modules/ROOT/nav.adoc     |   0
 .../_adoc}/modules/ROOT/pages/_attributes.adoc     |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../_adoc}/modules/ROOT/pages/about.adoc           |   0
 .../ROOT/pages/configuration-properties.adoc       | 933 +++++++++++++++++++++
 .../_adoc}/modules/ROOT/pages/customisation.adoc   |   0
 .../ROOT/pages/customisation}/_attributes.adoc     |   0
 .../ROOT/pages/customisation/about-page.adoc       |  93 ++
 .../ROOT/pages/customisation/auto-refresh.adoc     |   0
 .../ROOT/pages/customisation/brand-logo.adoc       |   0
 .../customisation/cheap-n-cheerful-theme.adoc      |  27 +
 .../pages/customisation/custom-javascript.adoc     |  31 +
 .../pages/customisation/request-parameters.adoc    |   0
 .../pages/customisation/top-level-index-page.adoc  |   0
 .../pages/customisation/tweaking-css-classes.adoc  | 244 ++++++
 .../customisation/using-different-css-file.adoc    |   0
 .../ROOT/pages/customisation/welcome-page.adoc     |  35 +
 .../_adoc/modules/ROOT/pages/extending.adoc        |  21 +
 .../modules/ROOT/pages/extending}/_attributes.adoc |   0
 .../pages/extending/custom-bootstrap-theme.adoc    |  35 +
 .../modules/ROOT/pages/extending/custom-pages.adoc |  93 ++
 .../login-via-query-args-prototyping.adoc          |   0
 .../pages/extending/replacing-page-elements.adoc   | 183 ++++
 .../_adoc}/modules/ROOT/pages/features.adoc        |   0
 .../modules/ROOT/pages/features}/_attributes.adoc  |   0
 .../ROOT/pages/features/blob-attachments.adoc      | 116 +++
 .../ROOT/pages/features/bookmarked-pages.adoc      | 102 +++
 .../ROOT/pages/features/hints-and-copy-url.adoc    |  74 ++
 .../modules/ROOT/pages/features/recent-pages.adoc  |  49 ++
 .../pages/features/sidebar-vs-modal-dialogs.adoc   |  32 +
 .../ROOT/pages/features/titles-in-tables.adoc      |  77 ++
 .../ROOT/pages/features/user-registration.adoc     |  79 ++
 .../modules/ROOT/pages/features/where-am-i.adoc    | 105 +++
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc   |  24 +
 .../ROOT/pages/hints-and-tips}/_attributes.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
 .../_adoc/modules/ROOT/pages/incode-platform.adoc  |  32 +
 .../_adoc/modules/ROOT/pages/layout.adoc           |  14 +
 .../modules/ROOT/pages/layout}/_attributes.adoc    |   0
 .../ROOT/pages/layout/annotation-based.adoc        | 190 +++++
 .../modules/ROOT/pages/layout/file-based.adoc      | 464 ++++++++++
 .../modules/ROOT/pages/layout/table-columns.adoc   |   0
 .../_adoc}/modules/ROOT/pages/menubars-layout.adoc |   0
 .../ROOT/pages/menubars-layout}/_attributes.adoc   |   0
 .../pages/menubars-layout/annotation-based.adoc    |   0
 .../ROOT/pages/menubars-layout/file-based.adoc     | 103 +++
 .../viewer-wicket/_adoc}/sync_examples.sh          |   0
 .../impl}/pom.xml                                  |   0
 .../viewer/wicket/viewer/IsisBootWebWicket.java    |   0
 .../wicket/viewer/IsisWicketApplication.java       |   0
 .../viewer/IsisWicketApplication_Experimental.java |   0
 ...rgetRespondListenerToResetQueryResultCache.java |   0
 .../isis/viewer/wicket/viewer/WebModuleWicket.java |   0
 .../imagecache/ImageResourceCacheClassPath.java    |   0
 .../viewer/imagecache/ImageResourceCacheKey.java   |   0
 .../wicket/AnonymousWebSessionForIsis.java         |   0
 .../wicket/AuthenticatedWebSessionForIsis.java     |   0
 .../wicket/ConverterForObjectAdapter.java          |   0
 .../wicket/ConverterForObjectAdapterMemento.java   |   0
 .../integration/wicket/LocalizerForIsis.java       |   0
 .../integration/wicket/WebRequestCycleForIsis.java |   0
 .../ObjectAdapterMementoSupportUsingSpring.java    |   0
 .../ComponentFactoryRegistrarDefault.java          |   0
 .../ComponentFactoryRegistryDefault.java           |   0
 .../registries/pages/PageClassListDefault.java     |   0
 .../registries/pages/PageClassRegistryDefault.java |   0
 .../pages/PageNavigationServiceDefault.java        |   0
 .../viewer/services/BookmarkUiServiceWicket.java   |   0
 .../viewer/services/DeepLinkServiceWicket.java     |   0
 .../services/EmailNotificationServiceWicket.java   |   0
 .../services/HintStoreUsingWicketSession.java      |   0
 .../viewer/services/LocaleProviderWicket.java      |   0
 .../wicket/viewer/services/Object_clearHints.java  |   0
 .../services/TranslationsResolverWicket.java       |   0
 .../viewer/settings/IsisResourceSettings.java      |   0
 .../settings/WicketViewerSettingsDefault.java      |   0
 .../impl}/src/main/resources/log4j.properties      |   0
 .../viewer/IsisWicketApplication_Defaults.java     |   0
 .../wicket/viewer/IsisWicketApplication_Pages.java |   0
 ...uthenticatedWebSessionForIsis_Authenticate.java |   0
 ...ionForIsis_DownCastsInheritedFunctionality.java |   0
 ...thenticatedWebSessionForIsis_Instantiation.java |   0
 ...ticatedWebSessionForIsis_NotYetImplemented.java |   0
 .../AuthenticatedWebSessionForIsis_SignIn.java     |   0
 .../imagecache/ImageResourceCacheKeyTest.java      |   0
 .../pages/PageClassListDefault_Instantiation.java  |   0
 ...ageClassListDefault_RegistrationAndCaching.java |   0
 .../pages/PageClassListDefault_Instantiation.java  |   0
 .../services/TranslationsResolverWicketTest.java   |   0
 .../model}/pom.xml                                 |   0
 .../common/OnConcurrencyExceptionHandler.java      |   0
 .../wicket/model/common/OnSelectionHandler.java    |   0
 .../wicket/model/common/PageParametersUtils.java   |   0
 .../wicket/model/hints/HasUiHintDisambiguator.java |   0
 .../model/hints/IsisActionCompletedEvent.java      |   0
 .../wicket/model/hints/IsisEnvelopeEvent.java      |   0
 .../wicket/model/hints/IsisEventAbstract.java      |   0
 .../model/hints/IsisEventLetterAbstract.java       |   0
 .../hints/IsisPropertyEditCompletedEvent.java      |   0
 .../wicket/model/hints/IsisSelectorEvent.java      |   0
 .../viewer/wicket/model/hints/UiHintContainer.java |   0
 .../wicket/model/isis/WicketViewerSettings.java    |   0
 .../model/isis/WicketViewerSettingsAccessor.java   |   0
 .../viewer/wicket/model/links/LinkAndLabel.java    |   0
 .../viewer/wicket/model/links/LinksProvider.java   |   0
 .../wicket/model/links/ListOfLinksModel.java       |   0
 .../wicket/model/mementos/ActionMemento.java       |   0
 .../model/mementos/ActionParameterMemento.java     |   0
 .../wicket/model/mementos/CollectionMemento.java   |   0
 .../mementos/ObjectAdapterMemento_Legacy.java      |   0
 .../wicket/model/mementos/PageParameterNames.java  |   0
 .../wicket/model/mementos/PropertyMemento.java     |   0
 .../viewer/wicket/model/models/AboutModel.java     |   0
 .../wicket/model/models/ActionArgumentModel.java   |   0
 .../viewer/wicket/model/models/ActionModel.java    |   0
 .../viewer/wicket/model/models/ActionPrompt.java   |   0
 .../wicket/model/models/ActionPromptProvider.java  |   0
 .../model/models/ActionPromptWithExtraContent.java |   0
 .../wicket/model/models/BookmarkTreeNode.java      |   0
 .../model/models/BookmarkTreeNodeComparator.java   |   0
 .../wicket/model/models/BookmarkableModel.java     |   0
 .../wicket/model/models/BookmarkedPagesModel.java  |   0
 .../wicket/model/models/EntityCollectionModel.java |   0
 .../viewer/wicket/model/models/EntityModel.java    |   0
 .../model/models/EntityModelForReference.java      |   0
 .../viewer/wicket/model/models/FormExecutor.java   |   0
 .../wicket/model/models/FormExecutorContext.java   |   0
 .../model/models/HintPageParameterSerializer.java  |   0
 .../wicket/model/models/ImageResourceCache.java    |   0
 .../wicket/model/models/InlinePromptContext.java   |   0
 .../viewer/wicket/model/models/ModelAbstract.java  |   0
 .../wicket/model/models/ObjectAdapterModel.java    |   0
 .../isis/viewer/wicket/model/models/PageType.java  |   0
 .../model/models/ParentEntityModelProvider.java    |   0
 .../viewer/wicket/model/models/ScalarModel.java    |   0
 .../model/models/ScalarModelWithMultiPending.java  |   0
 .../model/models/ScalarModelWithPending.java       |   0
 .../wicket/model/models/ServiceActionsModel.java   |   0
 .../model/models/ToggledMementosProvider.java      |   0
 .../isis/viewer/wicket/model/models/Util.java      |   0
 .../viewer/wicket/model/models/ValueModel.java     |   0
 .../isis/viewer/wicket/model/models/VoidModel.java |   0
 .../viewer/wicket/model/models/WelcomeModel.java   |   0
 .../wicket/model/models/WicketComponentUtils.java  |   0
 .../model/models/whereami/WhereAmIModel.java       |   0
 .../models/whereami/WhereAmIModelDefault.java      |   0
 .../viewer/wicket/model/util/ComponentHintKey.java |   0
 .../wicket/model/models/ActionModelTest.java       |   0
 .../wicket/model/models/EntityModel_hintsTest.java |   0
 .../models/LowestCommonSuperclassClosureTest.java  |   0
 .../ScalarModel_isScalarSubtypingAnyOf_Test.java   |   0
 .../{viewer-wicket-ui => viewer-wicket/ui}/pom.xml |   0
 .../ui}/src/main/java/images/Images.java           |   0
 .../wicket/ui/CollectionContentsAsFactory.java     |   0
 .../isis/viewer/wicket/ui/ComponentFactory.java    |   0
 .../viewer/wicket/ui/ComponentFactoryAbstract.java |   0
 .../isis/viewer/wicket/ui/ComponentType.java       |   0
 .../apache/isis/viewer/wicket/ui/DialogMode.java   |   0
 .../wicket/ui/HeaderContributorProvider.java       |   0
 .../ui/actionresponse/ActionResultResponse.java    |   0
 .../ActionResultResponseHandlingStrategy.java      |   0
 .../actionresponse/ActionResultResponseType.java   |   0
 .../ui/app/registry/ComponentFactoryRegistrar.java |   0
 .../ui/app/registry/ComponentFactoryRegistry.java  |   0
 .../registry/ComponentFactoryRegistryAccessor.java |   0
 .../wicket/ui/components/about/AboutPanel.html     |   0
 .../wicket/ui/components/about/AboutPanel.java     |   0
 .../ui/components/about/AboutPanelFactory.java     |   0
 .../ui/components/about/JarManifestAttributes.java |   0
 .../ui/components/about/JarManifestListView.java   |   0
 .../ui/components/about/JarManifestModel.java      |   0
 .../ui/components/about/JarManifestPanel.css       |   0
 .../ui/components/about/JarManifestPanel.html      |   0
 .../ui/components/about/JarManifestPanel.java      |   0
 .../wicket/ui/components/about/div-toggle.js       |   0
 .../ui/components/actioninfo/ActionInfoPanel.html  |   0
 .../ui/components/actioninfo/ActionInfoPanel.java  |   0
 .../actioninfo/ActionInfoPanelFactory.java         |   0
 .../ui/components/actionlink/ActionLinkPanel.html  |   0
 .../ui/components/actionlink/ActionLinkPanel.java  |   0
 .../actionlink/ActionLinkPanelFactory.java         |   0
 .../components/actionmenu/CssClassFaBehavior.java  |   0
 .../AdditionalLinksAsDropDownPanel.html            |   0
 .../AdditionalLinksAsDropDownPanel.java            |   0
 .../AdditionalLinksAsListInlinePanel.html          |   0
 .../AdditionalLinksAsListInlinePanel.java          |   0
 .../entityactions/AdditionalLinksPanel.java        |   0
 .../entityactions/EntityActionLinkFactory.java     |   0
 .../actionmenu/entityactions/LinkAndLabelUtil.java |   0
 .../actionmenu/serviceactions/CssMenuItem.java     |   0
 .../serviceactions/CssMenuItemPanelAbstract.java   |   0
 .../serviceactions/CssSubMenuItemsPanel.html       |   0
 .../serviceactions/CssSubMenuItemsPanel.java       |   0
 .../serviceactions/ServiceActionLinkFactory.java   |   0
 .../serviceactions/ServiceActionUtil.java          |   0
 .../serviceactions/ServiceActionsPanel.css         |   0
 .../serviceactions/ServiceActionsPanel.html        |   0
 .../serviceactions/ServiceActionsPanel.java        |   0
 .../serviceactions/ServiceActionsPanelFactory.java |   0
 .../serviceactions/ServiceAndAction.java           |   0
 .../serviceactions/TertiaryActionsPanel.css        |   0
 .../serviceactions/TertiaryActionsPanel.html       |   0
 .../serviceactions/TertiaryActionsPanel.java       |   0
 .../serviceactions/TertiaryMenuPanelFactory.java   |   0
 .../actionprompt/ActionPromptHeaderPanel.html      |   0
 .../actionprompt/ActionPromptHeaderPanel.java      |   0
 .../actionprompt/ActionPromptModalWindow.html      |   0
 .../actionprompt/ActionPromptModalWindow.java      |   0
 .../actionpromptsb/ActionPromptSidebar.html        |   0
 .../actionpromptsb/ActionPromptSidebar.java        |   0
 .../actions/ActionFormExecutorStrategy.java        |   0
 .../components/actions/ActionParametersForm.java   |   0
 .../actions/ActionParametersFormPanel.html         |   0
 .../actions/ActionParametersFormPanel.java         |   0
 .../actions/ActionParametersFormPanel.properties   |   0
 .../actions/ActionParametersFormPanelFactory.java  |   0
 .../components/actions/ActionParametersPanel.html  |   0
 .../components/actions/ActionParametersPanel.java  |   0
 .../actions/ActionParametersPanelFactory.java      |   0
 .../bookmarkedpages/BookmarkedPagesPanel.css       |   0
 .../bookmarkedpages/BookmarkedPagesPanel.html      |   0
 .../bookmarkedpages/BookmarkedPagesPanel.java      |   0
 .../BookmarkedPagesPanelFactory.java               |   0
 .../bookmarkedpages/images/clear_bookmarks.png     | Bin
 .../ui/components/bookmarkedpages/slide-panel.js   |   0
 .../collection/AssociatedWithActionsHelper.java    |   0
 .../ui/components/collection/CollectionPanel.html  |   0
 .../ui/components/collection/CollectionPanel.java  |   0
 .../collection/bulk/BulkActionsProvider.java       |   0
 .../collection/count/CollectionCountProvider.java  |   0
 .../selector/CollectionSelectorHelper.java         |   0
 .../selector/CollectionSelectorPanel.html          |   0
 .../selector/CollectionSelectorPanel.java          |   0
 .../selector/CollectionSelectorProvider.java       |   0
 .../CollectionContentsAsAjaxTablePanel.html        |   0
 .../CollectionContentsAsAjaxTablePanel.java        |   0
 .../CollectionContentsAsAjaxTablePanelFactory.java |   0
 .../CollectionContentsSortableDataProvider.java    |   0
 .../ajaxtable/IsisAjaxFallbackDataTable.java       |   0
 .../ajaxtable/IsisAjaxFallbackHeadersToolbar.java  |   0
 .../ajaxtable/IsisAjaxFallbackOrderByBorder.java   |   0
 .../ajaxtable/IsisAjaxHeadersToolbar.html          |   0
 .../ajaxtable/IsisAjaxHeadersToolbar.java          |   0
 .../ajaxtable/IsisAjaxNavigationToolbar.html       |   0
 .../ajaxtable/IsisAjaxNavigationToolbar.java       |   0
 .../ajaxtable/IsisAjaxPagingNavigation.java        |   0
 .../IsisAjaxPagingNavigationIncrementLink.java     |   0
 .../ajaxtable/IsisAjaxPagingNavigationLink.java    |   0
 .../ajaxtable/IsisAjaxPagingNavigator.java         |   0
 .../ajaxtable/IsisTotalRecordsToolbar.html         |   0
 .../ajaxtable/IsisTotalRecordsToolbar.java         |   0
 .../ajaxtable/PrototypingMessageProvider.java      |   0
 .../ajaxtable/columns/ColumnAbstract.java          |   0
 .../columns/ObjectAdapterPropertyColumn.java       |   0
 .../columns/ObjectAdapterTitleColumn.java          |   0
 .../columns/ObjectAdapterToggleboxColumn.java      |   0
 .../ajaxtable/images/arrow_down.png                | Bin
 .../ajaxtable/images/arrow_off.png                 | Bin
 .../ajaxtable/images/arrow_up.png                  | Bin
 .../icons/CollectionContentsAsIconsPanel.html      |   0
 .../icons/CollectionContentsAsIconsPanel.java      |   0
 .../CollectionContentsAsIconsPanelFactory.java     |   0
 .../CollectionContentsMultipleViewsPanel.html      |   0
 .../CollectionContentsMultipleViewsPanel.java      |   0
 ...ollectionContentsMultipleViewsPanelFactory.java |   0
 .../summary/CollectionContentsAsSummary.html       |   0
 .../summary/CollectionContentsAsSummary.java       |   0
 .../CollectionContentsAsSummaryFactory.java        |   0
 .../unresolved/CollectionContentsHiddenPanel.html  |   0
 .../unresolved/CollectionContentsHiddenPanel.java  |   0
 .../CollectionContentsHiddenPanelFactory.java      |   0
 .../ui/components/empty/EmptyCollectionPanel.html  |   0
 .../ui/components/empty/EmptyCollectionPanel.java  |   0
 .../empty/EmptyCollectionPanelFactory.java         |   0
 .../entity/EntityComponentFactoryAbstract.java     |   0
 .../entity/collection/EntityCollectionPanel.html   |   0
 .../entity/collection/EntityCollectionPanel.java   |   0
 .../collection/EntityCollectionPanelFactory.java   |   0
 .../components/entity/fieldset/PropertyGroup.html  |   0
 .../components/entity/fieldset/PropertyGroup.java  |   0
 .../entity/header/EntityHeaderPanel.html           |   0
 .../entity/header/EntityHeaderPanel.java           |   0
 .../entity/header/EntityHeaderPanelFactory.java    |   0
 .../entity/icontitle/EntityIconAndTitlePanel.html  |   0
 .../entity/icontitle/EntityIconAndTitlePanel.java  |   0
 .../icontitle/EntityIconAndTitlePanelFactory.java  |   0
 .../icontitle/EntityIconTitleAndCopyLinkPanel.html |   0
 .../icontitle/EntityIconTitleAndCopyLinkPanel.java |   0
 .../EntityIconTitleAndCopyLinkPanelFactory.java    |   0
 .../selector/links/EntityLinksSelectorPanel.html   |   0
 .../selector/links/EntityLinksSelectorPanel.java   |   0
 .../links/EntityLinksSelectorPanelFactory.java     |   0
 .../wicket/ui/components/footer/CreditImage.java   |   0
 .../wicket/ui/components/footer/CreditName.java    |   0
 .../wicket/ui/components/footer/FooterPanel.html   |   0
 .../wicket/ui/components/footer/FooterPanel.java   |   0
 .../ui/components/footer/FooterPanelFactory.java   |   0
 .../wicket/ui/components/header/HeaderPanel.html   |   0
 .../wicket/ui/components/header/HeaderPanel.java   |   0
 .../ui/components/header/HeaderPanelFactory.java   |   0
 .../ui/components/layout/bs3/BS3GridPanel.html     |   0
 .../ui/components/layout/bs3/BS3GridPanel.java     |   0
 .../wicket/ui/components/layout/bs3/Util.java      |   0
 .../components/layout/bs3/clearfix/ClearFix.html   |   0
 .../components/layout/bs3/clearfix/ClearFix.java   |   0
 .../wicket/ui/components/layout/bs3/col/Col.html   |   0
 .../wicket/ui/components/layout/bs3/col/Col.java   |   0
 ...RepeatingViewWithDynamicallyVisibleContent.java |   0
 .../wicket/ui/components/layout/bs3/row/Row.html   |   0
 .../wicket/ui/components/layout/bs3/row/Row.java   |   0
 .../components/layout/bs3/tabs/TabGroupPanel.java  |   0
 .../ui/components/layout/bs3/tabs/TabPanel.html    |   0
 .../ui/components/layout/bs3/tabs/TabPanel.java    |   0
 .../ui/components/property/PropertyEditForm.java   |   0
 .../components/property/PropertyEditFormPanel.html |   0
 .../components/property/PropertyEditFormPanel.java |   0
 .../property/PropertyEditFormPanel.properties      |   0
 .../property/PropertyEditFormPanelFactory.java     |   0
 .../ui/components/property/PropertyEditPanel.html  |   0
 .../ui/components/property/PropertyEditPanel.java  |   0
 .../property/PropertyEditPanelFactory.java         |   0
 .../property/PropertyFormExecutorStrategy.java     |   0
 .../PropertyEditPromptHeaderPanel.html             |   0
 .../PropertyEditPromptHeaderPanel.java             |   0
 .../scalars/ComponentFactoryScalarAbstract.java    |   0
 .../ui/components/scalars/DateConverter.java       |   0
 .../components/scalars/DateConverterAbstract.java  |   0
 .../ui/components/scalars/DateConverterPlugin.java |   0
 .../ui/components/scalars/DateFormatSettings.java  |   0
 .../components/scalars/IsisConverterLocator.java   |   0
 .../components/scalars/ScalarModelSubscriber.java  |   0
 .../components/scalars/ScalarModelSubscriber2.java |   0
 .../ui/components/scalars/ScalarPanelAbstract.java |   0
 .../components/scalars/ScalarPanelAbstract2.java   |   0
 .../scalars/ScalarPanelSelect2Abstract.java        |   0
 .../scalars/ScalarPanelTextFieldAbstract.html      |   0
 .../scalars/ScalarPanelTextFieldAbstract.java      |   0
 .../ScalarPanelTextFieldDatePickerAbstract.java    |   0
 .../scalars/ScalarPanelTextFieldNumeric.java       |   0
 .../ScalarPanelTextFieldParseableAbstract.java     |   0
 .../ui/components/scalars/TextFieldAbstract.java   |   0
 .../components/scalars/TextFieldStringModel.java   |   0
 .../ui/components/scalars/TextFieldValueModel.java |   0
 .../ui/components/scalars/XEditableBehavior2.java  |   0
 .../scalars/datepicker/DateTimeConfig.java         |   0
 .../datepicker/TextFieldWithDateTimePicker.java    |   0
 .../datepicker/css/bootstrap-datetimepicker.css    |   0
 .../css/bootstrap-datetimepicker.min.css           |   0
 .../datepicker/js/bootstrap-datetimepicker.js      |   0
 .../datepicker/js/bootstrap-datetimepicker.min.js  |   0
 .../ui/components/scalars/datepicker/js/moment.js  |   0
 .../components/scalars/datepicker/js/moment.min.js |   0
 .../scalars/image/JavaAwtImagePanel.html           |   0
 .../scalars/image/JavaAwtImagePanel.java           |   0
 .../scalars/image/JavaAwtImagePanelFactory.java    |   0
 .../components/scalars/image/wupb-progressBar.css  |   0
 .../isisapplib/IsisBlobOrClobPanelAbstract.html    |   0
 .../isisapplib/IsisBlobOrClobPanelAbstract.java    |   0
 .../scalars/isisapplib/IsisBlobPanel.java          |   0
 .../scalars/isisapplib/IsisBlobPanelFactory.java   |   0
 .../scalars/isisapplib/IsisClobPanel.java          |   0
 .../scalars/isisapplib/IsisClobPanelFactory.java   |   0
 .../scalars/isisapplib/IsisColorPanel.java         |   0
 .../scalars/isisapplib/IsisColorPanelFactory.java  |   0
 .../scalars/isisapplib/IsisMoneyPanel.java         |   0
 .../scalars/isisapplib/IsisMoneyPanelFactory.java  |   0
 .../scalars/isisapplib/IsisPasswordPanel.java      |   0
 .../isisapplib/IsisPasswordPanelFactory.java       |   0
 .../scalars/isisapplib/IsisPercentagePanel.java    |   0
 .../isisapplib/IsisPercentagePanelFactory.java     |   0
 .../scalars/isisapplib/IsisTimePanel.java          |   0
 .../scalars/isisapplib/ResourceLinkVolatile.java   |   0
 .../jdk8time/DateConverterForJdk8Abstract.java     |   0
 .../jdk8time/DateConverterForJdk8LocalDate.java    |   0
 .../DateConverterForJdk8LocalDateTime.java         |   0
 .../DateConverterForJdk8OffsetDateTime.java        |   0
 .../scalars/jdk8time/Jdk8LocalDatePanel.java       |   0
 .../jdk8time/Jdk8LocalDatePanelFactory.java        |   0
 .../scalars/jdk8time/Jdk8LocalDateTimePanel.java   |   0
 .../jdk8time/Jdk8LocalDateTimePanelFactory.java    |   0
 .../scalars/jdk8time/Jdk8OffsetDateTimePanel.java  |   0
 .../jdk8time/Jdk8OffsetDateTimePanelFactory.java   |   0
 .../jdkdates/DateConverterForJavaAbstract.java     |   0
 .../jdkdates/DateConverterForJavaSqlDate.java      |   0
 .../jdkdates/DateConverterForJavaSqlTimestamp.java |   0
 .../jdkdates/DateConverterForJavaUtilDate.java     |   0
 .../scalars/jdkdates/JavaSqlDatePanel.java         |   0
 .../scalars/jdkdates/JavaSqlDatePanelFactory.java  |   0
 .../scalars/jdkdates/JavaSqlTimePanel.java         |   0
 .../scalars/jdkdates/JavaSqlTimePanelFactory.java  |   0
 .../scalars/jdkdates/JavaSqlTimestampPanel.java    |   0
 .../jdkdates/JavaSqlTimestampPanelFactory.java     |   0
 .../scalars/jdkdates/JavaUtilDatePanel.java        |   0
 .../scalars/jdkdates/JavaUtilDatePanelFactory.java |   0
 .../jdkmath/BigDecimalConverterWithScale.java      |   0
 .../scalars/jdkmath/BigDecimalTextField.java       |   0
 .../scalars/jdkmath/JavaMathBigDecimalPanel.java   |   0
 .../jdkmath/JavaMathBigDecimalPanelFactory.java    |   0
 .../scalars/jdkmath/JavaMathBigIntegerPanel.java   |   0
 .../jdkmath/JavaMathBigIntegerPanelFactory.java    |   0
 .../jodatime/DateConverterForJodaAbstract.java     |   0
 .../jodatime/DateConverterForJodaDateTime.java     |   0
 .../jodatime/DateConverterForJodaLocalDate.java    |   0
 .../DateConverterForJodaLocalDateTime.java         |   0
 .../scalars/jodatime/JodaDateTimePanel.java        |   0
 .../scalars/jodatime/JodaDateTimePanelFactory.java |   0
 .../scalars/jodatime/JodaLocalDatePanel.java       |   0
 .../jodatime/JodaLocalDatePanelFactory.java        |   0
 .../scalars/jodatime/JodaLocalDateTimePanel.java   |   0
 .../jodatime/JodaLocalDateTimePanelFactory.java    |   0
 .../components/scalars/markup/MarkupComponent.java |   0
 .../scalars/markup/MarkupComponentFactory.java     |   0
 .../scalars/markup/MarkupComponent_observing.java  |   0
 .../scalars/markup/MarkupComponent_reloadJs.java   |   0
 .../ui/components/scalars/markup/MarkupPanel.java  |   0
 .../scalars/markup/MarkupPanelFactories.java       |   0
 .../scalars/markup/ObservingComponent.js           |   0
 .../scalars/markup/StandaloneMarkupPanel.html      |   0
 .../scalars/markup/StandaloneMarkupPanel.java      |   0
 .../components/scalars/primitive/BooleanPanel.html |   0
 .../components/scalars/primitive/BooleanPanel.java |   0
 .../scalars/primitive/BooleanPanelFactory.java     |   0
 .../primitive/BooleanPanel_labelRightPosition.html |   0
 .../ui/components/scalars/primitive/BytePanel.java |   0
 .../scalars/primitive/BytePanelFactory.java        |   0
 .../scalars/primitive/CharacterPanel.java          |   0
 .../scalars/primitive/CharacterPanelFactory.java   |   0
 .../components/scalars/primitive/DoublePanel.java  |   0
 .../scalars/primitive/DoublePanelFactory.java      |   0
 .../components/scalars/primitive/FloatPanel.java   |   0
 .../scalars/primitive/FloatPanelFactory.java       |   0
 .../components/scalars/primitive/IntegerPanel.java |   0
 .../scalars/primitive/IntegerPanelFactory.java     |   0
 .../ui/components/scalars/primitive/LongPanel.java |   0
 .../scalars/primitive/LongPanelFactory.java        |   0
 .../components/scalars/primitive/ShortPanel.java   |   0
 .../scalars/primitive/ShortPanelFactory.java       |   0
 .../scalars/reference/EntityLinkSelect2Panel.html  |   0
 .../scalars/reference/EntityLinkSelect2Panel.java  |   0
 .../scalars/reference/ReferencePanel.html          |   0
 .../scalars/reference/ReferencePanel.java          |   0
 .../scalars/reference/ReferencePanelFactory.java   |   0
 .../scalars/string/MultiLineStringPanel.java       |   0
 .../ui/components/scalars/string/StringPanel.java  |   0
 .../scalars/string/StringPanelFactory.java         |   0
 .../ui/components/scalars/uuid/UuidConverter.java  |   0
 .../ui/components/scalars/uuid/UuidPanel.java      |   0
 .../components/scalars/uuid/UuidPanelFactory.java  |   0
 .../ui/components/scalars/uuid/UuidTextField.java  |   0
 .../ui/components/scalars/value/ValuePanel.java    |   0
 .../scalars/value/ValuePanelFactory.java           |   0
 .../valuechoices/ValueChoicesSelect2Panel.html     |   0
 .../valuechoices/ValueChoicesSelect2Panel.java     |   0
 .../ValueChoicesSelect2PanelFactory.java           |   0
 .../StandaloneCollectionPanel.html                 |   0
 .../StandaloneCollectionPanel.java                 |   0
 .../StandaloneCollectionPanelFactory.java          |   0
 .../components/tree/IsisToWicketTreeAdapter.java   |   0
 .../ui/components/tree/StandaloneTreePanel.html    |   0
 .../ui/components/tree/StandaloneTreePanel.java    |   0
 .../wicket/ui/components/tree/TreePanel.html       |   0
 .../wicket/ui/components/tree/TreePanel.java       |   0
 .../ui/components/tree/TreePanelFactories.java     |   0
 .../components/tree/themes/TreeThemeProvider.java  |   0
 .../tree/themes/TreeThemeProviderDefault.java      |   0
 .../themes/bootstrap/IsisBootstrapTreeTheme.java   |   0
 .../ui/components/tree/themes/bootstrap/theme.css  |   0
 .../ui/components/unknown/UnknownModelPanel.html   |   0
 .../ui/components/unknown/UnknownModelPanel.java   |   0
 .../unknown/UnknownModelPanelFactory.java          |   0
 .../ui/components/value/StandaloneValuePanel.html  |   0
 .../ui/components/value/StandaloneValuePanel.java  |   0
 .../value/StandaloneValuePanelFactory.java         |   0
 .../ui/components/voidreturn/VoidReturnPanel.html  |   0
 .../ui/components/voidreturn/VoidReturnPanel.java  |   0
 .../voidreturn/VoidReturnPanelFactory.java         |   0
 .../wicket/ui/components/welcome/WelcomePanel.html |   0
 .../wicket/ui/components/welcome/WelcomePanel.java |   0
 .../ui/components/welcome/WelcomePanelFactory.java |   0
 .../ui/components/widgets/bootstrap/FormGroup.java |   0
 .../components/widgets/bootstrap/ModalDialog.java  |   0
 .../widgets/breadcrumbs/BreadcrumbModel.java       |   0
 .../breadcrumbs/BreadcrumbModelProvider.java       |   0
 .../widgets/breadcrumbs/BreadcrumbPanel.html       |   0
 .../widgets/breadcrumbs/BreadcrumbPanel.java       |   0
 .../widgets/buttons/ContainedButtonPanel.html      |   0
 .../widgets/buttons/ContainedButtonPanel.java      |   0
 .../widgets/buttons/ToggleButtonsPanel.html        |   0
 .../widgets/buttons/ToggleButtonsPanel.java        |   0
 .../widgets/checkbox/ContainedToggleboxPanel.html  |   0
 .../widgets/checkbox/ContainedToggleboxPanel.java  |   0
 .../entitysimplelink/EntityLinkSimplePanel.css     |   0
 .../entitysimplelink/EntityLinkSimplePanel.html    |   0
 .../entitysimplelink/EntityLinkSimplePanel.java    |   0
 .../EntityLinkSimplePanelFactory.java              |   0
 .../ui/components/widgets/favicon/Favicon.java     |   0
 .../widgets/formcomponent/CancelHintRequired.java  |   0
 .../formcomponent/FormComponentPanelAbstract.java  |   0
 .../widgets/formcomponent/FormFeedbackPanel.java   |   0
 .../widgets/linkandlabel/ActionLink.java           |   0
 .../widgets/linkandlabel/ActionLinkFactory.java    |   0
 .../linkandlabel/ActionLinkFactoryAbstract.java    |   0
 .../linkandlabel/AjaxDeferredBehaviour.java        |   0
 .../ui/components/widgets/navbar/BrandLogo.java    |   0
 .../ui/components/widgets/navbar/BrandName.java    |   0
 .../ui/components/widgets/navbar/Placement.java    |   0
 .../ui/components/widgets/select2/ChoiceExt.java   |   0
 .../ui/components/widgets/select2/Select2.java     |   0
 .../select2/Select2BootstrapCssReference.java      |   0
 .../widgets/select2/Select2ChoiceExt.java          |   0
 .../widgets/select2/Select2JsReference.java        |   0
 .../widgets/select2/Select2MultiChoiceExt.java     |   0
 .../select2/providers/EmptyChoiceProvider.java     |   0
 .../ObjectAdapterMementoProviderAbstract.java      |   0
 .../ObjectAdapterMementoProviderForChoices.java    |   0
 ...tAdapterMementoProviderForReferenceChoices.java |   0
 ...entoProviderForReferenceObjectAutoComplete.java |   0
 ...derForReferenceParamOrPropertyAutoComplete.java |   0
 ...bjectAdapterMementoProviderForValueChoices.java |   0
 .../widgets/select2/select2-bootstrap.css          |   0
 .../themepicker/IsisWicketThemeSupport.java        |   0
 .../themepicker/IsisWicketThemeSupportDefault.java |   0
 .../widgets/themepicker/ThemeChooser.html          |   0
 .../widgets/themepicker/ThemeChooser.java          |   0
 .../widgets/zclip/SimpleClipboardModalWindow.html  |   0
 .../widgets/zclip/SimpleClipboardModalWindow.java  |   0
 .../zclip/SimpleClipboardModalWindowForm.java      |   0
 .../zclip/SimpleClipboardModalWindowPanel.html     |   0
 .../zclip/SimpleClipboardModalWindowPanel.java     |   0
 .../widgets/zclip/ZeroClipboardPanel.html          |   0
 .../widgets/zclip/ZeroClipboardPanel.java          |   0
 .../viewer/wicket/ui/errors/ExceptionModel.java    |   0
 .../wicket/ui/errors/ExceptionStackTracePanel.css  |   0
 .../wicket/ui/errors/ExceptionStackTracePanel.html |   0
 .../wicket/ui/errors/ExceptionStackTracePanel.java |   0
 .../viewer/wicket/ui/errors/JGrowlBehaviour.java   |   0
 .../isis/viewer/wicket/ui/errors/JGrowlUtil.java   |   0
 .../viewer/wicket/ui/errors/StackTraceDetail.java  |   0
 .../wicket/ui/errors/StackTraceListView.java       |   0
 .../isis/viewer/wicket/ui/errors/div-toggle.js     |   0
 .../viewer/wicket/ui/errors/js/bootstrap-growl.js  |   0
 .../wicket/ui/errors/js/bootstrap-growl.min.js     |   0
 .../ui/pages/BookmarkedPagesModelProvider.java     |   0
 .../BootstrapOverridesCssResourceReference.java    |   0
 .../ui/pages/EmailVerificationUrlService.java      |   0
 .../isis/viewer/wicket/ui/pages/PageAbstract.html  |   0
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |   0
 .../viewer/wicket/ui/pages/PageAbstract.properties |   0
 .../isis/viewer/wicket/ui/pages/PageClassList.java |   0
 .../viewer/wicket/ui/pages/PageClassRegistry.java  |   0
 .../wicket/ui/pages/PageClassRegistryAccessor.java |   0
 .../wicket/ui/pages/PageClassRegistrySpi.java      |   0
 .../wicket/ui/pages/PageNavigationService.java     |   0
 .../ui/pages/SidebarCssResourceReference.java      |   0
 .../viewer/wicket/ui/pages/about/AboutPage.css     |   0
 .../viewer/wicket/ui/pages/about/AboutPage.html    |   0
 .../viewer/wicket/ui/pages/about/AboutPage.java    |   0
 .../ui/pages/accmngt/AccountConfirmationMap.java   |   0
 .../accmngt/AccountManagementPageAbstract.html     |   0
 .../accmngt/AccountManagementPageAbstract.java     |   0
 .../AccountManagementPageAbstract.properties       |   0
 .../ui/pages/accmngt/EmailAvailableValidator.java  |   0
 .../EmailVerificationUrlServiceDefault.java        |   0
 .../pages/accmngt/UsernameAvailableValidator.java  |   0
 .../password_reset/PasswordResetEmailPanel.html    |   0
 .../password_reset/PasswordResetEmailPanel.java    |   0
 .../accmngt/password_reset/PasswordResetPage.css   |   0
 .../accmngt/password_reset/PasswordResetPage.html  |   0
 .../accmngt/password_reset/PasswordResetPage.java  |   0
 .../accmngt/password_reset/PasswordResetPanel.html |   0
 .../accmngt/password_reset/PasswordResetPanel.java |   0
 .../ui/pages/accmngt/register/RegisterPage.css     |   0
 .../ui/pages/accmngt/register/RegisterPage.html    |   0
 .../ui/pages/accmngt/register/RegisterPage.java    |   0
 .../ui/pages/accmngt/register/RegisterPanel.html   |   0
 .../ui/pages/accmngt/register/RegisterPanel.java   |   0
 .../pages/accmngt/signup/RegistrationFormPage.css  |   0
 .../pages/accmngt/signup/RegistrationFormPage.html |   0
 .../pages/accmngt/signup/RegistrationFormPage.java |   0
 .../accmngt/signup/RegistrationFormPanel.html      |   0
 .../accmngt/signup/RegistrationFormPanel.java      |   0
 .../ui/pages/actionprompt/ActionPromptPage.css     |   0
 .../ui/pages/actionprompt/ActionPromptPage.html    |   0
 .../ui/pages/actionprompt/ActionPromptPage.java    |   0
 .../pages/bootstrap-overrides-bootstrap-theme.css  |   0
 .../ui/pages/bootstrap-overrides-cerulean.css      |   0
 .../wicket/ui/pages/bootstrap-overrides-cosmo.css  |   0
 .../wicket/ui/pages/bootstrap-overrides-cyborg.css |   0
 .../wicket/ui/pages/bootstrap-overrides-darkly.css |   0
 .../wicket/ui/pages/bootstrap-overrides-flatly.css |   0
 .../ui/pages/bootstrap-overrides-journal.css       |   0
 .../wicket/ui/pages/bootstrap-overrides-lumen.css  |   0
 .../wicket/ui/pages/bootstrap-overrides-paper.css  |   0
 .../ui/pages/bootstrap-overrides-readable.css      |   0
 .../ui/pages/bootstrap-overrides-sandstone.css     |   0
 .../ui/pages/bootstrap-overrides-simplex.css       |   0
 .../wicket/ui/pages/bootstrap-overrides-slate.css  |   0
 .../ui/pages/bootstrap-overrides-spacelab.css      |   0
 .../ui/pages/bootstrap-overrides-superhero.css     |   0
 .../wicket/ui/pages/bootstrap-overrides-united.css |   0
 .../wicket/ui/pages/bootstrap-overrides-yeti.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides.css |   0
 .../apache/isis/viewer/wicket/ui/pages/copy-26.png | Bin
 .../viewer/wicket/ui/pages/entity/EntityPage.css   |   0
 .../viewer/wicket/ui/pages/entity/EntityPage.html  |   0
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |   0
 .../viewer/wicket/ui/pages/error/ErrorPage.css     |   0
 .../viewer/wicket/ui/pages/error/ErrorPage.html    |   0
 .../viewer/wicket/ui/pages/error/ErrorPage.java    |   0
 .../isis/viewer/wicket/ui/pages/home/HomePage.css  |   0
 .../isis/viewer/wicket/ui/pages/home/HomePage.html |   0
 .../isis/viewer/wicket/ui/pages/home/HomePage.java |   0
 .../wicket/ui/pages/images/bg_header_brown.png     | Bin
 .../viewer/wicket/ui/pages/images/icon_appuser.png | Bin
 .../isis/viewer/wicket/ui/pages/images/logo.pdn    | Bin
 .../isis/viewer/wicket/ui/pages/images/logo.png    | Bin
 .../isis-wicket-theme/images/animated-overlay.gif  | Bin
 .../images/ui-bg_flat_0_aaaaaa_40x100.png          | Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png         | Bin
 .../images/ui-bg_glass_55_40c0cb_1x400.png         | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png         | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png         | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png         | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png         | Bin
 .../ui-bg_highlight-soft_75_20B5C2_1x100.png       | Bin
 .../images/ui-icons_00477F_256x240.png             | Bin
 .../images/ui-icons_2e83ff_256x240.png             | Bin
 .../images/ui-icons_454545_256x240.png             | Bin
 .../images/ui-icons_888888_256x240.png             | Bin
 .../images/ui-icons_F0EFEA_256x240.png             | Bin
 .../images/ui-icons_cd0a0a_256x240.png             | Bin
 .../wicket/ui/pages/jquery.isis.wicket.viewer.js   |   0
 .../viewer/wicket/ui/pages/jquery.livequery.js     |   0
 .../wicket/ui/pages/login/IsisSignInPanel.html     |   0
 .../wicket/ui/pages/login/IsisSignInPanel.java     |   0
 .../wicket/ui/pages/login/WicketLogoutPage.java    |   0
 .../wicket/ui/pages/login/WicketSignInPage.css     |   0
 .../wicket/ui/pages/login/WicketSignInPage.html    |   0
 .../wicket/ui/pages/login/WicketSignInPage.java    |   0
 .../ui/pages/login/WicketSignInPage.properties     |   0
 .../wicket/ui/pages/mmverror/MmvErrorPage.css      |   0
 .../wicket/ui/pages/mmverror/MmvErrorPage.html     |   0
 .../wicket/ui/pages/mmverror/MmvErrorPage.java     |   0
 .../isis/viewer/wicket/ui/pages/simple-sidebar.css |   0
 .../isis/viewer/wicket/ui/pages/spinning-icon.gif  | Bin
 .../StandaloneCollectionPage.css                   |   0
 .../StandaloneCollectionPage.html                  |   0
 .../StandaloneCollectionPage.java                  |   0
 .../viewer/wicket/ui/pages/value/ValuePage.css     |   0
 .../viewer/wicket/ui/pages/value/ValuePage.html    |   0
 .../viewer/wicket/ui/pages/value/ValuePage.java    |   0
 .../wicket/ui/pages/voidreturn/VoidReturnPage.css  |   0
 .../wicket/ui/pages/voidreturn/VoidReturnPage.html |   0
 .../wicket/ui/pages/voidreturn/VoidReturnPage.java |   0
 .../wicket/ui/pages/wicket-xhtml1.4-strict.dtd     |   0
 .../isis/viewer/wicket/ui/panels/FormAbstract.java |   0
 .../wicket/ui/panels/FormExecutorDefault.java      |   0
 .../wicket/ui/panels/FormExecutorStrategy.java     |   0
 .../ui/panels/HasDynamicallyVisibleContent.java    |   0
 .../panels/IFormSubmitterWithPreValidateHook.java  |   0
 .../viewer/wicket/ui/panels/PanelAbstract.java     |   0
 .../isis/viewer/wicket/ui/panels/PanelUtil.java    |   0
 .../wicket/ui/panels/PromptFormAbstract.java       |   0
 .../wicket/ui/panels/PromptFormPanelAbstract.java  |   0
 .../isis/viewer/wicket/ui/util/Components.java     |   0
 .../viewer/wicket/ui/util/CssClassAppender.java    |   0
 .../viewer/wicket/ui/util/CssClassRemover.java     |   0
 .../isis/viewer/wicket/ui/util/CssIdAppender.java  |   0
 .../apache/isis/viewer/wicket/ui/util/Links.java   |   0
 .../isis/viewer/wicket/ui/util/SSESupport.java     |   0
 .../isis/viewer/wicket/ui/util/SSESupport.js       |   0
 .../isis/viewer/wicket/ui/util/Tooltips.java       |   0
 .../isis/viewer/wicket/ui/util/isis-tooltips.css   |   0
 .../ui}/src/main/resources/images/Default.png      | Bin
 .../ui/ComponentFactoryAbstractTest_init.java      |   0
 .../wicket/ui/ComponentType_ConstantsTest.java     |   0
 ...ollectionContentsSelectorDropdownPanelTest.java |   0
 .../EntityIconAndTitlePanelTest_abbreviated.java   |   0
 .../jdkdates/DateConverterForJavaSqlDateTest.java  |   0
 .../jdkdates/DateConverterForJavaUtilDateTest.java |   0
 ...BigDecimalConverterWithScaleTest_roundtrip.java |   0
 .../jodatime/DateConverterForJodaDateTimeTest.java |   0
 .../DateConverterForJodaLocalDateTest.java         |   0
 .../DateConverterForJodaLocalDateTimeTest.java     |   0
 .../DateConverterForJdk8LocalDateTest.java         |   0
 .../DateConverterForJdk8LocalDateTimeTest.java     |   0
 .../DateConverterForJdk8OffsetDateTimeTest.java    |   0
 .../scalars/uuid/UuidConverterTest_roundtrip.java  |   0
 ...tAdapterMementoProviderForValueChoicesTest.java |   0
 .../viewer/wicket/ui/errors/JGrowlUtilTest.java    |   0
 .../isis/viewer/wicket/ui/fixtures/Customers.java  |   0
 .../viewer/wicket/ui/pages/PageAbstractTest.java   |   0
 .../helloworld/_adoc/modules/ROOT/pages/about.adoc |   6 +-
 .../simpleapp/_adoc/modules/ROOT/pages/about.adoc  |   6 +-
 site.yml                                           |  14 +-
 2322 files changed, 19785 insertions(+), 19785 deletions(-)
 delete mode 100644 antora/components/rg/modules/ROOT/pages/about.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Action.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Action/hidden.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Action/semantics.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/bookmarking.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/cssClass.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/describedAs.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/hidden.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/named.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/position.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/promptStyle.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ActionLayout/redirect.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Collection/domainEvent.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Collection/editing.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Collection/hidden.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout/cssClass.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout/defaultView.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout/describedAs.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout/hidden.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout/named.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout/paged.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Discriminator.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainObject/bounding.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainObject/objectType.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainObjectLayout.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainObjectLayout/paged.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainService.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainService/nature.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainService/objectType.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainServiceLayout.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/HomePage.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Inject.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/MemberOrder.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/MemberOrder/name.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/MemberOrder/sequence.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ParameterLayout.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ParameterLayout/describedAs.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PersistenceCapable.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/Property/hidden.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/cssClass.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/describedAs.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/hidden.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/multiLine.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/named.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/navigable.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ViewModel/objectType.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ViewModelLayout.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/XmlRootElement.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/aaa/jdo.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/aaa/jee.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/aaa/main.adoc
 delete mode 100644 antora/components/rg/modules/ant/pages/aaa/other.adoc
 delete mode 100644 antora/components/rg/modules/cfg/pages/about.adoc
 delete mode 100644 antora/components/rg/modules/cfg/pages/configuration-files.adoc
 delete mode 100644 antora/components/rg/modules/cfg/pages/configuring-core.adoc
 delete mode 100644 antora/components/rg/modules/cfg/pages/deployment-types.adoc
 delete mode 100644 antora/components/rg/modules/cfg/pages/specifying-components.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes/layout.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes/menubars.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/prefixes.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc
 delete mode 100644 antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc
 delete mode 100644 antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
 delete mode 100644 antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
 delete mode 100644 antora/components/rg/modules/mvn/pages/intro.adoc
 delete mode 100644 antora/components/rg/modules/mvn/pages/swagger.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/application-layer-api/CommandContext.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/application-layer-api/MessageService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/application-layer-api/TransactionService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/application-layer-spi/CommandService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/integration-api/EmailService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/intro.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/metadata-api.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/metadata-api/SwaggerService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-api.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/testing/FixtureScripts.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/testing/SudoService.adoc
 delete mode 100644 antora/components/rg/modules/svc/pages/testing/SwitchUserService.adoc
 delete mode 100644 antora/components/ug-odn/antora.yml
 delete mode 100644 antora/components/ug-odn/modules/ROOT/pages/configuring/bulk-load.adoc
 delete mode 100644 antora/components/ug-odn/modules/ROOT/pages/configuring/properties.adoc
 delete mode 100644 antora/components/ug-odn/modules/ROOT/pages/db-schemas.adoc
 delete mode 100644 antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc
 delete mode 100644 antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
 delete mode 100644 antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
 delete mode 100644 antora/components/ug-sec/antora.yml
 delete mode 100644 antora/components/ug-sec/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
 delete mode 100644 antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
 delete mode 100644 antora/components/ug-sec/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
 delete mode 100644 antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
 delete mode 100644 antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
 delete mode 100644 antora/components/ug-tst/antora.yml
 delete mode 100644 antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
 delete mode 100644 antora/components/ug-tst/modules/ROOT/pages/integ-test-support/abstract-class.adoc
 delete mode 100644 antora/components/ug-tst/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
 delete mode 100644 antora/components/ug-vro/antora.yml
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/architecture.adoc
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/configuration-properties.adoc
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/hints-and-tips.adoc
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/layout-resources.adoc
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/ro-spec.adoc
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/simplified-representations.adoc
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/simplified-representations/action-invocation.adoc
 delete mode 100644 antora/components/ug-vro/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
 delete mode 100644 antora/components/ug-vw/antora.yml
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/configuration-properties.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/customisation/about-page.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/customisation/custom-javascript.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/customisation/welcome-page.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/extending.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/extending/custom-pages.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/extending/replacing-page-elements.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/blob-attachments.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/bookmarked-pages.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/hints-and-copy-url.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/recent-pages.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/titles-in-tables.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/user-registration.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/features/where-am-i.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/hints-and-tips.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/incode-platform.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/layout.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/layout/annotation-based.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/layout/file-based.adoc
 delete mode 100644 antora/components/ug-vw/modules/ROOT/pages/menubars-layout/file-based.adoc
 delete mode 100644 antora/components/ug/antora.yml
 delete mode 100644 antora/components/ug/modules/ROOT/pages/about.adoc
 delete mode 100644 antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
 delete mode 100644 antora/components/ug/modules/btb/pages/headless-access.adoc
 delete mode 100644 antora/components/ug/modules/btb/pages/hints-and-tips.adoc
 delete mode 100644 antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
 delete mode 100644 antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
 delete mode 100644 antora/components/ug/modules/btb/pages/i18n.adoc
 delete mode 100644 antora/components/ug/modules/btb/pages/web-xml.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/about.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/crud.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/programming-model.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/programming-model/collections.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/programming-model/properties.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
 delete mode 100644 antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
 rename {antora/components/rg => core/_adoc-rg}/antora.yml (100%)
 rename {antora/components/ug => core/_adoc-rg}/examples.csv (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ROOT/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-rg}/modules/ROOT/nav.adoc (100%)
 rename {antora/components/ug/modules/fun => core/_adoc-rg/modules/ROOT}/pages/_attributes.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/ui-hints => core/_adoc-rg/modules/ROOT/pages/_partials}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ROOT/pages/about.adoc
 rename {antora/components/ug/modules/fun => core/_adoc-rg/modules/ant}/_attributes.adoc (100%)
 rename {antora/components/ug/modules/fun/examples => core/_adoc-rg/modules/ant/assets/attachments}/.gitkeep (100%)
 rename {antora/components/ug/modules/btb/examples => core/_adoc-rg/modules/ant/assets/images}/.gitkeep (100%)
 rename {antora/components/rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout => core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout}/bookmarking.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png (100%)
 rename {antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout => core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout}/bookmarking.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png (100%)
 rename {antora/components/ug/modules/btb/assets/attachments => core/_adoc-rg/modules/ant/examples}/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/nav.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/Action.adoc
 rename {antora/components/ug/modules/fun/pages/programming-model => core/_adoc-rg/modules/ant/pages/Action}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Action/associateWith.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Action/command.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Action/domainEvent.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/Action/hidden.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Action/invokeOn.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Action/publishing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Action/restrictTo.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/Action/semantics.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Action/typeOf.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout.adoc
 rename {antora/components/ug/modules/fun/pages/crud => core/_adoc-rg/modules/ant/pages/ActionLayout}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/bookmarking.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ActionLayout/contributedAs.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/cssClass.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/describedAs.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/hidden.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/named.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/position.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/promptStyle.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ActionLayout/redirect.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Collection.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/core-concepts => core/_adoc-rg/modules/ant/pages/Collection}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/Collection/domainEvent.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/Collection/editing.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/Collection/hidden.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Collection/notPersisted.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Collection/typeOf.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout.adoc
 rename {antora/components/ug/modules/fun/pages/business-rules => core/_adoc-rg/modules/ant/pages/CollectionLayout}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout/cssClass.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout/defaultView.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout/describedAs.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout/hidden.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout/named.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout/paged.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Column.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Digits.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/Discriminator.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/building-blocks => core/_adoc-rg/modules/ant/pages/DomainObject}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/actionDomainEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/auditing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/autoCompleteRepository.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainObject/bounding.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/collectionDomainEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/createdLifecycleEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/editing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/loadedLifecycleEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/mixinMethod.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/nature.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainObject/objectType.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/persistedLifecycleEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/persistingLifecycleEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/propertyDomainEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/publishing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/removingLifecycleEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/updatedLifecycleEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObject/updatingLifecycleEvent.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainObjectLayout.adoc
 rename {antora/components/ug/modules/fun/pages/available-domain-services => core/_adoc-rg/modules/ant/pages/DomainObjectLayout}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/cssClass.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/cssClassFa.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/cssClassUiEvent.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/iconUiEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/layoutUiEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/named.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainObjectLayout/paged.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/plural.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainObjectLayout/titleUiEvent.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainService.adoc
 rename {antora/components/ug/modules/fun/pages/_partials => core/_adoc-rg/modules/ant/pages/DomainService}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainService/nature.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainService/objectType.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainService/repositoryFor.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainServiceLayout.adoc
 rename {antora/components/ug/modules/btb/pages/programming-model => core/_adoc-rg/modules/ant/pages/DomainServiceLayout}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/DomainServiceLayout/named.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Facets.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/HomePage.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/Inject.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/MemberGroupLayout.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/MemberOrder.adoc
 rename {antora/components/ug/modules/btb/pages/hints-and-tips => core/_adoc-rg/modules/ant/pages/MemberOrder}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/MemberOrder/name.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/MemberOrder/sequence.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/MinLength.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Mixin.adoc (100%)
 rename {antora/components/ug/modules/btb/pages/headless-access => core/_adoc-rg/modules/ant/pages/Mixin}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Mixin/method.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/NotPersistent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Nullable.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Parameter.adoc (100%)
 rename {antora/components/ug/modules/btb/pages/deployment => core/_adoc-rg/modules/ant/pages/Parameter}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Parameter/fileAccept.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Parameter/maxLength.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Parameter/mustSatisfy.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Parameter/optionality.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Parameter/regexPattern.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ParameterLayout.adoc
 rename {antora/components/ug/modules/btb/pages/_partials => core/_adoc-rg/modules/ant/pages/ParameterLayout}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ParameterLayout/cssClass.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ParameterLayout/describedAs.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ParameterLayout/multiLine.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ParameterLayout/named.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ParameterLayout/renderedAsDayBefore.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Pattern.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/PersistenceCapable.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/PostConstruct.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/PreDestroy.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/PrimaryKey.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Programmatic.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property.adoc (100%)
 rename {antora/components/ug/modules/ROOT/pages/_partials => core/_adoc-rg/modules/ant/pages/Property}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/command.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/domainEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/editing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/fileAccept.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/Property/hidden.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/maxLength.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/mustSatisfy.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/notPersisted.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/optionality.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/projecting.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/publishing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Property/regexPattern.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout.adoc
 rename {antora/components/ug-vw/modules/ROOT/pages/menubars-layout => core/_adoc-rg/modules/ant/pages/PropertyLayout}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/cssClass.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/describedAs.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/hidden.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/multiLine.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/named.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/navigable.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/PropertyLayout/unchanging.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/RequestScoped.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/Title.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModel.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT/pages/layout => core/_adoc-rg/modules/ant/pages/ViewModel}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ViewModel/objectType.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/ViewModelLayout.adoc
 rename {antora/components/ug-vw/modules/ROOT/pages/hints-and-tips => core/_adoc-rg/modules/ant/pages/ViewModelLayout}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/bookmarking.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/cssClass.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/cssClassFa.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/cssClassUiEvent.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/iconUiEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/layoutUiEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/named.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/paged.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/plural.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/ViewModelLayout/titleUiEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/XmlJavaTypeAdapter.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/XmlRootElement.adoc
 rename {antora/components/ug/modules/btb => core/_adoc-rg/modules/ant}/pages/_attributes.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT/pages/features => core/_adoc-rg/modules/ant/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/aaa.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT/pages/extending => core/_adoc-rg/modules/ant/pages/aaa}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/ant/pages/aaa/jdo.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/aaa/jee.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/aaa/main.adoc
 create mode 100644 core/_adoc-rg/modules/ant/pages/aaa/other.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/aaa/partial.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/ant/pages/about.adoc (100%)
 rename {antora/components/ug/modules/btb => core/_adoc-rg/modules/cfg}/_attributes.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT/examples => core/_adoc-rg/modules/cfg/assets/attachments}/.gitkeep (100%)
 rename {antora/components/ug-vw/modules/ROOT/assets/attachments => core/_adoc-rg/modules/cfg/assets/images}/.gitkeep (100%)
 rename {antora/components/ug-vro/modules/ROOT => core/_adoc-rg/modules/cfg}/examples/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cfg/nav.adoc (100%)
 rename {antora/components/ug/modules/ROOT => core/_adoc-rg/modules/cfg}/pages/_attributes.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT/pages/customisation => core/_adoc-rg/modules/cfg/pages/_partials}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cfg/pages/about.adoc
 create mode 100644 core/_adoc-rg/modules/cfg/pages/configuration-files.adoc
 create mode 100644 core/_adoc-rg/modules/cfg/pages/configuring-core.adoc
 create mode 100644 core/_adoc-rg/modules/cfg/pages/deployment-types.adoc
 create mode 100644 core/_adoc-rg/modules/cfg/pages/specifying-components.adoc
 rename {antora/components/ug/modules/ROOT => core/_adoc-rg/modules/cms}/_attributes.adoc (100%)
 rename {antora/components/ug-vro/modules/ROOT => core/_adoc-rg/modules/cms}/assets/attachments/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/assets/images/reference-classes/issue-in-more-detail.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/assets/images/value-types/markup.png (100%)
 rename {antora/components/ug-tst/modules/ROOT => core/_adoc-rg/modules/cms}/examples/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/nav.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT => core/_adoc-rg/modules/cms}/pages/_attributes.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT => core/_adoc-rg/modules/cms}/pages/_partials/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/about.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes.adoc
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
 rename {antora/components/ug-vro/modules/ROOT/pages/simplified-representations => core/_adoc-rg/modules/cms/pages/classes}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/contributee.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/contributee/HasTransactionId.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/contributee/HasUserName.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/programming-model/view-models => core/_adoc-rg/modules/cms/pages/classes/contributee}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/domainevent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/domainevent/AbstractDomainEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/domainevent/ActionDomainEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/domainevent/CollectionDomainEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/domainevent/PropertyDomainEvent.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/programming-model/mixins => core/_adoc-rg/modules/cms/pages/classes/domainevent}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/i18n.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/i18n/TranslatableString.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/programming-model/domain-services => core/_adoc-rg/modules/cms/pages/classes/i18n}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes/layout.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/core-concepts/principles => core/_adoc-rg/modules/cms/pages/classes/lifecycleevent}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes/menubars.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/mixins.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/mixins/Dto.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes/mixins/Object.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/mixins/Persistable.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/core-concepts/philosophy => core/_adoc-rg/modules/cms/pages/classes/mixins}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/roles.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/roles/Timestampable.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs => core/_adoc-rg/modules/cms/pages/classes/roles}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/spec.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/super.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/super/AbstractService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/super/AbstractSubscriber.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/super/AbstractViewModel.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes/super/FixtureScript.adoc
 create mode 100644 core/_adoc-rg/modules/cms/pages/classes/super/FixtureScripts.adoc
 rename {antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects => core/_adoc-rg/modules/cms/pages/classes/super}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/uievent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/uievent/CssClassUiEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/uievent/IconUiEvent.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/uievent/TitleUiEvent.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/building-blocks/identifiers => core/_adoc-rg/modules/cms/pages/classes/uievent}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/utility.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/utility/Enums.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/utility/ObjectContracts.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/utility/Reasons.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/utility/TitleBuffer.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/building-blocks/events => core/_adoc-rg/modules/cms/pages/classes/utility}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/value-types.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/value-types/Blob.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/value-types/Clob.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/value-types/Color.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/value-types/Markup.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/value-types/Money.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/classes/value-types/Password.adoc (100%)
 rename {antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService => core/_adoc-rg/modules/cms/pages/classes/value-types}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods.adoc (100%)
 rename {antora/components/ug-vro/modules/ROOT/pages/hints-and-tips => core/_adoc-rg/modules/cms/pages/methods}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/methods/reserved => core/_adoc-rg/modules/cms/pages/methods/lifecycle}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/created.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/jdo-api.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/loaded.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/persisted.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/persisting.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/removed.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/removing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/updated.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/lifecycle/updating.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/prefixes.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/prefixes/addTo.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/autoComplete.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/choices.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/clear.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/default.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/disable.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/get.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/hide.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/modify.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/set.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/prefixes/validate.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/reserved.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/methods/lifecycle => core/_adoc-rg/modules/cms/pages/methods/reserved}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/reserved/cssClass.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/reserved/disable.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/reserved/getId.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/reserved/hide.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/reserved/iconName.adoc
 create mode 100644 core/_adoc-rg/modules/cms/pages/methods/reserved/layout.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/reserved/title.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/methods/reserved/validate.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/rgcms.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/schema.adoc (100%)
 rename {antora/components/ug-vro/modules/ROOT/pages/_partials => core/_adoc-rg/modules/cms/pages/schema}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/schema/aim.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/schema/chg.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/schema/cmd.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/schema/common.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/schema/ixn.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/cms/pages/schema/mml.adoc (100%)
 rename {antora/components/ug-vw/modules/ROOT => core/_adoc-rg/modules/fis}/_attributes.adoc (100%)
 rename {antora/components/ug-tst/modules/ROOT => core/_adoc-rg/modules/fis}/assets/attachments/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/assets/images/ContentNegotiationService/accept-json.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/assets/images/ContentNegotiationService/accept-xml.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/assets/images/ContentNegotiationService/facade-choices.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/assets/images/ContentNegotiationService/facade-choices.pptx (100%)
 rename {antora/components/ug-vro/modules/ROOT/assets/images/rgfis => core/_adoc-rg/modules/fis/assets/images/RepresentationService}/service-collaborations.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/assets/images/RepresentationService/service-collaborations.pptx (100%)
 rename {antora/components/ug-sec/modules/ROOT => core/_adoc-rg/modules/fis}/examples/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/nav.adoc (100%)
 rename {antora/components/ug-vro/modules/ROOT => core/_adoc-rg/modules/fis}/pages/_attributes.adoc (100%)
 rename {antora/components/ug-tst/modules/ROOT/pages/unit-test-support => core/_adoc-rg/modules/fis/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/about.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/application-layer.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/application-layer/AuthenticationSessionProvider.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc (100%)
 rename {antora/components/ug-tst/modules/ROOT/pages/integ-test-support => core/_adoc-rg/modules/fis/pages/application-layer}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/persistence-layer.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/persistence-layer/PersistenceSessionServiceInternal.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc (100%)
 rename {antora/components/ug-tst/modules/ROOT/pages/fixture-scripts => core/_adoc-rg/modules/fis/pages/persistence-layer}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/fis/pages/presentation-layer.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
 create mode 100644 core/_adoc-rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
 rename {antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support => core/_adoc-rg/modules/fis/pages/presentation-layer}/_attributes.adoc (100%)
 rename {antora/components/ug-vro/modules/ROOT => core/_adoc-rg/modules/mvn}/_attributes.adoc (100%)
 rename {antora/components/ug-sec/modules/ROOT => core/_adoc-rg/modules/mvn}/assets/attachments/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/mvn/assets/images/maven-plugin/xsd-goal.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx (100%)
 rename {antora/components/ug-odn/modules/ROOT => core/_adoc-rg/modules/mvn}/examples/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/mvn/nav.adoc (100%)
 rename {antora/components/ug-tst/modules/ROOT => core/_adoc-rg/modules/mvn}/pages/_attributes.adoc (100%)
 rename {antora/components/ug-tst/modules/ROOT => core/_adoc-rg/modules/mvn}/pages/_partials/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/mvn/pages/about.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/mvn/pages/intro.adoc
 create mode 100644 core/_adoc-rg/modules/mvn/pages/swagger.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/mvn/pages/validate.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/mvn/pages/xsd.adoc (100%)
 rename {antora/components/ug-tst/modules/ROOT => core/_adoc-rg/modules/svc}/_attributes.adoc (100%)
 rename {antora/components/ug-odn/modules/ROOT => core/_adoc-rg/modules/svc}/assets/attachments/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services-api/acceptheaderservice.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services/categories.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services/categories.pptx (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services/commands-and-events.png (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/assets/images/reference-services/commands-and-events.pptx (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/examples/.gitkeep (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/nav.adoc (100%)
 rename {antora/components/ug-sec/modules/ROOT => core/_adoc-rg/modules/svc}/pages/_attributes.adoc (100%)
 rename {antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations => core/_adoc-rg/modules/svc/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/about.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/BackgroundService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/BackgroundService/Quartz.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/value-types => core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/application-layer-api/CommandContext.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/CommandExecutorService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/DtoMappingHelper.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/InteractionContext.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/application-layer-api/MessageService.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/SessionManagementService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-api/TitleService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/application-layer-api/TransactionService.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
 rename {antora/components/ug-sec/modules/ROOT/pages/hints-and-tips => core/_adoc-rg/modules/svc/pages/application-layer-api}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-spi.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-spi/BackgroundCommandService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/application-layer-spi/CommandService.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-spi/HealthCheckService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/application-layer-spi/HomePageProviderService.adoc (100%)
 rename {antora/components/ug-sec/modules/ROOT/pages/_partials => core/_adoc-rg/modules/svc/pages/application-layer-spi}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/bootstrapping-spi.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc (100%)
 rename {antora/components/ug-odn/modules/ROOT/pages/jdo-mappings => core/_adoc-rg/modules/svc/pages/bootstrapping-spi}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/core-domain-api.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/core-domain-api/ClockService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/core-domain-api/ConfigurationService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/core-domain-api/EventBusService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/core-domain-api/FactoryService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/core-domain-api/UserService.adoc
 rename {antora/components/ug-odn/modules/ROOT/pages/hints-and-tips => core/_adoc-rg/modules/svc/pages/core-domain-api}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/integration-api.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/integration-api/BookmarkService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/integration-api/EmailService.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/integration-api/JaxbService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/integration-api/MementoService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/integration-api/XmlSnapshotService.adoc (100%)
 rename {antora/components/ug-odn/modules/ROOT/pages/configuring => core/_adoc-rg/modules/svc/pages/integration-api}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/intro.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/metadata-api.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/metadata-api/ApplicationFeatureRepository.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/metadata-api/LayoutService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/metadata-api/MetamodelService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/metadata-api/ServiceRegistry.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/metadata-api/SwaggerService.adoc
 rename {antora/components/ug-odn/modules/ROOT/pages/_partials => core/_adoc-rg/modules/svc/pages/metadata-api}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-api.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-api/H2ManagerMenu.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-api/MetricsService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-api/QueryResultsCache.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-api/RepositoryService.adoc (100%)
 rename {antora/components/rg/modules/svc/pages/testing => core/_adoc-rg/modules/svc/pages/persistence-layer-api}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-spi.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-spi/AuditerService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/persistence-layer-spi/PublisherService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
 rename {antora/components/rg/modules/svc/pages/presentation-layer-spi => core/_adoc-rg/modules/svc/pages/persistence-layer-spi}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-api.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-api/ConfigurationViewService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-api/_attributes.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/ErrorReportingService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/GridLoaderService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/GridService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/SessionLoggingService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/TableColumnOrderService.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/TranslationService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/presentation-layer-spi/UrlEncodingService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
 rename {antora/components/rg/modules/svc/pages/persistence-layer-spi => core/_adoc-rg/modules/svc/pages/presentation-layer-spi}/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/testing.adoc (100%)
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/testing/ExecutionParametersService.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/testing/FixtureScripts.adoc
 rename {antora/components/rg => core/_adoc-rg}/modules/svc/pages/testing/FixtureScriptsSpecificationProvider.adoc (100%)
 create mode 100644 core/_adoc-rg/modules/svc/pages/testing/SudoService.adoc
 create mode 100644 core/_adoc-rg/modules/svc/pages/testing/SwitchUserService.adoc
 rename {antora/components/rg/modules/svc/pages/persistence-layer-api => core/_adoc-rg/modules/svc/pages/testing}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-rg}/sync_examples.sh (100%)
 create mode 100644 core/_adoc-ug/antora.yml
 rename {antora/components/ug-vw => core/_adoc-ug}/examples.csv (100%)
 rename {antora/components/ug-sec => core/_adoc-ug}/modules/ROOT/_attributes.adoc (100%)
 rename {antora/components/rg => core/_adoc-ug}/modules/ROOT/nav.adoc (100%)
 rename {antora/components/ug-odn => core/_adoc-ug}/modules/ROOT/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/svc/pages/metadata-api => core/_adoc-ug/modules/ROOT/pages/_partials}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/ROOT/pages/about.adoc
 rename {antora/components/ug-odn/modules/ROOT => core/_adoc-ug/modules/btb}/_attributes.adoc (100%)
 rename {antora/components/rg/modules/svc => core/_adoc-ug/modules/btb}/assets/attachments/.gitkeep (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/hints-and-tips/are-you-sure.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/hints-and-tips/view-model-fail.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/hints-and-tips/view-model-success.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/runtime/web-xml/key.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/runtime/web-xml/parts.pptx (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/runtime/web-xml/ro-only.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/assets/images/runtime/web-xml/wicket-only.png (100%)
 rename {antora/components/rg/modules/mvn => core/_adoc-ug/modules/btb}/examples/.gitkeep (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/nav.adoc (100%)
 rename {antora/components/rg/modules/svc => core/_adoc-ug/modules/btb}/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/svc/pages/integration-api => core/_adoc-ug/modules/btb/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/about.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/deployment.adoc (100%)
 rename {antora/components/rg/modules/svc/pages/core-domain-api => core/_adoc-ug/modules/btb/pages/deployment}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/deployment/cmd-line.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/deployment/docker.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/btb/pages/deployment/externalized-configuration.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/deployment/gae.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/deployment/jvm-flags.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/deployment/neo4j.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/deployment/tomcat.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/btb/pages/headless-access.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc (100%)
 rename {antora/components/rg/modules/svc/pages/bootstrapping-spi => core/_adoc-ug/modules/btb/pages/headless-access}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/btb/pages/hints-and-tips.adoc
 rename {antora/components/rg/modules/svc/pages/application-layer-spi => core/_adoc-ug/modules/btb/pages/hints-and-tips}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/multi-tenancy.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/persisted-title.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/pushing-changes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/btb/pages/i18n.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/other-techniques.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/programming-model.adoc (100%)
 rename {antora/components/rg/modules/svc/pages/application-layer-api => core/_adoc-ug/modules/btb/pages/programming-model}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/programming-model/custom-validator.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/btb/pages/programming-model/finetuning.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/btb/pages/web-xml.adoc
 rename {antora/components/rg/modules/svc => core/_adoc-ug/modules/fun}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/assets/images/programming-model/todoapp-Dashboard.png (100%)
 rename {antora/components/rg/modules/mvn/assets/attachments => core/_adoc-ug/modules/fun/examples}/.gitkeep (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/nav.adoc (100%)
 rename {antora/components/rg/modules/mvn => core/_adoc-ug/modules/fun}/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/svc => core/_adoc-ug/modules/fun}/pages/_partials/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/about.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/available-domain-services.adoc (100%)
 rename {antora/components/rg/modules/mvn/pages/_partials => core/_adoc-ug/modules/fun/pages/available-domain-services}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/available-domain-services/framework-provided.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/available-domain-services/incode-platform.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks.adoc (100%)
 rename {antora/components/rg/modules/fis/pages/presentation-layer => core/_adoc-ug/modules/fun/pages/building-blocks}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/events.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/utility => core/_adoc-ug/modules/fun/pages/building-blocks/events}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/events/domain-events.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/events/lifecycle-events.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/events/ui-events.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/identifiers.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/uievent => core/_adoc-ug/modules/fun/pages/building-blocks/identifiers}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
 create mode 100644 core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
 create mode 100644 core/_adoc-ug/modules/fun/pages/building-blocks/metamodel.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/modules.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/object-members.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/types-of-domain-objects.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/super => core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/business-rules.adoc (100%)
 rename {antora/components/rg/modules/fis/pages/persistence-layer => core/_adoc-ug/modules/fun/pages/business-rules}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/business-rules/actions.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/business-rules/side-effects.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/business-rules/usability.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/business-rules/validity.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/business-rules/visibility.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts.adoc (100%)
 rename {antora/components/rg/modules/fis/pages/application-layer => core/_adoc-ug/modules/fun/pages/core-concepts}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/apache-isis-vs.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/roles => core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
 create mode 100644 core/_adoc-ug/modules/fun/pages/core-concepts/deployment-options.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/philosophy.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/mixins => core/_adoc-ug/modules/fun/pages/core-concepts/philosophy}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/philosophy/aop.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/philosophy/dci.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/core-concepts/principles.adoc
 rename {antora/components/rg/modules/cms/pages/classes/lifecycleevent => core/_adoc-ug/modules/fun/pages/core-concepts/principles}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/principles/build-not-buy.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/principles/isis-itself.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb => core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/principles/lego-blocks.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/core-concepts/principles/testable.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/crud.adoc
 rename {antora/components/rg/modules/fis/pages/_partials => core/_adoc-ug/modules/fun/pages/crud}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/crud/deleting.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/crud/finding.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/crud/instantiating.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/crud/persisting.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/crud/updating.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/drop-downs-and-defaults.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/programming-model.adoc
 rename {antora/components/rg/modules/cms/pages/schema => core/_adoc-ug/modules/fun/pages/programming-model}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/actions.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/programming-model/collections.adoc
 create mode 100644 core/_adoc-ug/modules/fun/pages/programming-model/domain-entities.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/domain-services.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/i18n => core/_adoc-ug/modules/fun/pages/programming-model/domain-services}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/domain-services/initialization.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/programming-model/domain-services/menu.adoc
 create mode 100644 core/_adoc-ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/domain-services/registering.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/domain-services/scoped-services.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/inject-services.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/mixins.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/domainevent => core/_adoc-ug/modules/fun/pages/programming-model/mixins}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/mixins/contributed-action.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/mixins/contributed-collection.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/mixins/contributed-property.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/mixins/inferred-name.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/properties-vs-parameters.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/programming-model/properties.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes/contributee => core/_adoc-ug/modules/fun/pages/programming-model/view-models}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/dto.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/dto/versioning.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/jaxb.adoc (100%)
 rename {antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself => core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb}/_attributes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/programming-model/view-models/non-jaxb.adoc (100%)
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/ui-hints.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/methods => core/_adoc-ug/modules/fun/pages/ui-hints}/_attributes.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/ui-hints/eager-rendering.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/ui-hints/layout.adoc
 rename {antora/components/ug => core/_adoc-ug}/modules/fun/pages/ui-hints/names-and-descriptions.adoc (100%)
 create mode 100644 core/_adoc-ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
 rename {antora/components/ug-vw => core/_adoc-ug}/sync_examples.sh (100%)
 create mode 100644 core/plugins/jdo/_adoc/antora.yml
 rename {antora/components/ug-vro => core/plugins/jdo/_adoc}/examples.csv (100%)
 rename {antora/components/rg/modules/mvn => core/plugins/jdo/_adoc/modules/ROOT}/_attributes.adoc (100%)
 rename {antora/components/rg/modules/fis/examples => core/plugins/jdo/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png (100%)
 rename {antora/components/rg/modules/fis/assets/attachments => core/plugins/jdo/_adoc/modules/ROOT/examples}/.gitkeep (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/nav.adoc (100%)
 rename {antora/components/rg/modules/fis => core/plugins/jdo/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/classes => core/plugins/jdo/_adoc/modules/ROOT/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/about.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/configuring.adoc (100%)
 rename {antora/components/rg/modules/cms/pages/_partials => core/plugins/jdo/_adoc/modules/ROOT/pages/configuring}/_attributes.adoc (100%)
 create mode 100644 core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/bulk-load.adoc
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/configuring/persistence-xml.adoc (100%)
 create mode 100644 core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/properties.adoc
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/configuring/using-jndi-data-source.adoc (100%)
 create mode 100644 core/plugins/jdo/_adoc/modules/ROOT/pages/db-schemas.adoc
 create mode 100644 core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc
 rename {antora/components/rg/modules/cfg/pages/_partials => core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips}/_attributes.adoc (100%)
 create mode 100644 core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/hints-and-tips/java8.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc (100%)
 create mode 100644 core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/jdo-mappings.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/aaa => core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings}/_attributes.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc (100%)
 rename {antora/components/ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc (100%)
 rename {antora/components/ug-vro => core/plugins/jdo/_adoc}/sync_examples.sh (100%)
 rename core/plugins/{jdo-common => jdo/common}/pom.xml (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusException.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusPropertiesAware.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/JdoRuntimeException.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/metamodel/JdoPropertyUtils.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessor.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/datanucleus/service/support/TimestampService.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreException.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/package-info.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/package-info.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/package-info.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoNamedQuery.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacet.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForClauseAbstract.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacet.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/package-info.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetFallback.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/package-info.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionJdo.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionManagerJdo.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactoryMetamodelRefiner.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java (100%)
 rename core/plugins/{jdo-common => jdo/common}/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/pom.xml (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/QueryUtil.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisMarkupConverter.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisClobMapping.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportPlugin5.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupport_v3_2.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/metrics/MetricsServiceDefault.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/persistence/DNStoreManagerType.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/persistence/IsisLifecycleListener.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/java/org/apache/isis/jdo/persistence/Utils.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/resources/META-INF/MANIFEST.MF (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/resources/META-INF/services/org.apache.isis.metamodel.IsisJdoMetamodelPlugin (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/resources/META-INF/services/org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/main/resources/plugin.xml (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java (100%)
 rename core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java (100%)
 create mode 100644 core/security/_adoc/antora.yml
 rename {antora/components/ug-tst => core/security/_adoc}/examples.csv (100%)
 rename {antora/components/rg/modules/fis => core/security/_adoc/modules/ROOT}/_attributes.adoc (100%)
 rename {antora/components/rg/modules/cms/examples => core/security/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx (100%)
 rename {antora/components/rg/modules/cms/assets/attachments => core/security/_adoc/modules/ROOT/examples}/.gitkeep (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/nav.adoc (100%)
 rename {antora/components/rg/modules/cms => core/security/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/ant => core/security/_adoc/modules/ROOT}/pages/_partials/_attributes.adoc (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/about.adoc (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/api-for-applications.adoc (100%)
 create mode 100644 core/security/_adoc/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
 create mode 100644 core/security/_adoc/modules/ROOT/pages/hints-and-tips.adoc
 rename {antora/components/rg/modules/ant/pages/ViewModelLayout => core/security/_adoc/modules/ROOT/pages/hints-and-tips}/_attributes.adoc (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/hints-and-tips/configuring-isis-to-use-bypass.adoc (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/hints-and-tips/run-as.adoc (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/hints-and-tips/shiro-caching.adoc (100%)
 create mode 100644 core/security/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/shiro-realm-implementations.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/ViewModel => core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations}/_attributes.adoc (100%)
 create mode 100644 core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc (100%)
 rename {antora/components/ug-sec => core/security/_adoc}/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc (100%)
 create mode 100644 core/security/_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
 rename {antora/components/ug-tst => core/security/_adoc}/sync_examples.sh (100%)
 rename core/security/{ => api-and-bypass}/pom.xml (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/MessageBroker.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/package-info.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java (100%)
 rename core/security/{ => api-and-bypass}/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/EncodabilityContractTest.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java (100%)
 rename core/security/{ => api-and-bypass}/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/NOTICE (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/pom.xml (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/appended-resources/supplemental-models.xml (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini (100%)
 rename core/{plugins/security-shiro => security/plugins/shiro}/src/test/resources/shiro.ini (100%)
 create mode 100644 core/testsupport/_adoc/antora.yml
 rename {antora/components/ug-sec => core/testsupport/_adoc}/examples.csv (100%)
 rename {antora/components/rg/modules/cms => core/testsupport/_adoc/modules/ROOT}/_attributes.adoc (100%)
 rename {antora/components/rg/modules/cfg/examples => core/testsupport/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/composite.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/flat-1.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/flat-2.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/organizing-fixture-scripts.pptx (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/prompt-specifying-number.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/prompt.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/prototyping-menu.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/fixture-scripts/result-list.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/integ-tests.png (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/integ-tests.pptx (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/assets/images/testing/wrapper-factory.png (100%)
 rename {antora/components/rg/modules/cfg/assets/images => core/testsupport/_adoc/modules/ROOT/examples}/.gitkeep (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/nav.adoc (100%)
 rename {antora/components/rg/modules/cfg => core/testsupport/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/PropertyLayout => core/testsupport/_adoc/modules/ROOT/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/about.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/bdd-spec-support.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/Property => core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support}/_attributes.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/fixture-scripts.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/ParameterLayout => core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts}/_attributes.adoc (100%)
 create mode 100644 core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/fixture-scripts/sudo-service.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/integ-test-support.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/Parameter => core/testsupport/_adoc/modules/ROOT/pages/integ-test-support}/_attributes.adoc (100%)
 create mode 100644 core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/integ-test-support/bootstrapping.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/integ-test-support/configuration-properties.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/integ-test-support/maven-configuration.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/integ-test-support/typical-usage.adoc (100%)
 create mode 100644 core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/overview.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/unit-test-support.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/Mixin => core/testsupport/_adoc/modules/ROOT/pages/unit-test-support}/_attributes.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/unit-test-support/contract-tests.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/unit-test-support/maven-configuration.adoc (100%)
 rename {antora/components/ug-tst => core/testsupport/_adoc}/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc (100%)
 rename {antora/components/ug-sec => core/testsupport/_adoc}/sync_examples.sh (100%)
 rename core/{ => testsupport}/integtestsupport/pom.xml (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstact.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java (100%)
 rename core/{ => testsupport}/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java (100%)
 rename core/{ => testsupport}/integtestsupport/test.data (100%)
 rename core/{ => testsupport}/unittestsupport/.gitignore (100%)
 rename core/{ => testsupport}/unittestsupport/pom.xml (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java (100%)
 rename core/{ => testsupport}/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java (100%)
 create mode 100644 core/viewer-restfulobjects/_adoc/antora.yml
 rename {antora/components/ug-odn => core/viewer-restfulobjects/_adoc}/examples.csv (100%)
 rename {antora/components/rg/modules/cfg => core/viewer-restfulobjects/_adoc/modules/ROOT}/_attributes.adoc (100%)
 rename {antora/components/rg/modules/cfg => core/viewer-restfulobjects/_adoc/modules/ROOT}/assets/attachments/.gitkeep (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png (100%)
 rename {antora/components/rg/modules/fis/assets/images/RepresentationService => core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis}/service-collaborations.png (100%)
 rename {antora/components/rg/modules/ant => core/viewer-restfulobjects/_adoc/modules/ROOT}/examples/.gitkeep (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/nav.adoc (100%)
 rename {antora/components/rg/modules/ant => core/viewer-restfulobjects/_adoc/modules/ROOT}/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/MemberOrder => core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/about.adoc (100%)
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/configuration-properties.adoc
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/health-check.adoc (100%)
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
 rename {antora/components/rg/modules/ant/pages/DomainServiceLayout => core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips}/_attributes.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/hints-and-tips/angular-tips.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc (100%)
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/layout-resources.adoc
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/ro-spec.adoc
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
 rename {antora/components/rg/modules/ant/pages/DomainService => core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations}/_attributes.adoc (100%)
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc (100%)
 create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/simplified-representations/domain-object.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/simplified-representations/object-collection.adoc (100%)
 rename {antora/components/ug-vro => core/viewer-restfulobjects/_adoc}/modules/ROOT/pages/simplified-representations/other-representations.adoc (100%)
 rename {antora/components/ug-odn => core/viewer-restfulobjects/_adoc}/sync_examples.sh (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/pom.xml (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/legacy/ClientExecutor.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/legacy/ClientRequest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/legacy/ClientRequestFactory.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/legacy/RestEasyLegacy.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/ClientRequestConfigurer.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClientException.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/UriBuilderPlugin.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethodTest_setUp.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json (100%)
 rename core/{viewer-restfulobjects-applib => viewer-restfulobjects/applib}/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/pom.xml (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java (100%)
 rename core/{viewer-restfulobjects-rendering => viewer-restfulobjects/rendering}/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/pom.xml (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplicationException.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java (100%)
 rename core/{viewer-restfulobjects-server => viewer-restfulobjects/server}/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java (100%)
 create mode 100644 core/viewer-wicket/_adoc/antora.yml
 rename {antora/components/rg => core/viewer-wicket/_adoc}/examples.csv (100%)
 rename {antora/components/rg/modules/ant => core/viewer-wicket/_adoc/modules/ROOT}/_attributes.adoc (100%)
 rename {antora/components/rg/modules/ant/assets/images => core/viewer-wicket/_adoc/modules/ROOT/assets/attachments}/.gitkeep (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/about-page/about-page.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/application-menu/dividers.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/application-menu/layout-menus.pdn (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/application-menu/layout-menus.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/application-menu/tertiary.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/060-download-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/060-download.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/bookmarked-pages/panel-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/bookmarked-pages/panel.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/brand-logo/brand-logo.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/010-copy-link-button.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/030-hints-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/030-hints.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/050-title-url-940.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/copy-link/050-title-url.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/dialog-mode/modal.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/dialog-mode/sidebar.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/embedded-view/no-footer.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/embedded-view/no-header.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/embedded-view/regular.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/features/recent-pages/recent-pages.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/layouts/customer-order.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/layouts/estatio-Invoice.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/layouts/estatio-Lease.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/menubars/010-download.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/menubars/020-download.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/4-0-8-0.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/4-4-4-12.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/6-6-0-12.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/isis-layout.css (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html (100%)
 rename {antora/components/ug-vw/modules/ROOT/assets/images/user-registration => core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset}/login-page-default.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png (100%)
 rename {antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up => core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me}/login-page-default.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png (100%)
 rename {antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me => core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up}/login-page-default.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/theme-chooser/example-1.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/theme-chooser/example-2.png (100%)
 rename {antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset => core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration}/login-page-default.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/user-registration/sign-up-page.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png (100%)
 rename {antora/components/rg/modules/ant/assets/attachments => core/viewer-wicket/_adoc/modules/ROOT/examples}/.gitkeep (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/nav.adoc (100%)
 rename {antora/components/rg => core/viewer-wicket/_adoc}/modules/ROOT/pages/_attributes.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/DomainObjectLayout => core/viewer-wicket/_adoc/modules/ROOT/pages/_partials}/_attributes.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/about.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/customisation.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/DomainObject => core/viewer-wicket/_adoc/modules/ROOT/pages/customisation}/_attributes.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/customisation/auto-refresh.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/customisation/brand-logo.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/customisation/request-parameters.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/customisation/top-level-index-page.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/customisation/using-different-css-file.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
 rename {antora/components/rg/modules/ant/pages/CollectionLayout => core/viewer-wicket/_adoc/modules/ROOT/pages/extending}/_attributes.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/features.adoc (100%)
 rename {antora/components/rg/modules/ant/pages/Collection => core/viewer-wicket/_adoc/modules/ROOT/pages/features}/_attributes.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
 rename {antora/components/rg/modules/ant/pages/ActionLayout => core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips}/_attributes.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/hints-and-tips/svg-support.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
 rename {antora/components/rg/modules/ant/pages/Action => core/viewer-wicket/_adoc/modules/ROOT/pages/layout}/_attributes.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/layout/table-columns.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/menubars-layout.adoc (100%)
 rename {antora/components/rg/modules/ROOT/pages/_partials => core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout}/_attributes.adoc (100%)
 rename {antora/components/ug-vw => core/viewer-wicket/_adoc}/modules/ROOT/pages/menubars-layout/annotation-based.adoc (100%)
 create mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
 rename {antora/components/rg => core/viewer-wicket/_adoc}/sync_examples.sh (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/pom.xml (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Experimental.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/main/resources/log4j.properties (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java (100%)
 rename core/{viewer-wicket-impl => viewer-wicket/impl}/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/pom.xml (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/common/OnConcurrencyExceptionHandler.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java (100%)
 rename core/{viewer-wicket-model => viewer-wicket/model}/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/pom.xml (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/images/Images.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_observing.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ObservingComponent.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/main/resources/images/Default.png (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java (100%)
 rename core/{viewer-wicket-ui => viewer-wicket/ui}/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java (100%)


[isis] 06/13: ISIS-2062: moves plugins/jdo-* into own subdir

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 26beca10852a60085a05270850d0ef56b2d6ea90
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:16:41 2019 +0200

    ISIS-2062: moves plugins/jdo-* into own subdir
    
    this is so will be able to move the ug-odn docs closer.
---
 core/plugins/{jdo-common => jdo/common}/pom.xml                       | 0
 .../java/org/apache/isis/jdo/datanucleus/DataNucleusException.java    | 0
 .../org/apache/isis/jdo/datanucleus/DataNucleusPropertiesAware.java   | 0
 .../java/org/apache/isis/jdo/datanucleus/JdoRuntimeException.java     | 0
 .../org/apache/isis/jdo/datanucleus/metamodel/JdoPropertyUtils.java   | 0
 .../persistence/commands/AbstractDataNucleusObjectCommand.java        | 0
 .../persistence/commands/DataNucleusCreateObjectCommand.java          | 0
 .../persistence/commands/DataNucleusDeleteObjectCommand.java          | 0
 .../datanucleus/persistence/queries/PersistenceQueryProcessor.java    | 0
 .../apache/isis/jdo/datanucleus/service/support/TimestampService.java | 0
 .../main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java | 0
 .../jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java | 0
 .../jdo/exceprecog/ExceptionRecognizerForJDODataStoreException.java   | 0
 ...eptionIntegrityConstraintViolationForeignKeyNoActionException.java | 0
 .../exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java  | 0
 ...nizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java | 0
 .../datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java | 0
 .../facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java    | 0
 .../object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java   | 0
 .../object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java | 0
 .../object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java       | 0
 .../jdo/metamodel/facets/object/datastoreidentity/package-info.java   | 0
 .../object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java  | 0
 .../metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java  | 0
 .../facets/object/discriminator/JdoDiscriminatorFacetDefault.java     | 0
 .../ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java | 0
 .../isis/jdo/metamodel/facets/object/discriminator/package-info.java  | 0
 .../ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java          | 0
 .../JdoPersistenceCapableAnnotationFacetFactory.java                  | 0
 .../facets/object/persistencecapable/JdoPersistenceCapableFacet.java  | 0
 .../object/persistencecapable/JdoPersistenceCapableFacetAbstract.java | 0
 .../persistencecapable/JdoPersistenceCapableFacetAnnotation.java      | 0
 .../object/persistencecapable/JdoPersistenceCapableFacetImpl.java     | 0
 .../jdo/metamodel/facets/object/persistencecapable/package-info.java  | 0
 .../apache/isis/jdo/metamodel/facets/object/query/JdoNamedQuery.java  | 0
 .../jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java  | 0
 .../metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java | 0
 .../apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacet.java  | 0
 .../isis/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java | 0
 .../jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java    | 0
 .../jdo/metamodel/facets/object/query/VisitorForClauseAbstract.java   | 0
 .../isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java  | 0
 .../jdo/metamodel/facets/object/query/VisitorForVariablesClause.java  | 0
 .../facets/object/version/JdoVersionAnnotationFacetFactory.java       | 0
 .../isis/jdo/metamodel/facets/object/version/JdoVersionFacet.java     | 0
 .../facets/object/version/JdoVersionFacetFromAnnotation.java          | 0
 .../apache/isis/jdo/metamodel/facets/object/version/package-info.java | 0
 .../column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java  | 0
 .../facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java       | 0
 .../jdo/metamodel/facets/prop/column/BigDecimalFacetFallback.java     | 0
 .../facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java        | 0
 .../prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java     | 0
 .../prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java     | 0
 .../column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java   | 0
 .../facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java        | 0
 .../prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java    | 0
 .../metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java    | 0
 .../facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java      | 0
 .../facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java    | 0
 .../facets/prop/notpersistent/JdoNotPersistentFacetImpl.java          | 0
 .../NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java       | 0
 .../primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java   | 0
 .../facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java   | 0
 .../isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java | 0
 .../metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java  | 0
 .../facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java          | 0
 .../jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java  | 0
 .../primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java   | 0
 .../isis/jdo/metamodel/facets/prop/primarykey/package-info.java       | 0
 .../jdo/metamodel/specloader/validator/JdoMetaModelValidator.java     | 0
 .../isis/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java       | 0
 .../isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java    | 0
 .../main/java/org/apache/isis/jdo/persistence/IsisTransactionJdo.java | 0
 .../org/apache/isis/jdo/persistence/IsisTransactionManagerJdo.java    | 0
 .../java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java  | 0
 .../jdo/persistence/PersistenceSessionFactoryMetamodelRefiner.java    | 0
 .../exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java | 0
 ...tionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java | 0
 .../version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java | 0
 core/plugins/{jdo-datanucleus-5 => jdo/datanucleus-5}/pom.xml         | 0
 .../src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java        | 0
 .../isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java     | 0
 .../org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java   | 0
 .../java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java  | 0
 .../queries/PersistenceQueryFindAllInstancesProcessor.java            | 0
 .../queries/PersistenceQueryFindUsingApplibQueryProcessor.java        | 0
 .../persistence/queries/PersistenceQueryProcessorAbstract.java        | 0
 .../apache/isis/jdo/datanucleus/persistence/queries/QueryUtil.java    | 0
 .../isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java   | 0
 .../isis/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java     | 0
 .../isis/jdo/datanucleus/typeconverters/IsisMarkupConverter.java      | 0
 .../isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java    | 0
 .../isis/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java | 0
 .../org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java   | 0
 .../org/apache/isis/jdo/datanucleus/valuetypes/IsisClobMapping.java   | 0
 .../org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java  | 0
 .../main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java   | 0
 .../java/org/apache/isis/jdo/jdosupport/IsisJdoSupportPlugin5.java    | 0
 .../main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupport_v3_2.java | 0
 .../isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java     | 0
 .../jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java     | 0
 .../jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java    | 0
 .../isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java   | 0
 .../main/java/org/apache/isis/jdo/metrics/MetricsServiceDefault.java  | 0
 .../main/java/org/apache/isis/jdo/persistence/DNStoreManagerType.java | 0
 .../isis/jdo/persistence/DataNucleusApplicationComponents5.java       | 0
 .../java/org/apache/isis/jdo/persistence/IsisLifecycleListener.java   | 0
 .../java/org/apache/isis/jdo/persistence/PersistenceSession5.java     | 0
 .../org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java   | 0
 .../src/main/java/org/apache/isis/jdo/persistence/Utils.java          | 0
 .../datanucleus-5}/src/main/resources/META-INF/MANIFEST.MF            | 0
 .../services/org.apache.isis.metamodel.IsisJdoMetamodelPlugin         | 0
 .../services/org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin | 0
 .../datanucleus-5}/src/main/resources/plugin.xml                      | 0
 .../GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java          | 0
 .../GivenJdoDiscriminatorAnnotationFacetFactoryTest.java              | 0
 .../GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java         | 0
 .../facets/object/query/JdoQueryAnnotationFacetFactoryTest.java       | 0
 .../facets/object/version/JdoVersionAnnotationFacetFactoryTest.java   | 0
 .../BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java     | 0
 .../MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java      | 0
 .../prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java      | 0
 .../prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java      | 0
 .../GivenJdoNotPersistentAnnotationFacetFactoryTest.java              | 0
 .../prop/notpersistent/SimpleObjectWithNotPersistentColumn.java       | 0
 .../prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java | 0
 .../metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java  | 0
 .../isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java  | 0
 .../isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java | 0
 .../persistence/objectstore/transaction/PojoAdapterBuilder.java       | 0
 .../java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java | 0
 .../apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java  | 0
 .../wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java    | 0
 core/pom.xml                                                          | 4 ++--
 134 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/plugins/jdo-common/pom.xml b/core/plugins/jdo/common/pom.xml
similarity index 100%
rename from core/plugins/jdo-common/pom.xml
rename to core/plugins/jdo/common/pom.xml
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusException.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusException.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusException.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusException.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusPropertiesAware.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusPropertiesAware.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusPropertiesAware.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusPropertiesAware.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/JdoRuntimeException.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/JdoRuntimeException.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/JdoRuntimeException.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/JdoRuntimeException.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/metamodel/JdoPropertyUtils.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/metamodel/JdoPropertyUtils.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/metamodel/JdoPropertyUtils.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/metamodel/JdoPropertyUtils.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessor.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessor.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessor.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessor.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/service/support/TimestampService.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/support/TimestampService.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/datanucleus/service/support/TimestampService.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/support/TimestampService.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreException.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreException.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreException.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreException.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/package-info.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/package-info.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/package-info.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/package-info.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/package-info.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/package-info.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/package-info.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/package-info.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/package-info.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/package-info.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/package-info.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/package-info.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoNamedQuery.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoNamedQuery.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoNamedQuery.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoNamedQuery.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacet.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacet.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacet.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacet.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForClauseAbstract.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForClauseAbstract.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForClauseAbstract.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForClauseAbstract.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForFromClause.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacet.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacet.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacet.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacet.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/package-info.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/package-info.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/package-info.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/version/package-info.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetFallback.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetFallback.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetFallback.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalFacetFallback.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/package-info.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/package-info.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/package-info.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/package-info.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionJdo.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionJdo.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionJdo.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionJdo.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionManagerJdo.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionManagerJdo.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionManagerJdo.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisTransactionManagerJdo.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactoryMetamodelRefiner.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactoryMetamodelRefiner.java
similarity index 100%
rename from core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactoryMetamodelRefiner.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactoryMetamodelRefiner.java
diff --git a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
similarity index 100%
rename from core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
rename to core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
diff --git a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java b/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
similarity index 100%
rename from core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
rename to core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
diff --git a/core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
similarity index 100%
rename from core/plugins/jdo-common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
rename to core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo/datanucleus-5/pom.xml
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/pom.xml
rename to core/plugins/jdo/datanucleus-5/pom.xml
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/DataNucleusLifeCycleHelper.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/JDOStateManagerForIsis.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/QueryUtil.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/QueryUtil.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/QueryUtil.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/queries/QueryUtil.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisMarkupConverter.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisMarkupConverter.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisMarkupConverter.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisMarkupConverter.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisBlobMapping.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisClobMapping.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisClobMapping.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisClobMapping.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisClobMapping.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportPlugin5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportPlugin5.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportPlugin5.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportPlugin5.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupport_v3_2.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupport_v3_2.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupport_v3_2.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupport_v3_2.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusIdLong.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionLong.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/mixins/Persistable_downloadJdoMetadata.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/metrics/MetricsServiceDefault.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/metrics/MetricsServiceDefault.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/metrics/MetricsServiceDefault.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/metrics/MetricsServiceDefault.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DNStoreManagerType.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DNStoreManagerType.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DNStoreManagerType.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DNStoreManagerType.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/DataNucleusApplicationComponents5.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/IsisLifecycleListener.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/IsisLifecycleListener.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/IsisLifecycleListener.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/IsisLifecycleListener.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java
rename to core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/Utils.java
diff --git a/core/plugins/jdo-datanucleus-5/src/main/resources/META-INF/MANIFEST.MF b/core/plugins/jdo/datanucleus-5/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/resources/META-INF/MANIFEST.MF
rename to core/plugins/jdo/datanucleus-5/src/main/resources/META-INF/MANIFEST.MF
diff --git a/core/plugins/jdo-datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.metamodel.IsisJdoMetamodelPlugin b/core/plugins/jdo/datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.metamodel.IsisJdoMetamodelPlugin
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.metamodel.IsisJdoMetamodelPlugin
rename to core/plugins/jdo/datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.metamodel.IsisJdoMetamodelPlugin
diff --git a/core/plugins/jdo-datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin b/core/plugins/jdo/datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin
rename to core/plugins/jdo/datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin
diff --git a/core/plugins/jdo-datanucleus-5/src/main/resources/plugin.xml b/core/plugins/jdo/datanucleus-5/src/main/resources/plugin.xml
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/main/resources/plugin.xml
rename to core/plugins/jdo/datanucleus-5/src/main/resources/plugin.xml
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/metamodel/specloader/ObjectReflectorDefaultTest_object.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
similarity index 100%
rename from core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
rename to core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
diff --git a/core/pom.xml b/core/pom.xml
index d49fd09..5f394d2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2480,8 +2480,8 @@
 
 		<module>plugins/codegen-bytebuddy</module>
 		<module>plugins/jaxrs-resteasy-4</module>
-		<module>plugins/jdo-common</module>
-		<module>plugins/jdo-datanucleus-5</module>
+		<module>plugins/jdo/common</module>
+		<module>plugins/jdo/datanucleus-5</module>
 		<module>plugins/security-shiro</module>
 
 		<!-- to break cyclic dependencies some tests needed to be moved to their 


[isis] 03/13: ISIS-2062: ISIS-2062: moves viewer-wicket-* into own subdir

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6adeb55e93d3054e7a4b14360ac8505fbb38782b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:04:20 2019 +0200

    ISIS-2062: ISIS-2062: moves viewer-wicket-* into own subdir
    
    this is so will be able to move the ug-vro docs closer.
---
 core/pom.xml                                                |   6 +++---
 core/{viewer-wicket-impl => viewer-wicket/impl}/pom.xml     |   0
 .../apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java |   0
 .../isis/viewer/wicket/viewer/IsisWicketApplication.java    |   0
 .../wicket/viewer/IsisWicketApplication_Experimental.java   |   0
 .../TargetRespondListenerToResetQueryResultCache.java       |   0
 .../apache/isis/viewer/wicket/viewer/WebModuleWicket.java   |   0
 .../viewer/imagecache/ImageResourceCacheClassPath.java      |   0
 .../wicket/viewer/imagecache/ImageResourceCacheKey.java     |   0
 .../integration/wicket/AnonymousWebSessionForIsis.java      |   0
 .../integration/wicket/AuthenticatedWebSessionForIsis.java  |   0
 .../integration/wicket/ConverterForObjectAdapter.java       |   0
 .../wicket/ConverterForObjectAdapterMemento.java            |   0
 .../wicket/viewer/integration/wicket/LocalizerForIsis.java  |   0
 .../viewer/integration/wicket/WebRequestCycleForIsis.java   |   0
 .../memento/ObjectAdapterMementoSupportUsingSpring.java     |   0
 .../components/ComponentFactoryRegistrarDefault.java        |   0
 .../components/ComponentFactoryRegistryDefault.java         |   0
 .../viewer/registries/pages/PageClassListDefault.java       |   0
 .../viewer/registries/pages/PageClassRegistryDefault.java   |   0
 .../registries/pages/PageNavigationServiceDefault.java      |   0
 .../wicket/viewer/services/BookmarkUiServiceWicket.java     |   0
 .../wicket/viewer/services/DeepLinkServiceWicket.java       |   0
 .../viewer/services/EmailNotificationServiceWicket.java     |   0
 .../wicket/viewer/services/HintStoreUsingWicketSession.java |   0
 .../viewer/wicket/viewer/services/LocaleProviderWicket.java |   0
 .../viewer/wicket/viewer/services/Object_clearHints.java    |   0
 .../wicket/viewer/services/TranslationsResolverWicket.java  |   0
 .../viewer/wicket/viewer/settings/IsisResourceSettings.java |   0
 .../wicket/viewer/settings/WicketViewerSettingsDefault.java |   0
 .../impl}/src/main/resources/log4j.properties               |   0
 .../wicket/viewer/IsisWicketApplication_Defaults.java       |   0
 .../viewer/wicket/viewer/IsisWicketApplication_Pages.java   |   0
 .../wicket/AuthenticatedWebSessionForIsis_Authenticate.java |   0
 ...edWebSessionForIsis_DownCastsInheritedFunctionality.java |   0
 .../AuthenticatedWebSessionForIsis_Instantiation.java       |   0
 .../AuthenticatedWebSessionForIsis_NotYetImplemented.java   |   0
 .../app/wicket/AuthenticatedWebSessionForIsis_SignIn.java   |   0
 .../wicket/viewer/imagecache/ImageResourceCacheKeyTest.java |   0
 .../viewer/pages/PageClassListDefault_Instantiation.java    |   0
 .../pages/PageClassListDefault_RegistrationAndCaching.java  |   0
 .../pages/PageClassListDefault_Instantiation.java           |   0
 .../viewer/services/TranslationsResolverWicketTest.java     |   0
 core/{viewer-wicket-model => viewer-wicket/model}/pom.xml   |   0
 .../wicket/model/common/OnConcurrencyExceptionHandler.java  |   0
 .../isis/viewer/wicket/model/common/OnSelectionHandler.java |   0
 .../viewer/wicket/model/common/PageParametersUtils.java     |   0
 .../viewer/wicket/model/hints/HasUiHintDisambiguator.java   |   0
 .../viewer/wicket/model/hints/IsisActionCompletedEvent.java |   0
 .../isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java   |   0
 .../isis/viewer/wicket/model/hints/IsisEventAbstract.java   |   0
 .../viewer/wicket/model/hints/IsisEventLetterAbstract.java  |   0
 .../wicket/model/hints/IsisPropertyEditCompletedEvent.java  |   0
 .../isis/viewer/wicket/model/hints/IsisSelectorEvent.java   |   0
 .../isis/viewer/wicket/model/hints/UiHintContainer.java     |   0
 .../isis/viewer/wicket/model/isis/WicketViewerSettings.java |   0
 .../wicket/model/isis/WicketViewerSettingsAccessor.java     |   0
 .../apache/isis/viewer/wicket/model/links/LinkAndLabel.java |   0
 .../isis/viewer/wicket/model/links/LinksProvider.java       |   0
 .../isis/viewer/wicket/model/links/ListOfLinksModel.java    |   0
 .../isis/viewer/wicket/model/mementos/ActionMemento.java    |   0
 .../wicket/model/mementos/ActionParameterMemento.java       |   0
 .../viewer/wicket/model/mementos/CollectionMemento.java     |   0
 .../wicket/model/mementos/ObjectAdapterMemento_Legacy.java  |   0
 .../viewer/wicket/model/mementos/PageParameterNames.java    |   0
 .../isis/viewer/wicket/model/mementos/PropertyMemento.java  |   0
 .../apache/isis/viewer/wicket/model/models/AboutModel.java  |   0
 .../viewer/wicket/model/models/ActionArgumentModel.java     |   0
 .../apache/isis/viewer/wicket/model/models/ActionModel.java |   0
 .../isis/viewer/wicket/model/models/ActionPrompt.java       |   0
 .../viewer/wicket/model/models/ActionPromptProvider.java    |   0
 .../wicket/model/models/ActionPromptWithExtraContent.java   |   0
 .../isis/viewer/wicket/model/models/BookmarkTreeNode.java   |   0
 .../wicket/model/models/BookmarkTreeNodeComparator.java     |   0
 .../isis/viewer/wicket/model/models/BookmarkableModel.java  |   0
 .../viewer/wicket/model/models/BookmarkedPagesModel.java    |   0
 .../viewer/wicket/model/models/EntityCollectionModel.java   |   0
 .../apache/isis/viewer/wicket/model/models/EntityModel.java |   0
 .../viewer/wicket/model/models/EntityModelForReference.java |   0
 .../isis/viewer/wicket/model/models/FormExecutor.java       |   0
 .../viewer/wicket/model/models/FormExecutorContext.java     |   0
 .../wicket/model/models/HintPageParameterSerializer.java    |   0
 .../isis/viewer/wicket/model/models/ImageResourceCache.java |   0
 .../viewer/wicket/model/models/InlinePromptContext.java     |   0
 .../isis/viewer/wicket/model/models/ModelAbstract.java      |   0
 .../isis/viewer/wicket/model/models/ObjectAdapterModel.java |   0
 .../apache/isis/viewer/wicket/model/models/PageType.java    |   0
 .../wicket/model/models/ParentEntityModelProvider.java      |   0
 .../apache/isis/viewer/wicket/model/models/ScalarModel.java |   0
 .../wicket/model/models/ScalarModelWithMultiPending.java    |   0
 .../viewer/wicket/model/models/ScalarModelWithPending.java  |   0
 .../viewer/wicket/model/models/ServiceActionsModel.java     |   0
 .../viewer/wicket/model/models/ToggledMementosProvider.java |   0
 .../org/apache/isis/viewer/wicket/model/models/Util.java    |   0
 .../apache/isis/viewer/wicket/model/models/ValueModel.java  |   0
 .../apache/isis/viewer/wicket/model/models/VoidModel.java   |   0
 .../isis/viewer/wicket/model/models/WelcomeModel.java       |   0
 .../viewer/wicket/model/models/WicketComponentUtils.java    |   0
 .../viewer/wicket/model/models/whereami/WhereAmIModel.java  |   0
 .../wicket/model/models/whereami/WhereAmIModelDefault.java  |   0
 .../isis/viewer/wicket/model/util/ComponentHintKey.java     |   0
 .../isis/viewer/wicket/model/models/ActionModelTest.java    |   0
 .../viewer/wicket/model/models/EntityModel_hintsTest.java   |   0
 .../model/models/LowestCommonSuperclassClosureTest.java     |   0
 .../models/ScalarModel_isScalarSubtypingAnyOf_Test.java     |   0
 core/{viewer-wicket-ui => viewer-wicket/ui}/pom.xml         |   0
 .../ui}/src/main/java/images/Images.java                    |   0
 .../isis/viewer/wicket/ui/CollectionContentsAsFactory.java  |   0
 .../org/apache/isis/viewer/wicket/ui/ComponentFactory.java  |   0
 .../isis/viewer/wicket/ui/ComponentFactoryAbstract.java     |   0
 .../org/apache/isis/viewer/wicket/ui/ComponentType.java     |   0
 .../java/org/apache/isis/viewer/wicket/ui/DialogMode.java   |   0
 .../isis/viewer/wicket/ui/HeaderContributorProvider.java    |   0
 .../wicket/ui/actionresponse/ActionResultResponse.java      |   0
 .../ActionResultResponseHandlingStrategy.java               |   0
 .../wicket/ui/actionresponse/ActionResultResponseType.java  |   0
 .../wicket/ui/app/registry/ComponentFactoryRegistrar.java   |   0
 .../wicket/ui/app/registry/ComponentFactoryRegistry.java    |   0
 .../ui/app/registry/ComponentFactoryRegistryAccessor.java   |   0
 .../isis/viewer/wicket/ui/components/about/AboutPanel.html  |   0
 .../isis/viewer/wicket/ui/components/about/AboutPanel.java  |   0
 .../wicket/ui/components/about/AboutPanelFactory.java       |   0
 .../wicket/ui/components/about/JarManifestAttributes.java   |   0
 .../wicket/ui/components/about/JarManifestListView.java     |   0
 .../viewer/wicket/ui/components/about/JarManifestModel.java |   0
 .../viewer/wicket/ui/components/about/JarManifestPanel.css  |   0
 .../viewer/wicket/ui/components/about/JarManifestPanel.html |   0
 .../viewer/wicket/ui/components/about/JarManifestPanel.java |   0
 .../isis/viewer/wicket/ui/components/about/div-toggle.js    |   0
 .../wicket/ui/components/actioninfo/ActionInfoPanel.html    |   0
 .../wicket/ui/components/actioninfo/ActionInfoPanel.java    |   0
 .../ui/components/actioninfo/ActionInfoPanelFactory.java    |   0
 .../wicket/ui/components/actionlink/ActionLinkPanel.html    |   0
 .../wicket/ui/components/actionlink/ActionLinkPanel.java    |   0
 .../ui/components/actionlink/ActionLinkPanelFactory.java    |   0
 .../wicket/ui/components/actionmenu/CssClassFaBehavior.java |   0
 .../entityactions/AdditionalLinksAsDropDownPanel.html       |   0
 .../entityactions/AdditionalLinksAsDropDownPanel.java       |   0
 .../entityactions/AdditionalLinksAsListInlinePanel.html     |   0
 .../entityactions/AdditionalLinksAsListInlinePanel.java     |   0
 .../actionmenu/entityactions/AdditionalLinksPanel.java      |   0
 .../actionmenu/entityactions/EntityActionLinkFactory.java   |   0
 .../actionmenu/entityactions/LinkAndLabelUtil.java          |   0
 .../components/actionmenu/serviceactions/CssMenuItem.java   |   0
 .../actionmenu/serviceactions/CssMenuItemPanelAbstract.java |   0
 .../actionmenu/serviceactions/CssSubMenuItemsPanel.html     |   0
 .../actionmenu/serviceactions/CssSubMenuItemsPanel.java     |   0
 .../actionmenu/serviceactions/ServiceActionLinkFactory.java |   0
 .../actionmenu/serviceactions/ServiceActionUtil.java        |   0
 .../actionmenu/serviceactions/ServiceActionsPanel.css       |   0
 .../actionmenu/serviceactions/ServiceActionsPanel.html      |   0
 .../actionmenu/serviceactions/ServiceActionsPanel.java      |   0
 .../serviceactions/ServiceActionsPanelFactory.java          |   0
 .../actionmenu/serviceactions/ServiceAndAction.java         |   0
 .../actionmenu/serviceactions/TertiaryActionsPanel.css      |   0
 .../actionmenu/serviceactions/TertiaryActionsPanel.html     |   0
 .../actionmenu/serviceactions/TertiaryActionsPanel.java     |   0
 .../actionmenu/serviceactions/TertiaryMenuPanelFactory.java |   0
 .../ui/components/actionprompt/ActionPromptHeaderPanel.html |   0
 .../ui/components/actionprompt/ActionPromptHeaderPanel.java |   0
 .../ui/components/actionprompt/ActionPromptModalWindow.html |   0
 .../ui/components/actionprompt/ActionPromptModalWindow.java |   0
 .../ui/components/actionpromptsb/ActionPromptSidebar.html   |   0
 .../ui/components/actionpromptsb/ActionPromptSidebar.java   |   0
 .../ui/components/actions/ActionFormExecutorStrategy.java   |   0
 .../wicket/ui/components/actions/ActionParametersForm.java  |   0
 .../ui/components/actions/ActionParametersFormPanel.html    |   0
 .../ui/components/actions/ActionParametersFormPanel.java    |   0
 .../components/actions/ActionParametersFormPanel.properties |   0
 .../actions/ActionParametersFormPanelFactory.java           |   0
 .../wicket/ui/components/actions/ActionParametersPanel.html |   0
 .../wicket/ui/components/actions/ActionParametersPanel.java |   0
 .../ui/components/actions/ActionParametersPanelFactory.java |   0
 .../ui/components/bookmarkedpages/BookmarkedPagesPanel.css  |   0
 .../ui/components/bookmarkedpages/BookmarkedPagesPanel.html |   0
 .../ui/components/bookmarkedpages/BookmarkedPagesPanel.java |   0
 .../bookmarkedpages/BookmarkedPagesPanelFactory.java        |   0
 .../components/bookmarkedpages/images/clear_bookmarks.png   | Bin
 .../wicket/ui/components/bookmarkedpages/slide-panel.js     |   0
 .../components/collection/AssociatedWithActionsHelper.java  |   0
 .../wicket/ui/components/collection/CollectionPanel.html    |   0
 .../wicket/ui/components/collection/CollectionPanel.java    |   0
 .../ui/components/collection/bulk/BulkActionsProvider.java  |   0
 .../collection/count/CollectionCountProvider.java           |   0
 .../collection/selector/CollectionSelectorHelper.java       |   0
 .../collection/selector/CollectionSelectorPanel.html        |   0
 .../collection/selector/CollectionSelectorPanel.java        |   0
 .../collection/selector/CollectionSelectorProvider.java     |   0
 .../ajaxtable/CollectionContentsAsAjaxTablePanel.html       |   0
 .../ajaxtable/CollectionContentsAsAjaxTablePanel.java       |   0
 .../CollectionContentsAsAjaxTablePanelFactory.java          |   0
 .../ajaxtable/CollectionContentsSortableDataProvider.java   |   0
 .../ajaxtable/IsisAjaxFallbackDataTable.java                |   0
 .../ajaxtable/IsisAjaxFallbackHeadersToolbar.java           |   0
 .../ajaxtable/IsisAjaxFallbackOrderByBorder.java            |   0
 .../ajaxtable/IsisAjaxHeadersToolbar.html                   |   0
 .../ajaxtable/IsisAjaxHeadersToolbar.java                   |   0
 .../ajaxtable/IsisAjaxNavigationToolbar.html                |   0
 .../ajaxtable/IsisAjaxNavigationToolbar.java                |   0
 .../ajaxtable/IsisAjaxPagingNavigation.java                 |   0
 .../ajaxtable/IsisAjaxPagingNavigationIncrementLink.java    |   0
 .../ajaxtable/IsisAjaxPagingNavigationLink.java             |   0
 .../ajaxtable/IsisAjaxPagingNavigator.java                  |   0
 .../ajaxtable/IsisTotalRecordsToolbar.html                  |   0
 .../ajaxtable/IsisTotalRecordsToolbar.java                  |   0
 .../ajaxtable/PrototypingMessageProvider.java               |   0
 .../ajaxtable/columns/ColumnAbstract.java                   |   0
 .../ajaxtable/columns/ObjectAdapterPropertyColumn.java      |   0
 .../ajaxtable/columns/ObjectAdapterTitleColumn.java         |   0
 .../ajaxtable/columns/ObjectAdapterToggleboxColumn.java     |   0
 .../collectioncontents/ajaxtable/images/arrow_down.png      | Bin
 .../collectioncontents/ajaxtable/images/arrow_off.png       | Bin
 .../collectioncontents/ajaxtable/images/arrow_up.png        | Bin
 .../icons/CollectionContentsAsIconsPanel.html               |   0
 .../icons/CollectionContentsAsIconsPanel.java               |   0
 .../icons/CollectionContentsAsIconsPanelFactory.java        |   0
 .../multiple/CollectionContentsMultipleViewsPanel.html      |   0
 .../multiple/CollectionContentsMultipleViewsPanel.java      |   0
 .../CollectionContentsMultipleViewsPanelFactory.java        |   0
 .../summary/CollectionContentsAsSummary.html                |   0
 .../summary/CollectionContentsAsSummary.java                |   0
 .../summary/CollectionContentsAsSummaryFactory.java         |   0
 .../unresolved/CollectionContentsHiddenPanel.html           |   0
 .../unresolved/CollectionContentsHiddenPanel.java           |   0
 .../unresolved/CollectionContentsHiddenPanelFactory.java    |   0
 .../wicket/ui/components/empty/EmptyCollectionPanel.html    |   0
 .../wicket/ui/components/empty/EmptyCollectionPanel.java    |   0
 .../ui/components/empty/EmptyCollectionPanelFactory.java    |   0
 .../components/entity/EntityComponentFactoryAbstract.java   |   0
 .../components/entity/collection/EntityCollectionPanel.html |   0
 .../components/entity/collection/EntityCollectionPanel.java |   0
 .../entity/collection/EntityCollectionPanelFactory.java     |   0
 .../wicket/ui/components/entity/fieldset/PropertyGroup.html |   0
 .../wicket/ui/components/entity/fieldset/PropertyGroup.java |   0
 .../ui/components/entity/header/EntityHeaderPanel.html      |   0
 .../ui/components/entity/header/EntityHeaderPanel.java      |   0
 .../components/entity/header/EntityHeaderPanelFactory.java  |   0
 .../entity/icontitle/EntityIconAndTitlePanel.html           |   0
 .../entity/icontitle/EntityIconAndTitlePanel.java           |   0
 .../entity/icontitle/EntityIconAndTitlePanelFactory.java    |   0
 .../entity/icontitle/EntityIconTitleAndCopyLinkPanel.html   |   0
 .../entity/icontitle/EntityIconTitleAndCopyLinkPanel.java   |   0
 .../icontitle/EntityIconTitleAndCopyLinkPanelFactory.java   |   0
 .../entity/selector/links/EntityLinksSelectorPanel.html     |   0
 .../entity/selector/links/EntityLinksSelectorPanel.java     |   0
 .../selector/links/EntityLinksSelectorPanelFactory.java     |   0
 .../viewer/wicket/ui/components/footer/CreditImage.java     |   0
 .../isis/viewer/wicket/ui/components/footer/CreditName.java |   0
 .../viewer/wicket/ui/components/footer/FooterPanel.html     |   0
 .../viewer/wicket/ui/components/footer/FooterPanel.java     |   0
 .../wicket/ui/components/footer/FooterPanelFactory.java     |   0
 .../viewer/wicket/ui/components/header/HeaderPanel.html     |   0
 .../viewer/wicket/ui/components/header/HeaderPanel.java     |   0
 .../wicket/ui/components/header/HeaderPanelFactory.java     |   0
 .../wicket/ui/components/layout/bs3/BS3GridPanel.html       |   0
 .../wicket/ui/components/layout/bs3/BS3GridPanel.java       |   0
 .../isis/viewer/wicket/ui/components/layout/bs3/Util.java   |   0
 .../wicket/ui/components/layout/bs3/clearfix/ClearFix.html  |   0
 .../wicket/ui/components/layout/bs3/clearfix/ClearFix.java  |   0
 .../viewer/wicket/ui/components/layout/bs3/col/Col.html     |   0
 .../viewer/wicket/ui/components/layout/bs3/col/Col.java     |   0
 .../bs3/col/RepeatingViewWithDynamicallyVisibleContent.java |   0
 .../viewer/wicket/ui/components/layout/bs3/row/Row.html     |   0
 .../viewer/wicket/ui/components/layout/bs3/row/Row.java     |   0
 .../wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java |   0
 .../wicket/ui/components/layout/bs3/tabs/TabPanel.html      |   0
 .../wicket/ui/components/layout/bs3/tabs/TabPanel.java      |   0
 .../wicket/ui/components/property/PropertyEditForm.java     |   0
 .../ui/components/property/PropertyEditFormPanel.html       |   0
 .../ui/components/property/PropertyEditFormPanel.java       |   0
 .../ui/components/property/PropertyEditFormPanel.properties |   0
 .../components/property/PropertyEditFormPanelFactory.java   |   0
 .../wicket/ui/components/property/PropertyEditPanel.html    |   0
 .../wicket/ui/components/property/PropertyEditPanel.java    |   0
 .../ui/components/property/PropertyEditPanelFactory.java    |   0
 .../components/property/PropertyFormExecutorStrategy.java   |   0
 .../propertyheader/PropertyEditPromptHeaderPanel.html       |   0
 .../propertyheader/PropertyEditPromptHeaderPanel.java       |   0
 .../components/scalars/ComponentFactoryScalarAbstract.java  |   0
 .../viewer/wicket/ui/components/scalars/DateConverter.java  |   0
 .../wicket/ui/components/scalars/DateConverterAbstract.java |   0
 .../wicket/ui/components/scalars/DateConverterPlugin.java   |   0
 .../wicket/ui/components/scalars/DateFormatSettings.java    |   0
 .../wicket/ui/components/scalars/IsisConverterLocator.java  |   0
 .../wicket/ui/components/scalars/ScalarModelSubscriber.java |   0
 .../ui/components/scalars/ScalarModelSubscriber2.java       |   0
 .../wicket/ui/components/scalars/ScalarPanelAbstract.java   |   0
 .../wicket/ui/components/scalars/ScalarPanelAbstract2.java  |   0
 .../ui/components/scalars/ScalarPanelSelect2Abstract.java   |   0
 .../ui/components/scalars/ScalarPanelTextFieldAbstract.html |   0
 .../ui/components/scalars/ScalarPanelTextFieldAbstract.java |   0
 .../scalars/ScalarPanelTextFieldDatePickerAbstract.java     |   0
 .../ui/components/scalars/ScalarPanelTextFieldNumeric.java  |   0
 .../scalars/ScalarPanelTextFieldParseableAbstract.java      |   0
 .../wicket/ui/components/scalars/TextFieldAbstract.java     |   0
 .../wicket/ui/components/scalars/TextFieldStringModel.java  |   0
 .../wicket/ui/components/scalars/TextFieldValueModel.java   |   0
 .../wicket/ui/components/scalars/XEditableBehavior2.java    |   0
 .../ui/components/scalars/datepicker/DateTimeConfig.java    |   0
 .../scalars/datepicker/TextFieldWithDateTimePicker.java     |   0
 .../scalars/datepicker/css/bootstrap-datetimepicker.css     |   0
 .../scalars/datepicker/css/bootstrap-datetimepicker.min.css |   0
 .../scalars/datepicker/js/bootstrap-datetimepicker.js       |   0
 .../scalars/datepicker/js/bootstrap-datetimepicker.min.js   |   0
 .../wicket/ui/components/scalars/datepicker/js/moment.js    |   0
 .../ui/components/scalars/datepicker/js/moment.min.js       |   0
 .../ui/components/scalars/image/JavaAwtImagePanel.html      |   0
 .../ui/components/scalars/image/JavaAwtImagePanel.java      |   0
 .../components/scalars/image/JavaAwtImagePanelFactory.java  |   0
 .../wicket/ui/components/scalars/image/wupb-progressBar.css |   0
 .../scalars/isisapplib/IsisBlobOrClobPanelAbstract.html     |   0
 .../scalars/isisapplib/IsisBlobOrClobPanelAbstract.java     |   0
 .../ui/components/scalars/isisapplib/IsisBlobPanel.java     |   0
 .../components/scalars/isisapplib/IsisBlobPanelFactory.java |   0
 .../ui/components/scalars/isisapplib/IsisClobPanel.java     |   0
 .../components/scalars/isisapplib/IsisClobPanelFactory.java |   0
 .../ui/components/scalars/isisapplib/IsisColorPanel.java    |   0
 .../scalars/isisapplib/IsisColorPanelFactory.java           |   0
 .../ui/components/scalars/isisapplib/IsisMoneyPanel.java    |   0
 .../scalars/isisapplib/IsisMoneyPanelFactory.java           |   0
 .../ui/components/scalars/isisapplib/IsisPasswordPanel.java |   0
 .../scalars/isisapplib/IsisPasswordPanelFactory.java        |   0
 .../components/scalars/isisapplib/IsisPercentagePanel.java  |   0
 .../scalars/isisapplib/IsisPercentagePanelFactory.java      |   0
 .../ui/components/scalars/isisapplib/IsisTimePanel.java     |   0
 .../components/scalars/isisapplib/ResourceLinkVolatile.java |   0
 .../scalars/jdk8time/DateConverterForJdk8Abstract.java      |   0
 .../scalars/jdk8time/DateConverterForJdk8LocalDate.java     |   0
 .../scalars/jdk8time/DateConverterForJdk8LocalDateTime.java |   0
 .../jdk8time/DateConverterForJdk8OffsetDateTime.java        |   0
 .../ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java  |   0
 .../scalars/jdk8time/Jdk8LocalDatePanelFactory.java         |   0
 .../components/scalars/jdk8time/Jdk8LocalDateTimePanel.java |   0
 .../scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java     |   0
 .../scalars/jdk8time/Jdk8OffsetDateTimePanel.java           |   0
 .../scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java    |   0
 .../scalars/jdkdates/DateConverterForJavaAbstract.java      |   0
 .../scalars/jdkdates/DateConverterForJavaSqlDate.java       |   0
 .../scalars/jdkdates/DateConverterForJavaSqlTimestamp.java  |   0
 .../scalars/jdkdates/DateConverterForJavaUtilDate.java      |   0
 .../ui/components/scalars/jdkdates/JavaSqlDatePanel.java    |   0
 .../scalars/jdkdates/JavaSqlDatePanelFactory.java           |   0
 .../ui/components/scalars/jdkdates/JavaSqlTimePanel.java    |   0
 .../scalars/jdkdates/JavaSqlTimePanelFactory.java           |   0
 .../components/scalars/jdkdates/JavaSqlTimestampPanel.java  |   0
 .../scalars/jdkdates/JavaSqlTimestampPanelFactory.java      |   0
 .../ui/components/scalars/jdkdates/JavaUtilDatePanel.java   |   0
 .../scalars/jdkdates/JavaUtilDatePanelFactory.java          |   0
 .../scalars/jdkmath/BigDecimalConverterWithScale.java       |   0
 .../ui/components/scalars/jdkmath/BigDecimalTextField.java  |   0
 .../components/scalars/jdkmath/JavaMathBigDecimalPanel.java |   0
 .../scalars/jdkmath/JavaMathBigDecimalPanelFactory.java     |   0
 .../components/scalars/jdkmath/JavaMathBigIntegerPanel.java |   0
 .../scalars/jdkmath/JavaMathBigIntegerPanelFactory.java     |   0
 .../scalars/jodatime/DateConverterForJodaAbstract.java      |   0
 .../scalars/jodatime/DateConverterForJodaDateTime.java      |   0
 .../scalars/jodatime/DateConverterForJodaLocalDate.java     |   0
 .../scalars/jodatime/DateConverterForJodaLocalDateTime.java |   0
 .../ui/components/scalars/jodatime/JodaDateTimePanel.java   |   0
 .../scalars/jodatime/JodaDateTimePanelFactory.java          |   0
 .../ui/components/scalars/jodatime/JodaLocalDatePanel.java  |   0
 .../scalars/jodatime/JodaLocalDatePanelFactory.java         |   0
 .../components/scalars/jodatime/JodaLocalDateTimePanel.java |   0
 .../scalars/jodatime/JodaLocalDateTimePanelFactory.java     |   0
 .../ui/components/scalars/markup/MarkupComponent.java       |   0
 .../components/scalars/markup/MarkupComponentFactory.java   |   0
 .../scalars/markup/MarkupComponent_observing.java           |   0
 .../components/scalars/markup/MarkupComponent_reloadJs.java |   0
 .../wicket/ui/components/scalars/markup/MarkupPanel.java    |   0
 .../ui/components/scalars/markup/MarkupPanelFactories.java  |   0
 .../ui/components/scalars/markup/ObservingComponent.js      |   0
 .../ui/components/scalars/markup/StandaloneMarkupPanel.html |   0
 .../ui/components/scalars/markup/StandaloneMarkupPanel.java |   0
 .../ui/components/scalars/primitive/BooleanPanel.html       |   0
 .../ui/components/scalars/primitive/BooleanPanel.java       |   0
 .../components/scalars/primitive/BooleanPanelFactory.java   |   0
 .../scalars/primitive/BooleanPanel_labelRightPosition.html  |   0
 .../wicket/ui/components/scalars/primitive/BytePanel.java   |   0
 .../ui/components/scalars/primitive/BytePanelFactory.java   |   0
 .../ui/components/scalars/primitive/CharacterPanel.java     |   0
 .../components/scalars/primitive/CharacterPanelFactory.java |   0
 .../wicket/ui/components/scalars/primitive/DoublePanel.java |   0
 .../ui/components/scalars/primitive/DoublePanelFactory.java |   0
 .../wicket/ui/components/scalars/primitive/FloatPanel.java  |   0
 .../ui/components/scalars/primitive/FloatPanelFactory.java  |   0
 .../ui/components/scalars/primitive/IntegerPanel.java       |   0
 .../components/scalars/primitive/IntegerPanelFactory.java   |   0
 .../wicket/ui/components/scalars/primitive/LongPanel.java   |   0
 .../ui/components/scalars/primitive/LongPanelFactory.java   |   0
 .../wicket/ui/components/scalars/primitive/ShortPanel.java  |   0
 .../ui/components/scalars/primitive/ShortPanelFactory.java  |   0
 .../scalars/reference/EntityLinkSelect2Panel.html           |   0
 .../scalars/reference/EntityLinkSelect2Panel.java           |   0
 .../ui/components/scalars/reference/ReferencePanel.html     |   0
 .../ui/components/scalars/reference/ReferencePanel.java     |   0
 .../components/scalars/reference/ReferencePanelFactory.java |   0
 .../ui/components/scalars/string/MultiLineStringPanel.java  |   0
 .../wicket/ui/components/scalars/string/StringPanel.java    |   0
 .../ui/components/scalars/string/StringPanelFactory.java    |   0
 .../wicket/ui/components/scalars/uuid/UuidConverter.java    |   0
 .../viewer/wicket/ui/components/scalars/uuid/UuidPanel.java |   0
 .../wicket/ui/components/scalars/uuid/UuidPanelFactory.java |   0
 .../wicket/ui/components/scalars/uuid/UuidTextField.java    |   0
 .../wicket/ui/components/scalars/value/ValuePanel.java      |   0
 .../ui/components/scalars/value/ValuePanelFactory.java      |   0
 .../scalars/valuechoices/ValueChoicesSelect2Panel.html      |   0
 .../scalars/valuechoices/ValueChoicesSelect2Panel.java      |   0
 .../valuechoices/ValueChoicesSelect2PanelFactory.java       |   0
 .../standalonecollection/StandaloneCollectionPanel.html     |   0
 .../standalonecollection/StandaloneCollectionPanel.java     |   0
 .../StandaloneCollectionPanelFactory.java                   |   0
 .../wicket/ui/components/tree/IsisToWicketTreeAdapter.java  |   0
 .../wicket/ui/components/tree/StandaloneTreePanel.html      |   0
 .../wicket/ui/components/tree/StandaloneTreePanel.java      |   0
 .../isis/viewer/wicket/ui/components/tree/TreePanel.html    |   0
 .../isis/viewer/wicket/ui/components/tree/TreePanel.java    |   0
 .../wicket/ui/components/tree/TreePanelFactories.java       |   0
 .../wicket/ui/components/tree/themes/TreeThemeProvider.java |   0
 .../ui/components/tree/themes/TreeThemeProviderDefault.java |   0
 .../tree/themes/bootstrap/IsisBootstrapTreeTheme.java       |   0
 .../wicket/ui/components/tree/themes/bootstrap/theme.css    |   0
 .../wicket/ui/components/unknown/UnknownModelPanel.html     |   0
 .../wicket/ui/components/unknown/UnknownModelPanel.java     |   0
 .../ui/components/unknown/UnknownModelPanelFactory.java     |   0
 .../wicket/ui/components/value/StandaloneValuePanel.html    |   0
 .../wicket/ui/components/value/StandaloneValuePanel.java    |   0
 .../ui/components/value/StandaloneValuePanelFactory.java    |   0
 .../wicket/ui/components/voidreturn/VoidReturnPanel.html    |   0
 .../wicket/ui/components/voidreturn/VoidReturnPanel.java    |   0
 .../ui/components/voidreturn/VoidReturnPanelFactory.java    |   0
 .../viewer/wicket/ui/components/welcome/WelcomePanel.html   |   0
 .../viewer/wicket/ui/components/welcome/WelcomePanel.java   |   0
 .../wicket/ui/components/welcome/WelcomePanelFactory.java   |   0
 .../wicket/ui/components/widgets/bootstrap/FormGroup.java   |   0
 .../wicket/ui/components/widgets/bootstrap/ModalDialog.java |   0
 .../ui/components/widgets/breadcrumbs/BreadcrumbModel.java  |   0
 .../widgets/breadcrumbs/BreadcrumbModelProvider.java        |   0
 .../ui/components/widgets/breadcrumbs/BreadcrumbPanel.html  |   0
 .../ui/components/widgets/breadcrumbs/BreadcrumbPanel.java  |   0
 .../ui/components/widgets/buttons/ContainedButtonPanel.html |   0
 .../ui/components/widgets/buttons/ContainedButtonPanel.java |   0
 .../ui/components/widgets/buttons/ToggleButtonsPanel.html   |   0
 .../ui/components/widgets/buttons/ToggleButtonsPanel.java   |   0
 .../widgets/checkbox/ContainedToggleboxPanel.html           |   0
 .../widgets/checkbox/ContainedToggleboxPanel.java           |   0
 .../widgets/entitysimplelink/EntityLinkSimplePanel.css      |   0
 .../widgets/entitysimplelink/EntityLinkSimplePanel.html     |   0
 .../widgets/entitysimplelink/EntityLinkSimplePanel.java     |   0
 .../entitysimplelink/EntityLinkSimplePanelFactory.java      |   0
 .../wicket/ui/components/widgets/favicon/Favicon.java       |   0
 .../widgets/formcomponent/CancelHintRequired.java           |   0
 .../widgets/formcomponent/FormComponentPanelAbstract.java   |   0
 .../components/widgets/formcomponent/FormFeedbackPanel.java |   0
 .../ui/components/widgets/linkandlabel/ActionLink.java      |   0
 .../components/widgets/linkandlabel/ActionLinkFactory.java  |   0
 .../widgets/linkandlabel/ActionLinkFactoryAbstract.java     |   0
 .../widgets/linkandlabel/AjaxDeferredBehaviour.java         |   0
 .../wicket/ui/components/widgets/navbar/BrandLogo.java      |   0
 .../wicket/ui/components/widgets/navbar/BrandName.java      |   0
 .../wicket/ui/components/widgets/navbar/Placement.java      |   0
 .../wicket/ui/components/widgets/select2/ChoiceExt.java     |   0
 .../wicket/ui/components/widgets/select2/Select2.java       |   0
 .../widgets/select2/Select2BootstrapCssReference.java       |   0
 .../ui/components/widgets/select2/Select2ChoiceExt.java     |   0
 .../ui/components/widgets/select2/Select2JsReference.java   |   0
 .../components/widgets/select2/Select2MultiChoiceExt.java   |   0
 .../widgets/select2/providers/EmptyChoiceProvider.java      |   0
 .../providers/ObjectAdapterMementoProviderAbstract.java     |   0
 .../providers/ObjectAdapterMementoProviderForChoices.java   |   0
 .../ObjectAdapterMementoProviderForReferenceChoices.java    |   0
 ...dapterMementoProviderForReferenceObjectAutoComplete.java |   0
 ...entoProviderForReferenceParamOrPropertyAutoComplete.java |   0
 .../ObjectAdapterMementoProviderForValueChoices.java        |   0
 .../ui/components/widgets/select2/select2-bootstrap.css     |   0
 .../widgets/themepicker/IsisWicketThemeSupport.java         |   0
 .../widgets/themepicker/IsisWicketThemeSupportDefault.java  |   0
 .../ui/components/widgets/themepicker/ThemeChooser.html     |   0
 .../ui/components/widgets/themepicker/ThemeChooser.java     |   0
 .../widgets/zclip/SimpleClipboardModalWindow.html           |   0
 .../widgets/zclip/SimpleClipboardModalWindow.java           |   0
 .../widgets/zclip/SimpleClipboardModalWindowForm.java       |   0
 .../widgets/zclip/SimpleClipboardModalWindowPanel.html      |   0
 .../widgets/zclip/SimpleClipboardModalWindowPanel.java      |   0
 .../ui/components/widgets/zclip/ZeroClipboardPanel.html     |   0
 .../ui/components/widgets/zclip/ZeroClipboardPanel.java     |   0
 .../apache/isis/viewer/wicket/ui/errors/ExceptionModel.java |   0
 .../viewer/wicket/ui/errors/ExceptionStackTracePanel.css    |   0
 .../viewer/wicket/ui/errors/ExceptionStackTracePanel.html   |   0
 .../viewer/wicket/ui/errors/ExceptionStackTracePanel.java   |   0
 .../isis/viewer/wicket/ui/errors/JGrowlBehaviour.java       |   0
 .../org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java |   0
 .../isis/viewer/wicket/ui/errors/StackTraceDetail.java      |   0
 .../isis/viewer/wicket/ui/errors/StackTraceListView.java    |   0
 .../org/apache/isis/viewer/wicket/ui/errors/div-toggle.js   |   0
 .../isis/viewer/wicket/ui/errors/js/bootstrap-growl.js      |   0
 .../isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js  |   0
 .../wicket/ui/pages/BookmarkedPagesModelProvider.java       |   0
 .../ui/pages/BootstrapOverridesCssResourceReference.java    |   0
 .../viewer/wicket/ui/pages/EmailVerificationUrlService.java |   0
 .../apache/isis/viewer/wicket/ui/pages/PageAbstract.html    |   0
 .../apache/isis/viewer/wicket/ui/pages/PageAbstract.java    |   0
 .../isis/viewer/wicket/ui/pages/PageAbstract.properties     |   0
 .../apache/isis/viewer/wicket/ui/pages/PageClassList.java   |   0
 .../isis/viewer/wicket/ui/pages/PageClassRegistry.java      |   0
 .../viewer/wicket/ui/pages/PageClassRegistryAccessor.java   |   0
 .../isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java   |   0
 .../isis/viewer/wicket/ui/pages/PageNavigationService.java  |   0
 .../viewer/wicket/ui/pages/SidebarCssResourceReference.java |   0
 .../apache/isis/viewer/wicket/ui/pages/about/AboutPage.css  |   0
 .../apache/isis/viewer/wicket/ui/pages/about/AboutPage.html |   0
 .../apache/isis/viewer/wicket/ui/pages/about/AboutPage.java |   0
 .../wicket/ui/pages/accmngt/AccountConfirmationMap.java     |   0
 .../ui/pages/accmngt/AccountManagementPageAbstract.html     |   0
 .../ui/pages/accmngt/AccountManagementPageAbstract.java     |   0
 .../pages/accmngt/AccountManagementPageAbstract.properties  |   0
 .../wicket/ui/pages/accmngt/EmailAvailableValidator.java    |   0
 .../pages/accmngt/EmailVerificationUrlServiceDefault.java   |   0
 .../wicket/ui/pages/accmngt/UsernameAvailableValidator.java |   0
 .../accmngt/password_reset/PasswordResetEmailPanel.html     |   0
 .../accmngt/password_reset/PasswordResetEmailPanel.java     |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPage.css   |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPage.html  |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPage.java  |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPanel.html |   0
 .../ui/pages/accmngt/password_reset/PasswordResetPanel.java |   0
 .../wicket/ui/pages/accmngt/register/RegisterPage.css       |   0
 .../wicket/ui/pages/accmngt/register/RegisterPage.html      |   0
 .../wicket/ui/pages/accmngt/register/RegisterPage.java      |   0
 .../wicket/ui/pages/accmngt/register/RegisterPanel.html     |   0
 .../wicket/ui/pages/accmngt/register/RegisterPanel.java     |   0
 .../wicket/ui/pages/accmngt/signup/RegistrationFormPage.css |   0
 .../ui/pages/accmngt/signup/RegistrationFormPage.html       |   0
 .../ui/pages/accmngt/signup/RegistrationFormPage.java       |   0
 .../ui/pages/accmngt/signup/RegistrationFormPanel.html      |   0
 .../ui/pages/accmngt/signup/RegistrationFormPanel.java      |   0
 .../wicket/ui/pages/actionprompt/ActionPromptPage.css       |   0
 .../wicket/ui/pages/actionprompt/ActionPromptPage.html      |   0
 .../wicket/ui/pages/actionprompt/ActionPromptPage.java      |   0
 .../wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-darkly.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-flatly.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-journal.css  |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-lumen.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-paper.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-readable.css |   0
 .../wicket/ui/pages/bootstrap-overrides-sandstone.css       |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-simplex.css  |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-slate.css    |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css |   0
 .../wicket/ui/pages/bootstrap-overrides-superhero.css       |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-united.css   |   0
 .../viewer/wicket/ui/pages/bootstrap-overrides-yeti.css     |   0
 .../isis/viewer/wicket/ui/pages/bootstrap-overrides.css     |   0
 .../java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png | Bin
 .../isis/viewer/wicket/ui/pages/entity/EntityPage.css       |   0
 .../isis/viewer/wicket/ui/pages/entity/EntityPage.html      |   0
 .../isis/viewer/wicket/ui/pages/entity/EntityPage.java      |   0
 .../apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css  |   0
 .../apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html |   0
 .../apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java |   0
 .../apache/isis/viewer/wicket/ui/pages/home/HomePage.css    |   0
 .../apache/isis/viewer/wicket/ui/pages/home/HomePage.html   |   0
 .../apache/isis/viewer/wicket/ui/pages/home/HomePage.java   |   0
 .../isis/viewer/wicket/ui/pages/images/bg_header_brown.png  | Bin
 .../isis/viewer/wicket/ui/pages/images/icon_appuser.png     | Bin
 .../org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn  | Bin
 .../org/apache/isis/viewer/wicket/ui/pages/images/logo.png  | Bin
 .../ui/pages/isis-wicket-theme/images/animated-overlay.gif  | Bin
 .../isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png                  | Bin
 .../images/ui-bg_glass_55_40c0cb_1x400.png                  | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png                  | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png                  | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png                  | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png                  | Bin
 .../images/ui-bg_highlight-soft_75_20B5C2_1x100.png         | Bin
 .../isis-wicket-theme/images/ui-icons_00477F_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_2e83ff_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_454545_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_888888_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png    | Bin
 .../isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png    | Bin
 .../viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js     |   0
 .../apache/isis/viewer/wicket/ui/pages/jquery.livequery.js  |   0
 .../isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html  |   0
 .../isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java  |   0
 .../isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java |   0
 .../isis/viewer/wicket/ui/pages/login/WicketSignInPage.css  |   0
 .../isis/viewer/wicket/ui/pages/login/WicketSignInPage.html |   0
 .../isis/viewer/wicket/ui/pages/login/WicketSignInPage.java |   0
 .../wicket/ui/pages/login/WicketSignInPage.properties       |   0
 .../isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css   |   0
 .../isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html  |   0
 .../isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java  |   0
 .../apache/isis/viewer/wicket/ui/pages/simple-sidebar.css   |   0
 .../apache/isis/viewer/wicket/ui/pages/spinning-icon.gif    | Bin
 .../pages/standalonecollection/StandaloneCollectionPage.css |   0
 .../standalonecollection/StandaloneCollectionPage.html      |   0
 .../standalonecollection/StandaloneCollectionPage.java      |   0
 .../apache/isis/viewer/wicket/ui/pages/value/ValuePage.css  |   0
 .../apache/isis/viewer/wicket/ui/pages/value/ValuePage.html |   0
 .../apache/isis/viewer/wicket/ui/pages/value/ValuePage.java |   0
 .../viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css    |   0
 .../viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html   |   0
 .../viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java   |   0
 .../isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd  |   0
 .../apache/isis/viewer/wicket/ui/panels/FormAbstract.java   |   0
 .../isis/viewer/wicket/ui/panels/FormExecutorDefault.java   |   0
 .../isis/viewer/wicket/ui/panels/FormExecutorStrategy.java  |   0
 .../wicket/ui/panels/HasDynamicallyVisibleContent.java      |   0
 .../wicket/ui/panels/IFormSubmitterWithPreValidateHook.java |   0
 .../apache/isis/viewer/wicket/ui/panels/PanelAbstract.java  |   0
 .../org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java  |   0
 .../isis/viewer/wicket/ui/panels/PromptFormAbstract.java    |   0
 .../viewer/wicket/ui/panels/PromptFormPanelAbstract.java    |   0
 .../org/apache/isis/viewer/wicket/ui/util/Components.java   |   0
 .../apache/isis/viewer/wicket/ui/util/CssClassAppender.java |   0
 .../apache/isis/viewer/wicket/ui/util/CssClassRemover.java  |   0
 .../apache/isis/viewer/wicket/ui/util/CssIdAppender.java    |   0
 .../java/org/apache/isis/viewer/wicket/ui/util/Links.java   |   0
 .../org/apache/isis/viewer/wicket/ui/util/SSESupport.java   |   0
 .../org/apache/isis/viewer/wicket/ui/util/SSESupport.js     |   0
 .../org/apache/isis/viewer/wicket/ui/util/Tooltips.java     |   0
 .../org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css |   0
 .../ui}/src/main/resources/images/Default.png               | Bin
 .../viewer/wicket/ui/ComponentFactoryAbstractTest_init.java |   0
 .../isis/viewer/wicket/ui/ComponentType_ConstantsTest.java  |   0
 .../CollectionContentsSelectorDropdownPanelTest.java        |   0
 .../icontitle/EntityIconAndTitlePanelTest_abbreviated.java  |   0
 .../scalars/jdkdates/DateConverterForJavaSqlDateTest.java   |   0
 .../scalars/jdkdates/DateConverterForJavaUtilDateTest.java  |   0
 .../jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java |   0
 .../scalars/jodatime/DateConverterForJodaDateTimeTest.java  |   0
 .../scalars/jodatime/DateConverterForJodaLocalDateTest.java |   0
 .../jodatime/DateConverterForJodaLocalDateTimeTest.java     |   0
 .../jdk8time/DateConverterForJdk8LocalDateTest.java         |   0
 .../jdk8time/DateConverterForJdk8LocalDateTimeTest.java     |   0
 .../jdk8time/DateConverterForJdk8OffsetDateTimeTest.java    |   0
 .../scalars/uuid/UuidConverterTest_roundtrip.java           |   0
 .../ObjectAdapterMementoProviderForValueChoicesTest.java    |   0
 .../apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java |   0
 .../apache/isis/viewer/wicket/ui/fixtures/Customers.java    |   0
 .../isis/viewer/wicket/ui/pages/PageAbstractTest.java       |   0
 646 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8c5ea7e..d49fd09 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2474,9 +2474,9 @@
 		<module>viewer-restfulobjects/rendering</module>
 		<module>viewer-restfulobjects/server</module>
 
-		<module>viewer-wicket-model</module>
-		<module>viewer-wicket-ui</module>
-		<module>viewer-wicket-impl</module>
+		<module>viewer-wicket/model</module>
+		<module>viewer-wicket/ui</module>
+		<module>viewer-wicket/impl</module>
 
 		<module>plugins/codegen-bytebuddy</module>
 		<module>plugins/jaxrs-resteasy-4</module>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket/impl/pom.xml
similarity index 100%
rename from core/viewer-wicket-impl/pom.xml
rename to core/viewer-wicket/impl/pom.xml
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Experimental.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Experimental.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Experimental.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Experimental.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/EmailNotificationServiceWicket.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
similarity index 100%
rename from core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
rename to core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
diff --git a/core/viewer-wicket-impl/src/main/resources/log4j.properties b/core/viewer-wicket/impl/src/main/resources/log4j.properties
similarity index 100%
rename from core/viewer-wicket-impl/src/main/resources/log4j.properties
rename to core/viewer-wicket/impl/src/main/resources/log4j.properties
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java b/core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
similarity index 100%
rename from core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
rename to core/viewer-wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket/model/pom.xml
similarity index 100%
rename from core/viewer-wicket-model/pom.xml
rename to core/viewer-wicket/model/pom.xml
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnConcurrencyExceptionHandler.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnConcurrencyExceptionHandler.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnConcurrencyExceptionHandler.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnConcurrencyExceptionHandler.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/OnSelectionHandler.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/PageParametersUtils.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/HasUiHintDisambiguator.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisPropertyEditCompletedEvent.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisSelectorEvent.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintContainer.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettingsAccessor.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinksProvider.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento_Legacy.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionArgumentModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPrompt.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptWithExtraContent.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutor.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/InlinePromptContext.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ParentEntityModelProvider.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/Util.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
similarity index 100%
rename from core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
rename to core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
diff --git a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java b/core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java
similarity index 100%
rename from core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java
rename to core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ActionModelTest.java
diff --git a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
similarity index 100%
rename from core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
rename to core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
diff --git a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java b/core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
similarity index 100%
rename from core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
rename to core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
diff --git a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
similarity index 100%
rename from core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
rename to core/viewer-wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket/ui/pom.xml
similarity index 100%
rename from core/viewer-wicket-ui/pom.xml
rename to core/viewer-wicket/ui/pom.xml
diff --git a/core/viewer-wicket-ui/src/main/java/images/Images.java b/core/viewer-wicket/ui/src/main/java/images/Images.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/images/Images.java
rename to core/viewer-wicket/ui/src/main/java/images/Images.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/CollectionContentsAsFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistry.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistryAccessor.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestAttributes.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/div-toggle.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceAndAction.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionpromptsb/ActionPromptSidebar.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionFormExecutorStrategy.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.properties
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/images/clear_bookmarks.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/count/CollectionCountProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigation.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationLink.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigator.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsHiddenPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditImage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/CreditName.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/BS3GridPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/Util.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/RepeatingViewWithDynamicallyVisibleContent.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditForm.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.properties
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ComponentFactoryScalarAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverter.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateConverterPlugin.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/DateFormatSettings.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarModelSubscriber2.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehavior2.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/css/bootstrap-datetimepicker.min.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/bootstrap-datetimepicker.min.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/js/moment.min.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/wupb-progressBar.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/ResourceLinkVolatile.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8Abstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDate.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8LocalDateTime.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/DateConverterForJdk8OffsetDateTime.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDatePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8LocalDateTimePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdk8time/Jdk8OffsetDateTimePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDate.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDate.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScale.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalTextField.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTime.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDate.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTime.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponentFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_observing.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_observing.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_observing.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_observing.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ObservingComponent.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ObservingComponent.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ObservingComponent.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ObservingComponent.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidTextField.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2PanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/StandaloneTreePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/TreeThemeProviderDefault.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/IsisBootstrapTreeTheme.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/themes/bootstrap/theme.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModelProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactory.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/select2-bootstrap.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindow.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowForm.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceDetail.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/div-toggle.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/js/bootstrap-growl.min.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BookmarkedPagesModelProvider.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/EmailVerificationUrlService.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.properties
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistrySpi.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageNavigationService.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountConfirmationMap.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.properties
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/copy-26.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/error/ErrorPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/bg_header_brown.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/icon_appuser.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.pdn
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/images/logo.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/animated-overlay.gif
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_55_40c0cb_1x400.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-bg_highlight-soft_75_20B5C2_1x100.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_00477F_256x240.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_2e83ff_256x240.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_454545_256x240.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_888888_256x240.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_F0EFEA_256x240.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/isis-wicket-theme/images/ui-icons_cd0a0a_256x240.png
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketLogoutPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/spinning-icon.gif
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/wicket-xhtml1.4-strict.dtd
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorStrategy.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreValidateHook.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassRemover.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssIdAppender.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css
similarity index 100%
rename from core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css
rename to core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/isis-tooltips.css
diff --git a/core/viewer-wicket-ui/src/main/resources/images/Default.png b/core/viewer-wicket/ui/src/main/resources/images/Default.png
similarity index 100%
rename from core/viewer-wicket-ui/src/main/resources/images/Default.png
rename to core/viewer-wicket/ui/src/main/resources/images/Default.png
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterWithScaleTest_roundtrip.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverterTest_roundtrip.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java b/core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
similarity index 100%
rename from core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
rename to core/viewer-wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java


[isis] 02/13: ISIS-2062: ISIS-2062: moves viewer-restfulobjects-* into own subdir

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit df53c642ac031f2801799c32aace4362b1850878
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:03:07 2019 +0200

    ISIS-2062: ISIS-2062: moves viewer-restfulobjects-* into own subdir
    
    this is so will be able to move the ug-vro docs closer.
---
 core/pom.xml                                                        | 6 +++---
 .../applib}/pom.xml                                                 | 0
 .../isis/applib/services/acceptheader/AcceptHeaderService.java      | 0
 .../org/apache/isis/applib/services/acceptheader/package-info.java  | 0
 .../src/main/java/org/apache/isis/viewer/legacy/ClientExecutor.java | 0
 .../src/main/java/org/apache/isis/viewer/legacy/ClientRequest.java  | 0
 .../java/org/apache/isis/viewer/legacy/ClientRequestFactory.java    | 0
 .../src/main/java/org/apache/isis/viewer/legacy/RestEasyLegacy.java | 0
 .../isis/viewer/restfulobjects/applib/JsonRepresentation.java       | 0
 .../isis/viewer/restfulobjects/applib/LinkRepresentation.java       | 0
 .../main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java | 0
 .../org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java | 0
 .../isis/viewer/restfulobjects/applib/RepresentationType.java       | 0
 .../apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java | 0
 .../apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java  | 0
 .../isis/viewer/restfulobjects/applib/boot/BootstrapResource.java   | 0
 .../restfulobjects/applib/client/ClientRequestConfigurer.java       | 0
 .../viewer/restfulobjects/applib/client/RepresentationWalker.java   | 0
 .../isis/viewer/restfulobjects/applib/client/RestfulClient.java     | 0
 .../viewer/restfulobjects/applib/client/RestfulClientException.java | 0
 .../isis/viewer/restfulobjects/applib/client/RestfulRequest.java    | 0
 .../isis/viewer/restfulobjects/applib/client/RestfulResponse.java   | 0
 .../isis/viewer/restfulobjects/applib/client/UriBuilderPlugin.java  | 0
 .../applib/domainobjects/AbstractObjectMemberRepresentation.java    | 0
 .../applib/domainobjects/ActionResultRepresentation.java            | 0
 .../applib/domainobjects/DomainObjectMemberRepresentation.java      | 0
 .../applib/domainobjects/DomainObjectRepresentation.java            | 0
 .../restfulobjects/applib/domainobjects/DomainObjectResource.java   | 0
 .../restfulobjects/applib/domainobjects/DomainRepresentation.java   | 0
 .../restfulobjects/applib/domainobjects/DomainServiceResource.java  | 0
 .../restfulobjects/applib/domainobjects/ListRepresentation.java     | 0
 .../applib/domainobjects/ObjectActionRepresentation.java            | 0
 .../applib/domainobjects/ObjectCollectionRepresentation.java        | 0
 .../applib/domainobjects/ObjectPropertyRepresentation.java          | 0
 .../applib/domainobjects/ScalarValueRepresentation.java             | 0
 .../applib/domaintypes/AbstractTypeMemberRepresentation.java        | 0
 .../applib/domaintypes/ActionDescriptionRepresentation.java         | 0
 .../domaintypes/ActionParameterDescriptionRepresentation.java       | 0
 .../applib/domaintypes/CollectionDescriptionRepresentation.java     | 0
 .../restfulobjects/applib/domaintypes/DomainTypeRepresentation.java | 0
 .../restfulobjects/applib/domaintypes/DomainTypeResource.java       | 0
 .../applib/domaintypes/PropertyDescriptionRepresentation.java       | 0
 .../applib/domaintypes/TypeActionResultRepresentation.java          | 0
 .../restfulobjects/applib/domaintypes/TypeListRepresentation.java   | 0
 .../viewer/restfulobjects/applib/errors/ErrorRepresentation.java    | 0
 .../viewer/restfulobjects/applib/health/HealthRepresentation.java   | 0
 .../isis/viewer/restfulobjects/applib/health/HealthResource.java    | 0
 .../restfulobjects/applib/homepage/HomePageRepresentation.java      | 0
 .../viewer/restfulobjects/applib/homepage/HomePageResource.java     | 0
 .../viewer/restfulobjects/applib/menubars/MenuBarsResource.java     | 0
 .../isis/viewer/restfulobjects/applib/user/UserRepresentation.java  | 0
 .../apache/isis/viewer/restfulobjects/applib/user/UserResource.java | 0
 .../apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java   | 0
 .../isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java       | 0
 .../apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java   | 0
 .../org/apache/isis/viewer/restfulobjects/applib/util/Parser.java   | 0
 .../org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java | 0
 .../isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java    | 0
 .../viewer/restfulobjects/applib/version/VersionRepresentation.java | 0
 .../isis/viewer/restfulobjects/applib/version/VersionResource.java  | 0
 .../org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java   | 0
 .../applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java   | 0
 .../restfulobjects/applib/JsonRepresentationTest_asInputStream.java | 0
 .../restfulobjects/applib/JsonRepresentationTest_getArray.java      | 0
 .../restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java | 0
 .../restfulobjects/applib/JsonRepresentationTest_getBigInteger.java | 0
 .../restfulobjects/applib/JsonRepresentationTest_getBoolean.java    | 0
 .../restfulobjects/applib/JsonRepresentationTest_getDouble.java     | 0
 .../viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java | 0
 .../applib/JsonRepresentationTest_getLink_isLink.java               | 0
 .../restfulobjects/applib/JsonRepresentationTest_getLong.java       | 0
 .../applib/JsonRepresentationTest_getNull_isNull.java               | 0
 .../applib/JsonRepresentationTest_getRepresentation.java            | 0
 .../applib/JsonRepresentationTest_getString_isString.java           | 0
 .../applib/JsonRepresentationTest_isArray_isMap_isValue.java        | 0
 .../viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java | 0
 .../restfulobjects/applib/JsonRepresentationTest_newArray.java      | 0
 .../restfulobjects/applib/JsonRepresentationTest_newObject.java     | 0
 .../viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java | 0
 .../viewer/restfulobjects/applib/JsonRepresentationTest_size.java   | 0
 .../applib/JsonRepresentationTest_streamArrayElements.java          | 0
 .../applib/JsonRepresentationTest_streamMapEntries.java             | 0
 .../restfulobjects/applib/JsonRepresentationTest_urlEncoding.java   | 0
 .../viewer/restfulobjects/applib/LinkRepresentationTest_equals.java | 0
 .../apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java  | 0
 .../applib/RepresentationTypeTest_getMediaType_ContractTest.java    | 0
 .../applib/RepresentationTypeTest_getName_ContractTest.java         | 0
 .../applib/RepresentationTypeTest_lookup_ContractTest.java          | 0
 .../applib/RepresentationTypeTest_parser_ContractTest.java          | 0
 .../viewer/restfulobjects/applib/RestfulHttpMethodTest_setUp.java   | 0
 .../applib/client/RestfulRequest_DomainModelTest_parser.java        | 0
 .../RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java | 0
 .../RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java | 0
 .../applib/client/RestfulResponse_HeaderTest_Warning.java           | 0
 .../applib/client/RestfulResponse_HttpStatusCodeTest.java           | 0
 .../domainobjects/DomainObjectRepresentationTest_getCollection.java | 0
 .../DomainObjectRepresentationTest_getCollections.java              | 0
 .../domainobjects/DomainObjectRepresentationTest_getProperties.java | 0
 .../domainobjects/DomainObjectRepresentationTest_getProperty.java   | 0
 .../apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java  | 0
 .../applib/util/Parser_forCacheControl_ContractTest.java            | 0
 .../applib/util/Parser_forJaxRsMediaType_ContractTest.java          | 0
 .../restfulobjects/applib/util/PathNodeTest_equalsHashcode.java     | 0
 .../isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java  | 0
 .../isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java  | 0
 .../viewer/restfulobjects/applib/domainObjectRepresentation.json    | 0
 .../org/apache/isis/viewer/restfulobjects/applib/emptyList.json     | 0
 .../org/apache/isis/viewer/restfulobjects/applib/emptyMap.json      | 0
 .../org/apache/isis/viewer/restfulobjects/applib/list.json          | 0
 .../org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json | 0
 .../resources/org/apache/isis/viewer/restfulobjects/applib/map.json | 0
 .../org/apache/isis/viewer/restfulobjects/applib/servicesList.json  | 0
 .../rendering}/pom.xml                                              | 0
 .../org/apache/isis/viewer/restfulobjects/rendering/Caching.java    | 0
 .../isis/viewer/restfulobjects/rendering/ExceptionWithBody.java     | 0
 .../restfulobjects/rendering/ExceptionWithHttpStatusCode.java       | 0
 .../apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java    | 0
 .../isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java       | 0
 .../org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java   | 0
 .../isis/viewer/restfulobjects/rendering/RendererContext.java       | 0
 .../isis/viewer/restfulobjects/rendering/RendererFactory.java       | 0
 .../apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java   | 0
 .../isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java  | 0
 .../isis/viewer/restfulobjects/rendering/ReprRendererException.java | 0
 .../org/apache/isis/viewer/restfulobjects/rendering/Responses.java  | 0
 .../rendering/RestfulObjectsApplicationException.java               | 0
 .../isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java       | 0
 .../rendering/domainobjects/AbstractObjectMemberReprRenderer.java   | 0
 .../rendering/domainobjects/ActionResultReprRenderer.java           | 0
 .../viewer/restfulobjects/rendering/domainobjects/BodyArgs.java     | 0
 .../restfulobjects/rendering/domainobjects/CollectionSemantics.java | 0
 .../restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java  | 0
 .../rendering/domainobjects/DomainObjectReprRenderer.java           | 0
 .../restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java | 0
 .../viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java   | 0
 .../restfulobjects/rendering/domainobjects/JsonValueEncoder.java    | 0
 .../restfulobjects/rendering/domainobjects/ListReprRenderer.java    | 0
 .../restfulobjects/rendering/domainobjects/MemberReprMode.java      | 0
 .../viewer/restfulobjects/rendering/domainobjects/MemberType.java   | 0
 .../viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java  | 0
 .../rendering/domainobjects/ObjectActionReprRenderer.java           | 0
 .../restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java | 0
 .../restfulobjects/rendering/domainobjects/ObjectAndAction.java     | 0
 .../rendering/domainobjects/ObjectAndActionInvocation.java          | 0
 .../restfulobjects/rendering/domainobjects/ObjectAndCollection.java | 0
 .../rendering/domainobjects/ObjectAndCollection2.java               | 0
 .../restfulobjects/rendering/domainobjects/ObjectAndMember.java     | 0
 .../restfulobjects/rendering/domainobjects/ObjectAndProperty.java   | 0
 .../restfulobjects/rendering/domainobjects/ObjectAndProperty2.java  | 0
 .../rendering/domainobjects/ObjectCollectionReprRenderer.java       | 0
 .../rendering/domainobjects/ObjectPropertyReprRenderer.java         | 0
 .../viewer/restfulobjects/rendering/domainobjects/OidUtils.java     | 0
 .../rendering/domainobjects/ScalarValueReprRenderer.java            | 0
 .../rendering/domaintypes/AbstractTypeFeatureReprRenderer.java      | 0
 .../rendering/domaintypes/AbstractTypeMemberReprRenderer.java       | 0
 .../rendering/domaintypes/ActionDescriptionReprRenderer.java        | 0
 .../domaintypes/ActionParameterDescriptionReprRenderer.java         | 0
 .../rendering/domaintypes/CollectionDescriptionReprRenderer.java    | 0
 .../rendering/domaintypes/DomainTypeReprRenderer.java               | 0
 .../rendering/domaintypes/ObjectSpecAndSuperSpec.java               | 0
 .../restfulobjects/rendering/domaintypes/ParentSpecAndAction.java   | 0
 .../rendering/domaintypes/ParentSpecAndActionParam.java             | 0
 .../rendering/domaintypes/ParentSpecAndCollection.java              | 0
 .../restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java  | 0
 .../restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java | 0
 .../rendering/domaintypes/PropertyDescriptionReprRenderer.java      | 0
 .../rendering/domaintypes/TypeActionResultReprRenderer.java         | 0
 .../restfulobjects/rendering/domaintypes/TypeListReprRenderer.java  | 0
 .../restfulobjects/rendering/service/RepresentationService.java     | 0
 .../rendering/service/RepresentationServiceContentNegotiator.java   | 0
 .../rendering/service/acceptheader/AcceptHeaderServiceForRest.java  | 0
 .../rendering/service/conneg/ContentNegotiationService.java         | 0
 .../rendering/service/conneg/ContentNegotiationServiceAbstract.java | 0
 .../conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java      | 0
 .../service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java    | 0
 .../service/conneg/ContentNegotiationServiceXRoDomainType.java      | 0
 .../isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java   | 0
 .../isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java   | 0
 .../apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java | 0
 .../apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java  | 0
 .../org/apache/isis/viewer/restfulobjects/rendering/util/Util.java  | 0
 .../viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java | 0
 .../domainobjects/JsonValueEncoderTest_appendValueAndFormat.java    | 0
 .../rendering/domainobjects/JsonValueEncoderTest_asAdapter.java     | 0
 .../rendering/domainobjects/JsonValueEncoderTest_asObject.java      | 0
 .../isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java     | 0
 .../server}/pom.xml                                                 | 0
 .../isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java       | 0
 .../isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java | 0
 .../apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java  | 0
 .../isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java | 0
 .../isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java    | 0
 .../apache/isis/viewer/restfulobjects/server/ResourceContext.java   | 0
 .../viewer/restfulobjects/server/RestfulObjectsApplication.java     | 0
 .../restfulobjects/server/RestfulObjectsApplicationException.java   | 0
 .../restfulobjects/server/mappers/ExceptionMapperAbstract.java      | 0
 .../server/mappers/ExceptionMapperForObjectNotFound.java            | 0
 .../server/mappers/ExceptionMapperForRestfulObjectsApplication.java | 0
 .../server/mappers/ExceptionMapperForRuntimeException.java          | 0
 .../restfulobjects/server/mappers/entity/ExceptionDetail.java       | 0
 .../viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java  | 0
 .../viewer/restfulobjects/server/mappers/entity/package-info.java   | 0
 .../server/resources/DomainObjectResourceServerside.java            | 0
 .../restfulobjects/server/resources/DomainResourceHelper.java       | 0
 .../server/resources/DomainServiceResourceServerside.java           | 0
 .../server/resources/DomainServicesListReprRenderer.java            | 0
 .../server/resources/DomainTypeResourceServerside.java              | 0
 .../viewer/restfulobjects/server/resources/HealthReprRenderer.java  | 0
 .../restfulobjects/server/resources/HealthResourceServerside.java   | 0
 .../restfulobjects/server/resources/HomePageReprRenderer.java       | 0
 .../restfulobjects/server/resources/HomePageResourceServerside.java | 0
 .../restfulobjects/server/resources/ImageResourceServerside.java    | 0
 .../viewer/restfulobjects/server/resources/JsonParserHelper.java    | 0
 .../restfulobjects/server/resources/MenuBarsResourceServerside.java | 0
 .../restfulobjects/server/resources/ObjectActionArgHelper.java      | 0
 .../restfulobjects/server/resources/ObjectAdapterAccessHelper.java  | 0
 .../restfulobjects/server/resources/ObjectAdapterUpdateHelper.java  | 0
 .../viewer/restfulobjects/server/resources/ResourceAbstract.java    | 0
 .../viewer/restfulobjects/server/resources/SwaggerSpecResource.java | 0
 .../viewer/restfulobjects/server/resources/UserReprRenderer.java    | 0
 .../restfulobjects/server/resources/UserResourceServerside.java     | 0
 .../viewer/restfulobjects/server/resources/VersionReprRenderer.java | 0
 .../restfulobjects/server/resources/VersionResourceServerside.java  | 0
 .../server/resources/serialization/SerializationStrategy.java       | 0
 .../isis/viewer/restfulobjects/server/util/UrlParserUtils.java      | 0
 .../server/webapp/IsisTransactionFilterForRestfulObjects.java       | 0
 .../IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java        | 0
 .../viewer/restfulobjects/server/ResourceContextTest_getArg.java    | 0
 .../restfulobjects/server/ResourceContextTest_stripQuotes.java      | 0
 .../ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java  | 0
 .../RestfulObjectsApplicationExceptionMapper_Test_Contract.java     | 0
 .../server/resources/DomainResourceHelperTest_readBodyAsMap.java    | 0
 .../viewer/restfulobjects/server/resources/JsonParserHelpTest.java  | 0
 .../isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java  | 0
 234 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 5adb9d4..8c5ea7e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2470,9 +2470,9 @@
 		<module>testsupport/unittestsupport</module>
 		<module>testsupport/integtestsupport</module>
 
-		<module>viewer-restfulobjects-applib</module>
-		<module>viewer-restfulobjects-rendering</module>
-		<module>viewer-restfulobjects-server</module>
+		<module>viewer-restfulobjects/applib</module>
+		<module>viewer-restfulobjects/rendering</module>
+		<module>viewer-restfulobjects/server</module>
 
 		<module>viewer-wicket-model</module>
 		<module>viewer-wicket-ui</module>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects/applib/pom.xml
similarity index 100%
rename from core/viewer-restfulobjects-applib/pom.xml
rename to core/viewer-restfulobjects/applib/pom.xml
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/ClientExecutor.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/ClientExecutor.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/ClientExecutor.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/ClientExecutor.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequest.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequest.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequest.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequestFactory.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequestFactory.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequestFactory.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/ClientRequestFactory.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/RestEasyLegacy.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/RestEasyLegacy.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/legacy/RestEasyLegacy.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/legacy/RestEasyLegacy.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RelDefinition.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/ClientRequestConfigurer.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/ClientRequestConfigurer.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/ClientRequestConfigurer.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/ClientRequestConfigurer.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClientException.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClientException.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClientException.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClientException.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/UriBuilderPlugin.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/UriBuilderPlugin.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/UriBuilderPlugin.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/UriBuilderPlugin.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/health/HealthResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/menubars/MenuBarsResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserResource.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/MediaTypes.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNode.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java b/core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java
rename to core/viewer-restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionResource.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_streamMapEntries.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getMediaType_ContractTest.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_getName_ContractTest.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_lookup_ContractTest.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationTypeTest_parser_ContractTest.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethodTest_setUp.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethodTest_setUp.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethodTest_setUp.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethodTest_setUp.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_Test.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forCacheControl_ContractTest.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/Parser_forJaxRsMediaType_ContractTest.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java b/core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java
rename to core/viewer-restfulobjects/applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/PathNodeTest_split.java
diff --git a/core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json b/core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json
rename to core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/domainObjectRepresentation.json
diff --git a/core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json b/core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json
rename to core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyList.json
diff --git a/core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json b/core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json
rename to core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/emptyMap.json
diff --git a/core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json b/core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json
rename to core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/list.json
diff --git a/core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json b/core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json
rename to core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/listOfStrings.json
diff --git a/core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json b/core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json
rename to core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/map.json
diff --git a/core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json b/core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json
similarity index 100%
rename from core/viewer-restfulobjects-applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json
rename to core/viewer-restfulobjects/applib/src/test/resources/org/apache/isis/viewer/restfulobjects/applib/servicesList.json
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects/rendering/pom.xml
similarity index 100%
rename from core/viewer-restfulobjects-rendering/pom.xml
rename to core/viewer-restfulobjects/rendering/pom.xml
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Caching.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithBody.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ExceptionWithHttpStatusCode.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkBuilder.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecs.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererFactory.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererException.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RestfulObjectsApplicationException.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/BodyArgs.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/CollectionSemantics.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ListReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberReprMode.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MutatorSpec.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAdapterLinkTo.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndAction.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndActionInvocation.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndCollection2.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndMember.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectAndProperty2.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeFeatureReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/AbstractTypeMemberReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionDescriptionReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/CollectionDescriptionReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ObjectSpecAndSuperSpec.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndAction.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndActionParam.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndCollection.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndFeature.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ParentSpecAndProperty.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeActionResultReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/TypeListReprRenderer.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/FollowSpecUtil.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/ListUtils.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtils.java
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
rename to core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java b/core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
rename to core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
rename to core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
rename to core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java b/core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
rename to core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java b/core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java
similarity index 100%
rename from core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java
rename to core/viewer-restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/util/MapUtilsTest.java
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects/server/pom.xml
similarity index 100%
rename from core/viewer-restfulobjects-server/pom.xml
rename to core/viewer-restfulobjects/server/pom.xml
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplicationException.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplicationException.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplicationException.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplicationException.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
rename to core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java b/core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java
similarity index 100%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java
rename to core/viewer-restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java


[isis] 01/13: ISIS-2062: moves unittestsupport and integtestsupport into subdirectory

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d266d5ab504204ae3b3b37f9ccc52c1305a0c694
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:00:10 2019 +0200

    ISIS-2062: moves unittestsupport and integtestsupport into subdirectory
    
    this is so will be able to move the ug-tst docs closer.
---
 core/pom.xml                                                          | 4 ++--
 core/{ => testsupport}/integtestsupport/pom.xml                       | 0
 .../apache/isis/integtestsupport/ExceptionRecognizerTranslate.java    | 0
 .../org/apache/isis/integtestsupport/IsisIntegrationTestAbstact.java  | 0
 .../main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java | 0
 .../isis/integtestsupport/components/AuthenticationManagerNull.java   | 0
 .../integtestsupport/components/AuthorizationManagerAllowAll.java     | 0
 .../apache/isis/integtestsupport/validate/ValidateDomainModel.java    | 0
 .../src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java   | 0
 .../src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java    | 0
 .../src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java   | 0
 .../src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java        | 0
 .../src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java | 0
 .../isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java  | 0
 .../mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java     | 0
 core/{ => testsupport}/integtestsupport/test.data                     | 0
 core/{ => testsupport}/unittestsupport/.gitignore                     | 0
 core/{ => testsupport}/unittestsupport/pom.xml                        | 0
 .../apache/isis/unittestsupport/AbstractApplyToAllContractTest.java   | 0
 .../bidir/BidirectionalRelationshipContractTestAbstract.java          | 0
 .../src/main/java/org/apache/isis/unittestsupport/bidir/Child.java    | 0
 .../main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java | 0
 .../java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java   | 0
 .../org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java     | 0
 .../java/org/apache/isis/unittestsupport/bidir/Instantiators.java     | 0
 .../src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java   | 0
 .../unittestsupport/comparable/ComparableContractTest_compareTo.java  | 0
 .../isis/unittestsupport/comparable/ComparableContractTester.java     | 0
 .../src/main/java/org/apache/isis/unittestsupport/files/Files.java    | 0
 .../inject/InjectServiceMethodMustBeFinalContractTestAbstract.java    | 0
 .../main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java  | 0
 .../isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java | 0
 .../java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java  | 0
 .../apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java   | 0
 .../java/org/apache/isis/unittestsupport/jmocking/IsisActions.java    | 0
 .../java/org/apache/isis/unittestsupport/jmocking/JMockActions.java   | 0
 .../org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java   | 0
 .../java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java   | 0
 .../org/apache/isis/unittestsupport/jmocking/PostponedAction.java     | 0
 .../java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java | 0
 .../main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java  | 0
 .../apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java  | 0
 .../java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java   | 0
 .../unittestsupport/sortedsets/SortedSetsContractTestAbstract.java    | 0
 .../java/org/apache/isis/unittestsupport/streams/NullPrintStream.java | 0
 .../main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java | 0
 .../java/org/apache/isis/unittestsupport/utils/IndentPrinter.java     | 0
 .../main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java | 0
 .../main/java/org/apache/isis/unittestsupport/utils/StringUtils.java  | 0
 .../isis/unittestsupport/value/ValueTypeContractTestAbstract.java     | 0
 50 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 6d6d248..5adb9d4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2467,8 +2467,8 @@
 
 		<module>security</module>
 
-		<module>unittestsupport</module>
-		<module>integtestsupport</module>
+		<module>testsupport/unittestsupport</module>
+		<module>testsupport/integtestsupport</module>
 
 		<module>viewer-restfulobjects-applib</module>
 		<module>viewer-restfulobjects-rendering</module>
diff --git a/core/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
similarity index 100%
rename from core/integtestsupport/pom.xml
rename to core/testsupport/integtestsupport/pom.xml
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstact.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstact.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstact.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstact.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
similarity index 100%
rename from core/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
rename to core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
diff --git a/core/integtestsupport/test.data b/core/testsupport/integtestsupport/test.data
similarity index 100%
rename from core/integtestsupport/test.data
rename to core/testsupport/integtestsupport/test.data
diff --git a/core/unittestsupport/.gitignore b/core/testsupport/unittestsupport/.gitignore
similarity index 100%
rename from core/unittestsupport/.gitignore
rename to core/testsupport/unittestsupport/.gitignore
diff --git a/core/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
similarity index 100%
rename from core/unittestsupport/pom.xml
rename to core/testsupport/unittestsupport/pom.xml
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java b/core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
similarity index 100%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
rename to core/testsupport/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java


[isis] 10/13: ISIS-2062: moves ug-sec alongside code, and renames to just 'Security" (and changes ug-sec to security)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 30a7024590476bd44fe843e7e3c6bdbaa554dcf7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:25:46 2019 +0200

    ISIS-2062: moves ug-sec alongside code, and renames to just 'Security" (and changes ug-sec to security)
---
 antora/components/rg/modules/ROOT/pages/about.adoc          |   2 +-
 antora/components/rg/modules/cfg/pages/about.adoc           |   2 +-
 .../rg/modules/cfg/pages/specifying-components.adoc         |   2 +-
 .../cms/pages/classes/AppManifest-bootstrapping.adoc        |   4 ++--
 .../rg/modules/svc/pages/core-domain-api/UserService.adoc   |   2 +-
 .../rg/modules/svc/pages/testing/SudoService.adoc           |   4 ++--
 antora/components/support/modules/ROOT/pages/about.adoc     |   2 +-
 .../support/modules/dg/pages/asciidoc-templates.adoc        |   6 +++---
 .../components/support/modules/dg/pages/hints-and-tips.adoc |   2 +-
 antora/components/toc/modules/ROOT/nav.adoc                 |   2 +-
 antora/components/toc/modules/ROOT/pages/about.adoc         |   2 +-
 antora/components/ug/modules/ROOT/pages/about.adoc          |   2 +-
 .../btb/pages/deployment/externalized-configuration.adoc    |   2 +-
 antora/components/ug/modules/btb/pages/hints-and-tips.adoc  |   2 +-
 antora/components/ug/modules/btb/pages/web-xml.adoc         |   2 +-
 .../jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc        |   2 +-
 .../components/ug-sec => core/security/_adoc}/antora.yml    |   4 ++--
 .../components/ug-sec => core/security/_adoc}/examples.csv  |   0
 .../security/_adoc}/modules/ROOT/_attributes.adoc           |   0
 .../_adoc/modules/ROOT/assets/attachments}/.gitkeep         |   0
 .../configuring-shiro/ldap/activeds-ldap-groups.png         | Bin
 .../configuring-shiro/ldap/activeds-ldap-mojo-partition.png | Bin
 .../configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png  | Bin
 .../ldap/activeds-ldap-sasl-authentication.png              | Bin
 .../configuring-shiro/ldap/activeds-ldap-users.png          | Bin
 .../security-apis-impl/configure-isis-to-use-bypass.PNG     | Bin
 .../security-apis-impl/configure-isis-to-use-shiro.png      | Bin
 .../configure-shiro-to-use-custom-jdbc-realm.png            | Bin
 .../security-apis-impl/configure-shiro-to-use-ini-realm.PNG | Bin
 .../configure-shiro-to-use-isis-ldap-realm.PNG              | Bin
 ...isisaddons-security-module-realm-with-delegate-realm.PNG | Bin
 ...figure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
 .../security/security-apis-impl/security-apis-impl.pptx     | Bin
 .../security/_adoc/modules/ROOT/examples}/.gitkeep          |   0
 .../ug-sec => core/security/_adoc}/modules/ROOT/nav.adoc    |   0
 .../security/_adoc}/modules/ROOT/pages/_attributes.adoc     |   0
 .../_adoc/modules/ROOT/pages/_partials}/_attributes.adoc    |   0
 .../security/_adoc}/modules/ROOT/pages/about.adoc           |   0
 .../_adoc}/modules/ROOT/pages/api-for-applications.adoc     |   0
 .../modules/ROOT/pages/configuring-isis-to-use-shiro.adoc   |   0
 .../security/_adoc}/modules/ROOT/pages/hints-and-tips.adoc  |   2 +-
 .../modules/ROOT/pages/hints-and-tips/_attributes.adoc      |   0
 .../hints-and-tips/configuring-isis-to-use-bypass.adoc      |   0
 .../_adoc}/modules/ROOT/pages/hints-and-tips/run-as.adoc    |   0
 .../modules/ROOT/pages/hints-and-tips/shiro-caching.adoc    |   0
 .../ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc |   2 +-
 .../modules/ROOT/pages/shiro-realm-implementations.adoc     |   0
 .../pages/shiro-realm-implementations}/_attributes.adoc     |   0
 .../ROOT/pages/shiro-realm-implementations/ini-realm.adoc   |   2 +-
 .../pages/shiro-realm-implementations/isis-ldap-realm.adoc  |   0
 .../isisaddons-security-module-realm.adoc                   |   0
 .../ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc  |   0
 .../_adoc}/modules/ROOT/pages/usage-by-isis-viewers.adoc    |   0
 .../ug-sec => core/security/_adoc}/sync_examples.sh         |   0
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc            |   2 +-
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc            |   2 +-
 .../apps/helloworld/_adoc/modules/ROOT/pages/about.adoc     |   2 +-
 site.yml                                                    |   2 +-
 58 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/antora/components/rg/modules/ROOT/pages/about.adoc b/antora/components/rg/modules/ROOT/pages/about.adoc
index 5acbc0e..bdba252 100644
--- a/antora/components/rg/modules/ROOT/pages/about.adoc
+++ b/antora/components/rg/modules/ROOT/pages/about.adoc
@@ -9,7 +9,7 @@ The user guides available are:
 * xref:vw:ROOT:about.adoc[Wicket viewer]
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:odn:ROOT:about.adoc[DataNucleus object store]
-* xref:ug:sec:about.adoc[Security] (this guide)
+* xref:security:ROOT::about.adoc[Security] (this guide)
 * xref:ug:tst:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
 
diff --git a/antora/components/rg/modules/cfg/pages/about.adoc b/antora/components/rg/modules/cfg/pages/about.adoc
index 5e2cf9e..961d7b5 100644
--- a/antora/components/rg/modules/cfg/pages/about.adoc
+++ b/antora/components/rg/modules/cfg/pages/about.adoc
@@ -11,7 +11,7 @@ This guide describes how to configure an Apache Isis application.
 This guide covers only the core configuration properties (relating to Apache Isis' metamodel and runtime management).
 Configuration properties for the viewers can be found in the xref:vw:ROOT:about.adoc[Wicket Viewer] guide and the xref:vro:ROOT::about.adoc[RestfulObjects viewer] guide.
 Likewise details of configuring security (Apache Shiro) can be
-found in the xref:ug:sec:about.adoc#[Security] guide, and details for configuring the DataNucleus Object Store can be found in the xref:odn:ROOT:about.adoc#[DataNucleus] guide.
+found in the xref:security:ROOT::about.adoc#[Security] guide, and details for configuring the DataNucleus Object Store can be found in the xref:odn:ROOT:about.adoc#[DataNucleus] guide.
 ====
 
 [TIP]
diff --git a/antora/components/rg/modules/cfg/pages/specifying-components.adoc b/antora/components/rg/modules/cfg/pages/specifying-components.adoc
index e8c5052..179095a 100644
--- a/antora/components/rg/modules/cfg/pages/specifying-components.adoc
+++ b/antora/components/rg/modules/cfg/pages/specifying-components.adoc
@@ -50,7 +50,7 @@ public interface AppManifest {
 
 These can return either:
 
-    * "shiro" - enable integration with Apache Shiro, as described in the xref:ug:sec:about.adoc[security] user guide
+    * "shiro" - enable integration with Apache Shiro, as described in the xref:security:ROOT::about.adoc[security] user guide
     * "bypass" - bypass security (in effect, configure a no-op implementation that allows everything).
 
 Note that these are actually aliases for concrete implementations.
diff --git a/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc b/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
index d4fcc95..ebf9458 100644
--- a/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
@@ -117,7 +117,7 @@ If non-`null`, this method specifies the authentication mechanism to use.
 The valid values are currently `"shiro"`  or `"bypass"`.
 If null is returned then the value of the `isis.authentication` configuration property (in `isis.properties` file) is used instead.
 
-See the xref:ug:sec:about.adoc[security guide] for further details on configuring shiro or bypass security.
+See the xref:security:ROOT::about.adoc[security guide] for further details on configuring shiro or bypass security.
 
 [NOTE]
 ====
@@ -132,7 +132,7 @@ If non-`null`, this method specifies the authorization mechanism to use.
 The valid values are currently `"shiro"`  or `"bypass"`.
 If null is returned then the value of the `isis.authorization` configuration property (in `isis.properties` file) is used instead.
 
-See the xref:ug:sec:about.adoc[security guide] for further details on configuring shiro or bypass security.
+See the xref:security:ROOT::about.adoc[security guide] for further details on configuring shiro or bypass security.
 
 [NOTE]
 ====
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc b/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
index 07e6eb5..1615431 100644
--- a/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
+++ b/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
@@ -47,7 +47,7 @@ public final class RoleMemento {
 }
 ----
 
-The roles associated with the `UserMemento` will be based on the configured xref:ug:sec:about.adoc[security] (typically Shiro).
+The roles associated with the `UserMemento` will be based on the configured xref:security:ROOT::about.adoc[security] (typically Shiro).
 
 In addition, when using the xref:vw:ROOT:about.adoc[Wicket viewer] there will be an additional "org.apache.isis.viewer.wicket.roles.USER" role; this is used internally to restrict access to web pages without authenticating.
 
diff --git a/antora/components/rg/modules/svc/pages/testing/SudoService.adoc b/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
index 7d8f106..8151039 100644
--- a/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
+++ b/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
@@ -34,7 +34,7 @@ The current user/role reported by the internal xref:rg:fis:application-layer/Aut
 
 [IMPORTANT]
 ====
-Note however that this the "effective user" does not propagate through to the xref:ug:sec:about.adoc[Shiro security mechanism], which will continue to be evaluated according to the permissions of the current user.
+Note however that this the "effective user" does not propagate through to the xref:security:ROOT::about.adoc[Shiro security mechanism], which will continue to be evaluated according to the permissions of the current user.
 See the xref:rg:svc:testing/SudoService.adoc#ACCESS-ALL-ROLE[`ACCESS-ALL-ROLE`] below for details of how to circumvent this.
 ====
 
@@ -67,7 +67,7 @@ protected void execute(final ExecutionContext ec) {
 
 === ACCESS_ALL_ROLE
 
-When `sudo(...)` is called the "effective user" is reported by both xref:rg:svc:core-domain-api/UserService.adoc[`UserService`] and by xref:rg:fis:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`], but does not propagate through to the xref:ug:sec:about.adoc[Shiro security mechanism].
+When `sudo(...)` is called the "effective user" is reported by both xref:rg:svc:core-domain-api/UserService.adoc[`UserService`] and by xref:rg:fis:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`], but does not propagate through to the xref:security:ROOT::about.adoc[Shiro security mechanism].
 These continue to be evaluated according to the permissions of the current user.
 
 This can be a problem in certain use cases.
diff --git a/antora/components/support/modules/ROOT/pages/about.adoc b/antora/components/support/modules/ROOT/pages/about.adoc
index 501b66f..6ebfd79 100644
--- a/antora/components/support/modules/ROOT/pages/about.adoc
+++ b/antora/components/support/modules/ROOT/pages/about.adoc
@@ -9,7 +9,7 @@ The user guides available are:
 * xref:vw:ROOT:about.adoc[Wicket viewer]
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:odn:ROOT:about.adoc[DataNucleus object store]
-* xref:ug:sec:about.adoc[Security]
+* xref:security:ROOT::about.adoc[Security]
 * xref:ug:tst:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
 
diff --git a/antora/components/support/modules/dg/pages/asciidoc-templates.adoc b/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
index dbcb2d2..dc925ff 100644
--- a/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
+++ b/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
@@ -338,7 +338,7 @@ include::_attributes.adoc[]
 //
 //
 //|`adugsec`
-//|`\xref:ug:sec:about.adoc#xxx[ttt]`
+//|`\xref:security:ROOT::about.adoc#xxx[ttt]`
 //
 //A hyperlink to a bookmark within the Secrurity guide, where:
 //
@@ -347,9 +347,9 @@ include::_attributes.adoc[]
 //
 //for example:
 //
-//`\xref:ug:sec:hints-and-tips/shiro-caching.adoc[Caching and other Shiro Features]`
+//`\xref:security:ROOT::hints-and-tips/shiro-caching.adoc[Caching and other Shiro Features]`
 //
-//|xref:ug:sec:hints-and-tips/shiro-caching.adoc[Caching and other Shiro Features]
+//|xref:security:ROOT::hints-and-tips/shiro-caching.adoc[Caching and other Shiro Features]
 //
 //
 //|`adugtst`
diff --git a/antora/components/support/modules/dg/pages/hints-and-tips.adoc b/antora/components/support/modules/dg/pages/hints-and-tips.adoc
index 552862d..b7e9948 100644
--- a/antora/components/support/modules/dg/pages/hints-and-tips.adoc
+++ b/antora/components/support/modules/dg/pages/hints-and-tips.adoc
@@ -16,7 +16,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
-* the xref:ug:sec:hints-and-tips.adoc[Security] guide
+* the xref:security:ROOT::hints-and-tips.adoc[Security] guide
 
 * the xref:ug:btb:hints-and-tips.adoc[Beyond the Basics] guide.
 
diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index 058901a..0445c78 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -23,7 +23,7 @@
 **  xref:vw:ROOT:about.adoc[Wicket Viewer]
 **  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
 **  xref:odn:ROOT:about.adoc[DataNucleus Object Store]
-**  xref:ug:sec:about.adoc[Security]
+**  xref:security:ROOT::about.adoc[Security]
 ** *xref:ug:tst:about.adoc[Testing]*
 **  xref:ug:btb:about.adoc[Beyond the Basics]
 
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 61472d4..4df0f89 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -42,7 +42,7 @@ include::_attributes.adoc[]
 *  xref:vw:ROOT:about.adoc[Wicket Viewer]
 *  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
 *  xref:odn:ROOT:about.adoc[DataNucleus Object Store]
-*  xref:ug:sec:about.adoc[Security]
+*  xref:security:ROOT::about.adoc[Security]
 * *xref:ug:tst:about.adoc[Testing]*
 *  xref:ug:btb:about.adoc[Beyond the Basics]
 
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/antora/components/ug/modules/ROOT/pages/about.adoc
index 95cf7f4..7a64e3b 100644
--- a/antora/components/ug/modules/ROOT/pages/about.adoc
+++ b/antora/components/ug/modules/ROOT/pages/about.adoc
@@ -9,7 +9,7 @@ The user guides available are:
 * xref:vw:ROOT::about.adoc[Wicket viewer]
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:odn:ROOT:about.adoc[DataNucleus object store]
-* xref:ug-sec:ROOT:about.adoc[Security]
+* xref:security:ROOT::about.adoc[Security]
 * xref:ug-tst:ROOT:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
 
diff --git a/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc b/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
index a06a99e..9bb9df0 100644
--- a/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
+++ b/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
@@ -73,7 +73,7 @@ Note that running the app using Apache Isis' `org.apache.isis.WebServer` bootstr
 
 == Shiro Config
 
-If using Apache Isis' xref:ug-sec:ROOT:configuring-isis-to-use-shiro.adoc[Shiro integration] for authentication and/or authorization, note that it reads from the `shiro.ini` configuration file.
+If using Apache Isis' xref:security:ROOT::configuring-isis-to-use-shiro.adoc[Shiro integration] for authentication and/or authorization, note that it reads from the `shiro.ini` configuration file.
 By default this also resides in `WEB-INF`.
 
 Similar to Apache Isis, Shiro lets this configuration directory be altered, by specifying the `shiroConfigLocations` context parameter.
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
index f1a69a3..0938266 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
@@ -16,7 +16,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
-* the xref:ug-sec:ROOT:hints-and-tips.adoc[Security] guide
+* the xref:security:ROOT::hints-and-tips.adoc[Security] guide
 
 * the xref:ug:btb:hints-and-tips.adoc[Beyond the Basics] guide (this chapter).
 
diff --git a/antora/components/ug/modules/btb/pages/web-xml.adoc b/antora/components/ug/modules/btb/pages/web-xml.adoc
index 7472870..4863af8 100644
--- a/antora/components/ug/modules/btb/pages/web-xml.adoc
+++ b/antora/components/ug/modules/btb/pages/web-xml.adoc
@@ -11,7 +11,7 @@ You can deploy both of these concurrently, or deploy just the Wicket viewer, or
 The configuration in `web.xml` varies accordingly, both in terms of the servlet context listeners, filters and servlets.
 
 If you are using Apache Isis' integration with Apache Shiro (for security) then this also needs configuring in `web.xml`.
-See the xref:ug-sec:ROOT:configuring-isis-to-use-shiro.adoc[security chapter] for full details on this topic.
+See the xref:security:ROOT::configuring-isis-to-use-shiro.adoc[security chapter] for full details on this topic.
 
 The servlets and filters are mapped to three main pipelines:
 
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index 157e479..232efca 100644
--- a/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -15,7 +15,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide (this chapter)
 
-* the xref:ug:sec:hints-and-tips.adoc[Security] guide
+* the xref:security:ROOT::hints-and-tips.adoc[Security] guide
 
 * the xref:ug:btb:hints-and-tips.adoc[Beyond the Basics] guide.
 
diff --git a/antora/components/ug-sec/antora.yml b/core/security/_adoc/antora.yml
similarity index 61%
rename from antora/components/ug-sec/antora.yml
rename to core/security/_adoc/antora.yml
index 60cc206..da72999 100644
--- a/antora/components/ug-sec/antora.yml
+++ b/core/security/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: ug-sec
-title: "User Guides - Security"
+name: security
+title: "Security"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/ug-sec/examples.csv b/core/security/_adoc/examples.csv
similarity index 100%
rename from antora/components/ug-sec/examples.csv
rename to core/security/_adoc/examples.csv
diff --git a/antora/components/ug-sec/modules/ROOT/_attributes.adoc b/core/security/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/_attributes.adoc
rename to core/security/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/examples/.gitkeep b/core/security/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/examples/.gitkeep
rename to core/security/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to core/security/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx b/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx
rename to core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx
diff --git a/antora/components/ug-sec/modules/ROOT/assets/attachments/.gitkeep b/core/security/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/assets/attachments/.gitkeep
rename to core/security/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ug-sec/modules/ROOT/nav.adoc b/core/security/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/nav.adoc
rename to core/security/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/_attributes.adoc b/core/security/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/_attributes.adoc
rename to core/security/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc b/core/security/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc
rename to core/security/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/about.adoc b/core/security/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/about.adoc
rename to core/security/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/api-for-applications.adoc b/core/security/_adoc/modules/ROOT/pages/api-for-applications.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/api-for-applications.adoc
rename to core/security/_adoc/modules/ROOT/pages/api-for-applications.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc b/core/security/_adoc/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
rename to core/security/_adoc/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc b/core/security/_adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 94%
rename from antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
rename to core/security/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index fed9421..28143f7 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/security/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -17,7 +17,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
-* the xref:ug:sec:hints-and-tips.adoc[Security] guide (this chapter)
+* the xref:security:ROOT::hints-and-tips.adoc[Security] guide (this chapter)
 
 * the xref:ug:btb:hints-and-tips.adoc[Beyond the Basics] guide.
 
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/_attributes.adoc b/core/security/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/_attributes.adoc
rename to core/security/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/configuring-isis-to-use-bypass.adoc b/core/security/_adoc/modules/ROOT/pages/hints-and-tips/configuring-isis-to-use-bypass.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/configuring-isis-to-use-bypass.adoc
rename to core/security/_adoc/modules/ROOT/pages/hints-and-tips/configuring-isis-to-use-bypass.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/run-as.adoc b/core/security/_adoc/modules/ROOT/pages/hints-and-tips/run-as.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/run-as.adoc
rename to core/security/_adoc/modules/ROOT/pages/hints-and-tips/run-as.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/shiro-caching.adoc b/core/security/_adoc/modules/ROOT/pages/hints-and-tips/shiro-caching.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/hints-and-tips/shiro-caching.adoc
rename to core/security/_adoc/modules/ROOT/pages/hints-and-tips/shiro-caching.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc b/core/security/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
similarity index 88%
rename from antora/components/ug-sec/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
rename to core/security/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
index cb553c1..16310f4 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
+++ b/core/security/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-If using the text-based xref:ug:sec:shiro-realm-implementations/ini-realm.adoc[`IniRealm`] or xref:ug:sec:shiro-realm-implementations/isis-ldap-realm.adoc[Isis' LDAP realm], then note that Shiro also allows the string representation of the permissions to be mapped (resolved) to alternative `Permission` instances.  Apache Isis provides its own `IsisPermission` which introduces the concept of a "veto".
+If using the text-based xref:security:ROOT::shiro-realm-implementations/ini-realm.adoc[`IniRealm`] or xref:security:ROOT::shiro-realm-implementations/isis-ldap-realm.adoc[Isis' LDAP realm], then note that Shiro also allows the string representation of the permissions to be mapped (resolved) to alternative `Permission` instances.  Apache Isis provides its own `IsisPermission` which introduces the concept of a "veto".
 
 A vetoing permission is one that prevents access to a feature, rather than grants it.  This is useful in some situations where most users have access to most features, and only a small number of features are particularly sensitive.  The configuration can therefore be set up to grant fairly broad-brush permissions and then veto permission for the sensitive features for those users that do not have access.
 
diff --git a/antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations.adoc b/core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations.adoc
rename to core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/_partials/_attributes.adoc b/core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc b/core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
similarity index 98%
rename from antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
rename to core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
index 5d10030..469abac 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
+++ b/core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
@@ -107,7 +107,7 @@ com.mycompany.myapp                          # ditto
 
 [TIP]
 ====
-The format of the permissions string is configurable in Shiro, and Apache Isis uses this to provide an extended wildcard format, described xref:ug:sec:shiro-isis-enhanced-wildcard-permission.adoc[here].
+The format of the permissions string is configurable in Shiro, and Apache Isis uses this to provide an extended wildcard format, described xref:security:ROOT::shiro-isis-enhanced-wildcard-permission.adoc[here].
 ====
 
 
diff --git a/antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc b/core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc
rename to core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc b/core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc
rename to core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc b/core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc
rename to core/security/_adoc/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc
diff --git a/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc b/core/security/_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
similarity index 100%
rename from antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
rename to core/security/_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
diff --git a/antora/components/ug-sec/sync_examples.sh b/core/security/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ug-sec/sync_examples.sh
rename to core/security/_adoc/sync_examples.sh
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index 6ddf853..e77da92 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -15,7 +15,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
-* the xref:ug:sec:hints-and-tips.adoc[Security] guide
+* the xref:security:ROOT::hints-and-tips.adoc[Security] guide
 
 * the xref:ug:btb:hints-and-tips.adoc[Beyond the Basics] guide.
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index b3bbc3d..5e635a3 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -16,7 +16,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
-* the xref:ug:sec:hints-and-tips.adoc[Security] guide
+* the xref:security:ROOT::hints-and-tips.adoc[Security] guide
 
 * the xref:ug:btb:hints-and-tips.adoc[Beyond the Basics] guide.
 
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc
index 2730661..987bd68 100644
--- a/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc
+++ b/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc
@@ -385,7 +385,7 @@ The Wicket viewer provides a human usable web UI (implemented, as you might have
 
 image::using-hello-world/020-login-to-wicket-viewer.png[width="600px",link="{imagesdir}/using-hello-world/020-login-to-wicket-viewer.png"]
 
-The app itself is configured to run using xref:ug:sec:about.adoc[shiro security], as configured in the `WEB-INF/shiro.ini` config file.  You can login with:
+The app itself is configured to run using xref:security:ROOT::about.adoc[shiro security], as configured in the `WEB-INF/shiro.ini` config file.  You can login with:
 
 * username: _sven_
 * password: _pass_
diff --git a/site.yml b/site.yml
index f910c84..8b2e0c5 100644
--- a/site.yml
+++ b/site.yml
@@ -12,7 +12,7 @@ content:
     start_path: core/plugins/jdo/_adoc
     branches: HEAD
   - url: .
-    start_path: antora/components/ug-sec
+    start_path: core/security/_adoc
     branches: HEAD
   - url: .
     start_path: antora/components/ug-tst


[isis] 11/13: ISIS-2062: moves ug-tst alongside code, and renames to just 'Testing" (and changes ug-tst to testing)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 47fd428c92bf3efcc315c7407b02e631f8b37c0f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:28:51 2019 +0200

    ISIS-2062: moves ug-tst alongside code, and renames to just 'Testing" (and changes ug-tst to testing)
    
    also fixes some missed xref's
---
 antora/components/rg/modules/ROOT/pages/about.adoc          |   2 +-
 antora/components/rg/modules/ant/pages/Inject.adoc          |   2 +-
 .../cms/pages/classes/AppManifest-bootstrapping.adoc        |   2 +-
 .../cms/pages/classes/AppManifest2-bootstrapping.adoc       |   2 +-
 .../rg/modules/cms/pages/classes/super/FixtureScript.adoc   |   2 +-
 .../rg/modules/cms/pages/classes/super/FixtureScripts.adoc  |   2 +-
 .../svc/pages/application-layer-api/WrapperFactory.adoc     |   4 ++--
 .../svc/pages/persistence-layer-api/IsisJdoSupport.adoc     |   2 +-
 .../rg/modules/svc/pages/testing/FixtureScripts.adoc        |   2 +-
 .../rg/modules/svc/pages/testing/SudoService.adoc           |   2 +-
 .../rg/modules/svc/pages/testing/SwitchUserService.adoc     |   2 +-
 antora/components/support/modules/ROOT/pages/about.adoc     |   2 +-
 .../support/modules/dg/pages/asciidoc-templates.adoc        |   6 +++---
 .../hints-and-tips/how-run-fixtures-on-app-startup.adoc     |   2 +-
 antora/components/toc/modules/ROOT/nav.adoc                 |   2 +-
 .../ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc  |   2 +-
 antora/components/toc/modules/ROOT/pages/about.adoc         |   2 +-
 .../modules/ROOT/pages/what-is-apache-isis/screencasts.adoc |  12 ++++++------
 antora/components/ug/modules/ROOT/pages/about.adoc          |   2 +-
 antora/components/ug/modules/btb/pages/i18n.adoc            |   2 +-
 .../pages/core-concepts/apache-isis-vs/mvc-server-side.adoc |   2 +-
 antora/components/ug/modules/fun/pages/crud.adoc            |   2 +-
 .../components/ug-tst => core/testsupport/_adoc}/antora.yml |   4 ++--
 .../ug-tst => core/testsupport/_adoc}/examples.csv          |   0
 .../testsupport/_adoc}/modules/ROOT/_attributes.adoc        |   0
 .../_adoc/modules/ROOT/assets/attachments}/.gitkeep         |   0
 .../assets/images/testing/fixture-scripts/composite.png     | Bin
 .../ROOT/assets/images/testing/fixture-scripts/flat-1.png   | Bin
 .../ROOT/assets/images/testing/fixture-scripts/flat-2.png   | Bin
 .../testing/fixture-scripts/organizing-fixture-scripts.pptx | Bin
 .../testing/fixture-scripts/prompt-specifying-number.png    | Bin
 .../ROOT/assets/images/testing/fixture-scripts/prompt.png   | Bin
 .../images/testing/fixture-scripts/prototyping-menu.png     | Bin
 .../assets/images/testing/fixture-scripts/result-list.png   | Bin
 .../modules/ROOT/assets/images/testing/integ-tests.png      | Bin
 .../modules/ROOT/assets/images/testing/integ-tests.pptx     | Bin
 .../modules/ROOT/assets/images/testing/wrapper-factory.png  | Bin
 .../testsupport/_adoc/modules/ROOT/examples}/.gitkeep       |   0
 .../ug-tst => core/testsupport/_adoc}/modules/ROOT/nav.adoc |   0
 .../testsupport/_adoc}/modules/ROOT/pages/_attributes.adoc  |   0
 .../_adoc/modules/ROOT/pages/_partials}/_attributes.adoc    |   0
 .../testsupport/_adoc}/modules/ROOT/pages/about.adoc        |   0
 .../_adoc}/modules/ROOT/pages/bdd-spec-support.adoc         |   0
 .../modules/ROOT/pages/bdd-spec-support}/_attributes.adoc   |   0
 .../modules/ROOT/pages/bdd-spec-support/how-it-works.adoc   |   0
 .../ROOT/pages/bdd-spec-support/maven-configuration.adoc    |   0
 .../ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc     |   0
 .../_adoc}/modules/ROOT/pages/fixture-scripts.adoc          |   0
 .../modules/ROOT/pages/fixture-scripts/_attributes.adoc     |   0
 .../modules/ROOT/pages/fixture-scripts/api-and-usage.adoc   |   2 +-
 .../modules/ROOT/pages/fixture-scripts/sudo-service.adoc    |   0
 .../ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc   |   0
 .../_adoc}/modules/ROOT/pages/integ-test-support.adoc       |   0
 .../modules/ROOT/pages/integ-test-support}/_attributes.adoc |   0
 .../ROOT/pages/integ-test-support/abstract-class.adoc       |   6 +++---
 .../ROOT/pages/integ-test-support/bootstrapping.adoc        |   0
 .../pages/integ-test-support/configuration-properties.adoc  |   0
 .../ROOT/pages/integ-test-support/maven-configuration.adoc  |   0
 .../ROOT/pages/integ-test-support/typical-usage.adoc        |   0
 .../ROOT/pages/integ-test-support/wrapper-factory.adoc      |   0
 .../testsupport/_adoc}/modules/ROOT/pages/overview.adoc     |   0
 .../_adoc}/modules/ROOT/pages/unit-test-support.adoc        |   0
 .../modules/ROOT/pages/unit-test-support}/_attributes.adoc  |   0
 .../ROOT/pages/unit-test-support/contract-tests.adoc        |   0
 .../ROOT/pages/unit-test-support/jmock-extensions.adoc      |   0
 .../ROOT/pages/unit-test-support/maven-configuration.adoc   |   0
 .../unit-test-support/soap-fake-server-junit-rule.adoc      |   0
 .../ug-tst => core/testsupport/_adoc}/sync_examples.sh      |   0
 examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc |   4 ++--
 site.yml                                                    |   2 +-
 70 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/antora/components/rg/modules/ROOT/pages/about.adoc b/antora/components/rg/modules/ROOT/pages/about.adoc
index bdba252..160ac3a 100644
--- a/antora/components/rg/modules/ROOT/pages/about.adoc
+++ b/antora/components/rg/modules/ROOT/pages/about.adoc
@@ -10,7 +10,7 @@ The user guides available are:
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:odn:ROOT:about.adoc[DataNucleus object store]
 * xref:security:ROOT::about.adoc[Security] (this guide)
-* xref:ug:tst:about.adoc[Testing]
+* xref:testing:ROOT:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
 
 The reference guides are:
diff --git a/antora/components/rg/modules/ant/pages/Inject.adoc b/antora/components/rg/modules/ant/pages/Inject.adoc
index c8a625f..2eda4cd 100644
--- a/antora/components/rg/modules/ant/pages/Inject.adoc
+++ b/antora/components/rg/modules/ant/pages/Inject.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 Apache Isis automatically injects domain services into other domain services and also into domain objects and view models.
-In fact, it also injects domain services into xref:ug:tst:integ-test-support.adoc[integration tests] and xref:ug:tst:fixture-scripts.adoc[fixture scripts].
+In fact, it also injects domain services into xref:testing:ROOT:integ-test-support.adoc[integration tests] and xref:testing:ROOT:fixture-scripts.adoc[fixture scripts].
 
 [NOTE]
 ====
diff --git a/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc b/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
index ebf9458..e285a60 100644
--- a/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
@@ -221,7 +221,7 @@ java org.apache.isis.WebServer -m com.mycompany.myapp.MyAppAppManifestWithFixtur
 
 * the third case is within an integration test. +
 +
-The code to boostrap an integration test is shown in the xref:ug:tst:integ-test-support/bootstrapping.adoc[testing guide], but once again an `AppManifest` is required.
+The code to boostrap an integration test is shown in the xref:testing:ROOT:integ-test-support/bootstrapping.adoc[testing guide], but once again an `AppManifest` is required.
 
 In some cases an integration test uses the exact same `AppManifest` as the regular webapp.
 Sometimes though it is necessary to "tweak" the `AppManifest`:
diff --git a/antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc b/antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
index 52c030b..ce34885 100644
--- a/antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
@@ -184,6 +184,6 @@ The `AppManifest` implementation must (necessarily) reference all the modules wt
 (As noted above), the `IntegrationTestAbstract3` adapter class is bootstrapped from a `Module` rather than an `AppManifest`.
 This therefore allows the integration tests to reside alongside the module that they exercise, and to bootstrap only the subset of the application required (that is, the module being tested and any of its transitive dependencies)..
 
-For more on `IntegrationTestAbstract3`, see the xref:ug:tst:integ-test-support/bootstrapping.adoc[testing user guide].
+For more on `IntegrationTestAbstract3`, see the xref:testing:ROOT:integ-test-support/bootstrapping.adoc[testing user guide].
 
 
diff --git a/antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc b/antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc
index ed9b367..ad695ca 100644
--- a/antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc
@@ -15,5 +15,5 @@ protected abstract void execute(final ExecutionContext executionContext);
 In this method the fixture script can in theory do anything, but in practice it is recommended that it uses injected domain services to set up data.
 The provided `ExecutionContext` is used to invoke child fixture scripts, and alsocan be used to store references to any created objects (so that the calling test can access these objects/so that they are rendered in the view model).
 
-See the see the xref:ug:tst:fixture-scripts.adoc[user guide's testing chapter] for further discussion on the use of fixture scripts, in particular xref:ug:tst:fixture-scripts/api-and-usage.adoc[fixture scripts' API and usage].
+See the see the xref:testing:ROOT:fixture-scripts.adoc[user guide's testing chapter] for further discussion on the use of fixture scripts, in particular xref:testing:ROOT:fixture-scripts/api-and-usage.adoc[fixture scripts' API and usage].
 
diff --git a/antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc b/antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc
index d2c4ae7..61bbe9b 100644
--- a/antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc
@@ -6,4 +6,4 @@ This abstract class constitutes the API of a domain service to execute xref:rg:c
 
 For more information, see xref:rg:svc:testing/FixtureScripts.adoc[`FixtureScripts`] in the domain services guide.
 
-See the see the xref:ug:tst:fixture-scripts.adoc[user guide's testing chapter] for further discussion on the use of fixture scripts, in particular xref:ug:tst:fixture-scripts/api-and-usage.adoc[fixture scripts' API and usage].
+See the see the xref:testing:ROOT:fixture-scripts.adoc[user guide's testing chapter] for further discussion on the use of fixture scripts, in particular xref:testing:ROOT:fixture-scripts/api-and-usage.adoc[fixture scripts' API and usage].
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc b/antora/components/rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
index 7681b32..32b1995 100644
--- a/antora/components/rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
+++ b/antora/components/rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
@@ -13,12 +13,12 @@ Said another way: interactions are performed "as if" they are through the viewer
 
 [NOTE]
 ====
-For a discussion of the use of the `WrapperFactory` within integration tests (the primary or at least original use case for this service) can be found xref:ug:tst:integ-test-support/wrapper-factory.adoc[here]
+For a discussion of the use of the `WrapperFactory` within integration tests (the primary or at least original use case for this service) can be found xref:testing:ROOT:integ-test-support/wrapper-factory.adoc[here]
 ====
 
 This capability goes beyond enforcing the (imperative) constraints within the `hideXxx()`, `disableXxx()` and `validateXxx()` supporting methods; it also enforces (declarative) constraints such as those represented by annotations, eg `@Parameter(maxLength=...)` or `@Property(mustSatisfy=...)`.
 
-This capability is frequently used within xref:ug:tst:integ-test-support.adoc[integration tests], but can also be used in production code. (There are analogies that can be drawn here with the way that JEE beans can interact through an EJB local interface).
+This capability is frequently used within xref:testing:ROOT:integ-test-support.adoc[integration tests], but can also be used in production code. (There are analogies that can be drawn here with the way that JEE beans can interact through an EJB local interface).
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc b/antora/components/rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
index 0d22f51..08ef0af 100644
--- a/antora/components/rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
+++ b/antora/components/rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
@@ -143,7 +143,7 @@ private static <T> List<T> executeListAndClose(final TypesafeQuery<T> query) {
 
 == Fixture support
 
-When writing xref:ug:tst:integ-test-support.adoc[integration tests] you'll usually need to tear down some/all mutable transactional data before each test.  One way to do that is to use the `executeUpdate(...)` method described xref:rg:svc:persistence-layer-api/IsisJdoSupport.adoc#executing-sql[above].
+When writing xref:testing:ROOT:integ-test-support.adoc[integration tests] you'll usually need to tear down some/all mutable transactional data before each test.  One way to do that is to use the `executeUpdate(...)` method described xref:rg:svc:persistence-layer-api/IsisJdoSupport.adoc#executing-sql[above].
 
 Alternatively, the `deleteAll(...)` method will let your test delete all instances of a class without resorting to SQL:
 
diff --git a/antora/components/rg/modules/svc/pages/testing/FixtureScripts.adoc b/antora/components/rg/modules/svc/pages/testing/FixtureScripts.adoc
index c872875..a9c91c8 100644
--- a/antora/components/rg/modules/svc/pages/testing/FixtureScripts.adoc
+++ b/antora/components/rg/modules/svc/pages/testing/FixtureScripts.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The `FixtureScripts` service provides the ability to execute xref:ug:tst:fixture-scripts/api-and-usage.adoc[fixture scripts].
+The `FixtureScripts` service provides the ability to execute xref:testing:ROOT:fixture-scripts/api-and-usage.adoc[fixture scripts].
 
 The default implementation of this service, `FixtureScriptsDefault`, uses the associated xref:rg:svc:testing/FixtureScriptsSpecificationProvider.adoc[`FixtureScriptsSpecificationProvider`] to obtain a `FixtureScriptsSpecification`.
 This configures this service, for example telling it which package to search for `FixtureScript` classes, how to execute those classes, and hints that influence the UI.
diff --git a/antora/components/rg/modules/svc/pages/testing/SudoService.adoc b/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
index 8151039..6824969 100644
--- a/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
+++ b/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 The `SudoService` allows the current user reported by the xref:rg:svc:core-domain-api/UserService.adoc[`UserService`]  to be temporarily changed to some other user.
-This is useful both for xref:ug:tst:integ-test-support.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:ug:tst:fixture-scripts.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
+This is useful both for xref:testing:ROOT:integ-test-support.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:testing:ROOT:fixture-scripts.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
 
 
 == API
diff --git a/antora/components/rg/modules/svc/pages/testing/SwitchUserService.adoc b/antora/components/rg/modules/svc/pages/testing/SwitchUserService.adoc
index 211268f..c1b1e78 100644
--- a/antora/components/rg/modules/svc/pages/testing/SwitchUserService.adoc
+++ b/antora/components/rg/modules/svc/pages/testing/SwitchUserService.adoc
@@ -11,7 +11,7 @@ different users of the system.
 
 [NOTE]
 ====
-This service is deprecated; use xref:ug:tst:fixture-scripts.adoc[fixture scripts] and the
+This service is deprecated; use xref:testing:ROOT:fixture-scripts.adoc[fixture scripts] and the
 xref:rg:svc:testing/SudoService.adoc[`SudoService`] instead.
 ====
 
diff --git a/antora/components/support/modules/ROOT/pages/about.adoc b/antora/components/support/modules/ROOT/pages/about.adoc
index 6ebfd79..243950c 100644
--- a/antora/components/support/modules/ROOT/pages/about.adoc
+++ b/antora/components/support/modules/ROOT/pages/about.adoc
@@ -10,7 +10,7 @@ The user guides available are:
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:odn:ROOT:about.adoc[DataNucleus object store]
 * xref:security:ROOT::about.adoc[Security]
-* xref:ug:tst:about.adoc[Testing]
+* xref:testing:ROOT:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
 
 The reference guides are:
diff --git a/antora/components/support/modules/dg/pages/asciidoc-templates.adoc b/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
index dc925ff..6cfcb50 100644
--- a/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
+++ b/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
@@ -353,7 +353,7 @@ include::_attributes.adoc[]
 //
 //
 //|`adugtst`
-//|`\xref:ug:tst:about.adoc#xxx[ttt]`
+//|`\xref:testing:ROOT:about.adoc#xxx[ttt]`
 //
 //A hyperlink to a bookmark within the Testing guide, where:
 //
@@ -362,9 +362,9 @@ include::_attributes.adoc[]
 //
 //for example:
 //
-//`\xref:ug:tst:bdd-spec-support.adoc[BDD Spec Support]`
+//`\xref:testing:ROOT:bdd-spec-support.adoc[BDD Spec Support]`
 //
-//|xref:ug:tst:bdd-spec-support.adoc[BDD Spec Support]
+//|xref:testing:ROOT:bdd-spec-support.adoc[BDD Spec Support]
 //
 //
 //|`adugbtb`
diff --git a/antora/components/support/modules/dg/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc b/antora/components/support/modules/dg/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
index ba6e001..01c3e9a 100644
--- a/antora/components/support/modules/dg/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
+++ b/antora/components/support/modules/dg/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
@@ -11,7 +11,7 @@ Hook up into the webapp start?
 Use events?_
 
 
-The standard approach is to use xref:ug:tst:fixture-scripts.adoc[fixture scripts].
+The standard approach is to use xref:testing:ROOT:fixture-scripts.adoc[fixture scripts].
 These can be run in on start-up typically by being specified in the xref:rg:cms:classes/AppManifest-bootstrapping.adoc[`AppManifest`], see for example the xref:simpleapp:ROOT:about.adoc[SimpleApp archetype].
 
 Alternatively just set `isis.fixtures` and `isis.persistor.datanucleus.install-fixtures` properties.
diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index 0445c78..c30f1b2 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -24,7 +24,7 @@
 **  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
 **  xref:odn:ROOT:about.adoc[DataNucleus Object Store]
 **  xref:security:ROOT::about.adoc[Security]
-** *xref:ug:tst:about.adoc[Testing]*
+** *xref:testing:ROOT:about.adoc[Testing]*
 **  xref:ug:btb:about.adoc[Beyond the Basics]
 
 
diff --git a/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc b/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc
index 1de9cf7..8fe438f 100644
--- a/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc
+++ b/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc
@@ -80,7 +80,7 @@ At the last count more than 400 domain entities, across 6 different Bounded Cont
 
 At the Domain level, we also extensively use the xref:ug:fun:building-blocks/events/domain-events.adoc[domain events] functionality available in Apache Isis, along with many of the (non-ASF) link:http://platform.incode.org[Incode Platform^] (such as audit, security and excel modules).
 
-The GRC platform currently has more than 5600 automated tests, about 2000 being xref:ug:tst:bdd-spec-support.adoc[BDD tests] and 3600 xref:ug:tst:integ-test-support.adoc[integration tests], all leveraging Apache Isis' extensive testing capabilities.
+The GRC platform currently has more than 5600 automated tests, about 2000 being xref:testing:ROOT:bdd-spec-support.adoc[BDD tests] and 3600 xref:testing:ROOT:integ-test-support.adoc[integration tests], all leveraging Apache Isis' extensive testing capabilities.
 
 
 == Summing up
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 4df0f89..b97fe13 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -43,7 +43,7 @@ include::_attributes.adoc[]
 *  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
 *  xref:odn:ROOT:about.adoc[DataNucleus Object Store]
 *  xref:security:ROOT::about.adoc[Security]
-* *xref:ug:tst:about.adoc[Testing]*
+* *xref:testing:ROOT:about.adoc[Testing]*
 *  xref:ug:btb:about.adoc[Beyond the Basics]
 
 
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 7cc4c3e..0c874c4 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -79,7 +79,7 @@ include::partial$_screencasts-playlists.adoc[]
 
 
 |link:https://www.youtube.com/watch?v=pH02g0l2GKY[005^] +
-Using xref:ug:tst:fixture-scripts.adoc[fixture scripts] to initialize the database, eg while prototyping and for demos
+Using xref:testing:ROOT:fixture-scripts.adoc[fixture scripts] to initialize the database, eg while prototyping and for demos
 ||x|||||||||
 
 
@@ -90,13 +90,13 @@ Implementing xref:ug:fun:business-rules.adoc[business rules]for domain object me
 |x||||||||||
 
 |link:https://www.youtube.com/watch?v=imHfxQGUgV8[007^] +
-Writing xref:ug:tst:unit-test-support.adoc[unit tests] for a domain object responsibility
+Writing xref:testing:ROOT:unit-test-support.adoc[unit tests] for a domain object responsibility
 ||x|||||||||
 
 
 
 |link:https://www.youtube.com/watch?v=-lAt4UWiBjE[008^] +
-Writing end-to-end xref:ug:tst:integ-test-support.adoc[integration tests] for a domain object responsibility
+Writing end-to-end xref:testing:ROOT:integ-test-support.adoc[integration tests] for a domain object responsibility
 ||x|||||||||
 
 
@@ -187,7 +187,7 @@ How to implement a derived collection on a domain object.
 
 
 |link:https://www.youtube.com/watch?v=l_oZymgb65I[017^] +
-Extending a xref:ug:tst:fixture-scripts.adoc[fixture script] to more easily demonstrate new functionality.
+Extending a xref:testing:ROOT:fixture-scripts.adoc[fixture script] to more easily demonstrate new functionality.
 ||x|||||||||
 
 
@@ -284,7 +284,7 @@ Using the xref:rg:ant:Title.adoc[`@Title`] annotation (instead of the xref:rg:cm
 
 
 |link:https://www.youtube.com/watch?v=yi52Gbd3lmY[027^] +
-How to write an xref:ug:tst:integ-test-support.adoc[integration test] for an xref:rg:ant:Mixin.adoc[mixin].
+How to write an xref:testing:ROOT:integ-test-support.adoc[integration test] for an xref:rg:ant:Mixin.adoc[mixin].
 ||x|||||||||
 
 
@@ -367,7 +367,7 @@ How to provide a set of xref:rg:cms:methods/prefixes/choices.adoc[choices] (a dr
 
 
 |link:https://www.youtube.com/watch?v=fKo6aTPK-gk[035^] +
-How to use the xref:rg:cms:methods/prefixes/choices.adoc[choices] supporting methods as a source for default values within a xref:ug:tst:fixture-scripts.adoc[fixture script].
+How to use the xref:rg:cms:methods/prefixes/choices.adoc[choices] supporting methods as a source for default values within a xref:testing:ROOT:fixture-scripts.adoc[fixture script].
 ||x|||||||x||
 
 
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/antora/components/ug/modules/ROOT/pages/about.adoc
index 7a64e3b..b3fe3c5 100644
--- a/antora/components/ug/modules/ROOT/pages/about.adoc
+++ b/antora/components/ug/modules/ROOT/pages/about.adoc
@@ -10,7 +10,7 @@ The user guides available are:
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:odn:ROOT:about.adoc[DataNucleus object store]
 * xref:security:ROOT::about.adoc[Security]
-* xref:ug-tst:ROOT:about.adoc[Testing]
+* xref:testing:ROOT::about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
 
 The reference guides are:
diff --git a/antora/components/ug/modules/btb/pages/i18n.adoc b/antora/components/ug/modules/btb/pages/i18n.adoc
index d62fc4f..b38a936 100644
--- a/antora/components/ug/modules/btb/pages/i18n.adoc
+++ b/antora/components/ug/modules/btb/pages/i18n.adoc
@@ -490,7 +490,7 @@ msgstr "Username"
 
 So much for the API; but as noted, it is also necessary to ensure that the required translations are recorded (by the `TranslationService`) into the `.pot` file.
 
-For this, we recommend that you ensure that all such methods are tested through an xref:ug-tst:ROOT:integ-test-support.adoc[integration test] (not unit test).
+For this, we recommend that you ensure that all such methods are tested through an xref:testing:ROOT::integ-test-support.adoc[integration test] (not unit test).
 
 For example, here's the corresponding integration test for the "Exclamation mark" example from the simpleapp (above):
 
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index a2f5480..72e269d 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -23,5 +23,5 @@ Again, these addons can be plugged into any Isis app.
 In terms of testing support, each of these other frameworks provide mechanisms to allow the webapp to be tested from within a JUnit test harness.
 Apache Isis' support is similar.
 Where Apache Isis differs though is that it enables end-to-end testing without the need for slow and fragile Selenium tests.
-Instead, Apache Isis provides a "xref:ug-tst:ROOT:integ-test-support/wrapper-factory.adoc[WrapperFactory]" domain service that allows the generic UI provided to in essence be simulated.
+Instead, Apache Isis provides a "xref:testing:ROOT::integ-test-support/wrapper-factory.adoc[WrapperFactory]" domain service that allows the generic UI provided to in essence be simulated.
 On a more pragmatic level, the link:http://platform.incode.org[Incode Platform^]'s fakedata module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.
diff --git a/antora/components/ug/modules/fun/pages/crud.adoc b/antora/components/ug/modules/fun/pages/crud.adoc
index 7833721..4f54b4e 100644
--- a/antora/components/ug/modules/fun/pages/crud.adoc
+++ b/antora/components/ug/modules/fun/pages/crud.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 This chapter shows the idioms for creating, reading, updating and deleting xref:ug:fun:building-blocks/types-of-domain-objects/domain-entities.adoc[domain entities].
 The main domain services used for this are xref:rg:svc:persistence-layer-api/RepositoryService.adoc[`RepositoryService`] and xref:rg:svc:core-domain-api/FactoryService.adoc[`FactoryService`].
 
-It also shows how to instantiate xref:ug:fun:building-blocks/types-of-domain-objects/view-models.adoc[view models] and how to programmatically instantiate xref:ug:fun:building-blocks/types-of-domain-objects/mixins.adoc[mixins] (useful primarily for xref:ug-tst:ROOT:integ-test-support.adoc[integration testing]).
+It also shows how to instantiate xref:ug:fun:building-blocks/types-of-domain-objects/view-models.adoc[view models] and how to programmatically instantiate xref:ug:fun:building-blocks/types-of-domain-objects/mixins.adoc[mixins] (useful primarily for xref:testing:ROOT::integ-test-support.adoc[integration testing]).
 
 
 
diff --git a/antora/components/ug-tst/antora.yml b/core/testsupport/_adoc/antora.yml
similarity index 62%
rename from antora/components/ug-tst/antora.yml
rename to core/testsupport/_adoc/antora.yml
index 3d138d5..ac1a732 100644
--- a/antora/components/ug-tst/antora.yml
+++ b/core/testsupport/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: ug-tst
-title: "User Guides - Testing"
+name: testing
+title: "Testing"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/ug-tst/examples.csv b/core/testsupport/_adoc/examples.csv
similarity index 100%
rename from antora/components/ug-tst/examples.csv
rename to core/testsupport/_adoc/examples.csv
diff --git a/antora/components/ug-tst/modules/ROOT/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/_attributes.adoc
rename to core/testsupport/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/examples/.gitkeep b/core/testsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/examples/.gitkeep
rename to core/testsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/composite.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/composite.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/composite.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/composite.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/flat-1.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/flat-1.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/flat-1.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/flat-1.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/flat-2.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/flat-2.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/flat-2.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/flat-2.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/organizing-fixture-scripts.pptx b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/organizing-fixture-scripts.pptx
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/organizing-fixture-scripts.pptx
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/organizing-fixture-scripts.pptx
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/prompt-specifying-number.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/prompt-specifying-number.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/prompt-specifying-number.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/prompt-specifying-number.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/prompt.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/prompt.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/prompt.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/prompt.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/prototyping-menu.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/prototyping-menu.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/prototyping-menu.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/prototyping-menu.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/result-list.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/result-list.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/fixture-scripts/result-list.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/fixture-scripts/result-list.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/integ-tests.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/integ-tests.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/integ-tests.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/integ-tests.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/integ-tests.pptx b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/integ-tests.pptx
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/integ-tests.pptx
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/integ-tests.pptx
diff --git a/antora/components/ug-tst/modules/ROOT/assets/images/testing/wrapper-factory.png b/core/testsupport/_adoc/modules/ROOT/assets/images/testing/wrapper-factory.png
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/images/testing/wrapper-factory.png
rename to core/testsupport/_adoc/modules/ROOT/assets/images/testing/wrapper-factory.png
diff --git a/antora/components/ug-tst/modules/ROOT/assets/attachments/.gitkeep b/core/testsupport/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/assets/attachments/.gitkeep
rename to core/testsupport/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ug-tst/modules/ROOT/nav.adoc b/core/testsupport/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/nav.adoc
rename to core/testsupport/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/_attributes.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/unit-test-support/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/unit-test-support/_attributes.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/about.adoc b/core/testsupport/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/about.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/_attributes.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support/_attributes.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/_attributes.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/fixture-scripts.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/fixture-scripts.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/_attributes.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/_attributes.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/_attributes.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
similarity index 99%
rename from antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
index 45b9f5e..c994cd6 100644
--- a/antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
@@ -38,7 +38,7 @@ public class DomainAppFixtureScriptsSpecificationProvider
 }
 ----
 <1> search for all fixture scripts under the package containing this class
-<2> if the same fixture script (class) is encountered more than once, then run anyway; more on this in xref:ug:tst:fixture-scripts/api-and-usage.adoc#organizing[Organizing Fixture scripts], below.
+<2> if the same fixture script (class) is encountered more than once, then run anyway; more on this in xref:testing:ROOT:fixture-scripts/api-and-usage.adoc#organizing[Organizing Fixture scripts], below.
 <3> specify the fixture script class to provide as the default for the service's "run fixture script" action
 <4> whether the service's "run fixture script" action should display other fixture scripts using a choices drop down or (if there are very many of them) using an auto-complete
 <5> if present, enables a "recreate objects and return first" action to be displayed in the UI
diff --git a/antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/sudo-service.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/sudo-service.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/_attributes.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/bdd-spec-support/_attributes.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/_attributes.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/abstract-class.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
similarity index 87%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support/abstract-class.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
index 471b6db..426c076 100644
--- a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/abstract-class.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
@@ -6,14 +6,14 @@ include::_attributes.adoc[]
 
 When writing integration tests, it's easiest to inherit from the `IntegrationTestAbstract3` base class.
 
-This base class xref:ug:tst:integ-test-support/bootstrapping.adoc[bootstraps] the framework (caching the framework on a thread-local), and provides various utility methods and framework-provided services for use by your application's subclass tests.
+This base class xref:testing:ROOT:integ-test-support/bootstrapping.adoc[bootstraps] the framework (caching the framework on a thread-local), and provides various utility methods and framework-provided services for use by your application's subclass tests.
 
 
 
 == `IntegrationTestAbstract3`
 
 We recommend that your integration tests inherit from Apache Isis' `IntegrationTestAbstract3` class.
-The primary benefit over its predecessor, `IntegrationTestAbstract2` (discussed xref:ug:tst:integ-test-support/abstract-class/adoc#IntegrationTestAbstract2[below] is that it allows the test to be bootstrapped by passing in a `Module` rather than an `AppManifest`.
+The primary benefit over its predecessor, `IntegrationTestAbstract2` (discussed xref:testing:ROOT:integ-test-support/abstract-class/adoc#IntegrationTestAbstract2[below] is that it allows the test to be bootstrapped by passing in a `Module` rather than an `AppManifest`.
 
 For example:
 
@@ -64,7 +64,7 @@ public ExceptionRecognizerTranslate exceptionRecognizerTranslations =    // <4>
     ExceptionRecognizerTranslate.create();
 ----
 <1> ensures an Apache Isis session/transaction running for each test
-<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:ug:tst:unit-test-support/jmock-extensions.adoc[JMock Extensions].
+<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:ROOT:unit-test-support/jmock-extensions.adoc[JMock Extensions].
 <3> standard JUnit rule for writing tests that throw exceptions
 <4> to capture messages that require translation, as described in xref:ug:btb:i18n.adoc[i18 support].
 
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/bootstrapping.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support/bootstrapping.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/configuration-properties.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support/configuration-properties.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/maven-configuration.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support/maven-configuration.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/typical-usage.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support/typical-usage.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/overview.adoc b/core/testsupport/_adoc/modules/ROOT/pages/overview.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/overview.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/overview.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/unit-test-support.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/unit-test-support.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/unit-test-support.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/_partials/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/_attributes.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/_attributes.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/unit-test-support/contract-tests.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/unit-test-support/contract-tests.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/unit-test-support/maven-configuration.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/unit-test-support/maven-configuration.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc
diff --git a/antora/components/ug-tst/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc
similarity index 100%
rename from antora/components/ug-tst/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc
rename to core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc
diff --git a/antora/components/ug-tst/sync_examples.sh b/core/testsupport/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ug-tst/sync_examples.sh
rename to core/testsupport/_adoc/sync_examples.sh
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc
index 826978f..1ab4624 100644
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc
+++ b/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc
@@ -408,7 +408,7 @@ public class SimpleModule extends ModuleAbstract {
 }
 ----
 
-In the `fixture` subpackage is the `SimpleObject_persona` "persona" which uses the corresponding `SimpleObjectBuilder` builder script; further discussion on this pattern xref:ug:tst:fixture-scripts/api-and-usage#persona-and-builders.adoc[here].
+In the `fixture` subpackage is the `SimpleObject_persona` "persona" which uses the corresponding `SimpleObjectBuilder` builder script; further discussion on this pattern xref:testing:ROOT:fixture-scripts/api-and-usage#persona-and-builders.adoc[here].
 These fixtures are also used by "local" integration tests, which reside under `src/test/java`.
 
 There are also unit tests and "glue" for the BDD specs:
@@ -668,7 +668,7 @@ image::simpleapp-webapp-before-launch.png[width="600px",link="{imagesdir}/simple
 == Running with Fixtures
 
 It is also possible to start the application with a pre-defined set of data; useful for demos or manual exploratory testing.
-This is done by specifying a xref:ug:tst:fixture-scripts.adoc[fixture script] on the command line.
+This is done by specifying a xref:testing:ROOT:fixture-scripts.adoc[fixture script] on the command line.
 
 If you are running the app from an IDE, then you can specify the fixture script using the `--fixture` flag.  The archetype provides the `domainapp.fixture.scenarios.RecreateSimpleObjects` fixture script, for example:
 
diff --git a/site.yml b/site.yml
index 8b2e0c5..c713813 100644
--- a/site.yml
+++ b/site.yml
@@ -15,7 +15,7 @@ content:
     start_path: core/security/_adoc
     branches: HEAD
   - url: .
-    start_path: antora/components/ug-tst
+    start_path: core/testsupport/_adoc
     branches: HEAD
   - url: .
     start_path: core/viewer-restfulobjects/_adoc


[isis] 05/13: ISIS-2062: moves ug-vro alongside code, and renames to just 'Restful Objects Viewer'.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 3d58ce298504230cd091ab6d157906ea9e96f41a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:12:56 2019 +0200

    ISIS-2062: moves ug-vro alongside code, and renames to just 'Restful Objects Viewer'.
    
    also fixes some xref's for vw
---
 antora/components/rg/modules/ROOT/pages/about.adoc    |   4 ++--
 antora/components/rg/modules/ant/pages/Action.adoc    |   2 +-
 .../rg/modules/ant/pages/Action/hidden.adoc           |   2 +-
 .../rg/modules/ant/pages/Action/semantics.adoc        |   2 +-
 .../components/rg/modules/ant/pages/ActionLayout.adoc |   4 ++--
 .../modules/ant/pages/ActionLayout/bookmarking.adoc   |   8 ++++----
 .../rg/modules/ant/pages/ActionLayout/cssClass.adoc   |   2 +-
 .../rg/modules/ant/pages/ActionLayout/cssClassFa.adoc |   2 +-
 .../modules/ant/pages/ActionLayout/describedAs.adoc   |   4 ++--
 .../rg/modules/ant/pages/ActionLayout/hidden.adoc     |   2 +-
 .../rg/modules/ant/pages/ActionLayout/named.adoc      |   2 +-
 .../rg/modules/ant/pages/ActionLayout/position.adoc   |   4 ++--
 .../modules/ant/pages/ActionLayout/promptStyle.adoc   |   6 +++---
 .../rg/modules/ant/pages/ActionLayout/redirect.adoc   |   4 ++--
 .../rg/modules/ant/pages/Collection/domainEvent.adoc  |   2 +-
 .../rg/modules/ant/pages/Collection/editing.adoc      |   2 +-
 .../rg/modules/ant/pages/Collection/hidden.adoc       |   6 +++---
 .../rg/modules/ant/pages/CollectionLayout.adoc        |   2 +-
 .../modules/ant/pages/CollectionLayout/cssClass.adoc  |   2 +-
 .../ant/pages/CollectionLayout/defaultView.adoc       |   4 ++--
 .../ant/pages/CollectionLayout/describedAs.adoc       |   4 ++--
 .../rg/modules/ant/pages/CollectionLayout/hidden.adoc |   2 +-
 .../rg/modules/ant/pages/CollectionLayout/named.adoc  |   2 +-
 .../rg/modules/ant/pages/CollectionLayout/paged.adoc  |   6 +++---
 .../modules/ant/pages/CollectionLayout/sortedBy.adoc  |   4 ++--
 .../rg/modules/ant/pages/Discriminator.adoc           |   6 +++---
 .../rg/modules/ant/pages/DomainObject/bounding.adoc   |   2 +-
 .../rg/modules/ant/pages/DomainObject/objectType.adoc |   6 +++---
 .../rg/modules/ant/pages/DomainObjectLayout.adoc      |   2 +-
 .../ant/pages/DomainObjectLayout/bookmarking.adoc     |   4 ++--
 .../ant/pages/DomainObjectLayout/describedAs.adoc     |   2 +-
 .../modules/ant/pages/DomainObjectLayout/paged.adoc   |   4 ++--
 .../rg/modules/ant/pages/DomainService.adoc           |   2 +-
 .../rg/modules/ant/pages/DomainService/nature.adoc    |   2 +-
 .../modules/ant/pages/DomainService/objectType.adoc   |   6 +++---
 .../rg/modules/ant/pages/DomainServiceLayout.adoc     |   4 ++--
 .../ant/pages/DomainServiceLayout/menuBar.adoc        |   4 ++--
 .../ant/pages/DomainServiceLayout/menuOrder.adoc      |   2 +-
 antora/components/rg/modules/ant/pages/HomePage.adoc  |   2 +-
 .../components/rg/modules/ant/pages/MemberOrder.adoc  |   2 +-
 .../rg/modules/ant/pages/MemberOrder/name.adoc        |   2 +-
 .../rg/modules/ant/pages/MemberOrder/sequence.adoc    |   2 +-
 .../rg/modules/ant/pages/ParameterLayout.adoc         |   2 +-
 .../ant/pages/ParameterLayout/describedAs.adoc        |   2 +-
 .../ant/pages/ParameterLayout/labelPosition.adoc      |   2 +-
 .../ant/pages/ParameterLayout/typicalLength.adoc      |   2 +-
 .../rg/modules/ant/pages/PersistenceCapable.adoc      |   6 +++---
 .../rg/modules/ant/pages/Property/hidden.adoc         |   2 +-
 .../rg/modules/ant/pages/PropertyLayout.adoc          |   2 +-
 .../rg/modules/ant/pages/PropertyLayout/cssClass.adoc |   2 +-
 .../modules/ant/pages/PropertyLayout/describedAs.adoc |   4 ++--
 .../rg/modules/ant/pages/PropertyLayout/hidden.adoc   |   6 +++---
 .../ant/pages/PropertyLayout/labelPosition.adoc       |   4 ++--
 .../modules/ant/pages/PropertyLayout/multiLine.adoc   |   2 +-
 .../rg/modules/ant/pages/PropertyLayout/named.adoc    |   2 +-
 .../modules/ant/pages/PropertyLayout/navigable.adoc   |   2 +-
 .../modules/ant/pages/PropertyLayout/promptStyle.adoc |   4 ++--
 .../ant/pages/PropertyLayout/renderedAsDayBefore.adoc |   2 +-
 .../ant/pages/PropertyLayout/typicalLength.adoc       |   4 ++--
 .../rg/modules/ant/pages/ViewModel/objectType.adoc    |   6 +++---
 .../rg/modules/ant/pages/ViewModelLayout.adoc         |   2 +-
 .../ant/pages/ViewModelLayout/describedAs.adoc        |   2 +-
 .../rg/modules/ant/pages/XmlRootElement.adoc          |   4 ++--
 antora/components/rg/modules/ant/pages/aaa/jdo.adoc   |   4 ++--
 antora/components/rg/modules/ant/pages/aaa/jee.adoc   |   2 +-
 antora/components/rg/modules/ant/pages/aaa/main.adoc  |   4 ++--
 antora/components/rg/modules/ant/pages/aaa/other.adoc |   2 +-
 antora/components/rg/modules/cfg/pages/about.adoc     |   2 +-
 .../rg/modules/cfg/pages/configuration-files.adoc     |   4 ++--
 .../rg/modules/cfg/pages/configuring-core.adoc        |   8 ++++----
 .../rg/modules/cfg/pages/deployment-types.adoc        |   4 ++--
 antora/components/rg/modules/cms/pages/classes.adoc   |   2 +-
 .../cms/pages/classes/AppManifest-bootstrapping.adoc  |   2 +-
 .../rg/modules/cms/pages/classes/layout.adoc          |   6 +++---
 .../rg/modules/cms/pages/classes/menubars.adoc        |   6 +++---
 .../rg/modules/cms/pages/classes/mixins/Object.adoc   |  12 ++++++------
 .../rg/modules/cms/pages/methods/prefixes.adoc        |   8 ++++----
 .../rg/modules/cms/pages/methods/prefixes/addTo.adoc  |   2 +-
 .../cms/pages/methods/prefixes/removeFrom.adoc        |   2 +-
 .../cms/pages/methods/prefixes/validateAddTo.adoc     |   2 +-
 .../pages/methods/prefixes/validateRemoveFrom.adoc    |   2 +-
 .../modules/cms/pages/methods/reserved/cssClass.adoc  |   2 +-
 .../rg/modules/cms/pages/methods/reserved/getId.adoc  |   6 +++---
 .../modules/cms/pages/methods/reserved/iconName.adoc  |   2 +-
 .../rg/modules/cms/pages/methods/reserved/layout.adoc |   4 ++--
 .../presentation-layer/ContentNegotiationService.adoc |   4 ++--
 .../presentation-layer/RepresentationService.adoc     |   2 +-
 antora/components/rg/modules/mvn/pages/intro.adoc     |   2 +-
 antora/components/rg/modules/mvn/pages/swagger.adoc   |   2 +-
 .../ActionInvocationContext.adoc                      |   2 +-
 .../pages/application-layer-api/CommandContext.adoc   |   2 +-
 .../pages/application-layer-api/MessageService.adoc   |   6 +++---
 .../application-layer-api/TransactionService.adoc     |   2 +-
 .../pages/application-layer-spi/CommandService.adoc   |   2 +-
 .../modules/svc/pages/core-domain-api/Scratchpad.adoc |   2 +-
 .../svc/pages/core-domain-api/UserService.adoc        |   2 +-
 .../svc/pages/integration-api/EmailService.adoc       |   2 +-
 antora/components/rg/modules/svc/pages/intro.adoc     |   2 +-
 .../components/rg/modules/svc/pages/metadata-api.adoc |   2 +-
 .../svc/pages/metadata-api/SwaggerService.adoc        |   4 ++--
 .../UserRegistrationService.adoc                      |   4 ++--
 .../rg/modules/svc/pages/presentation-layer-api.adoc  |  10 +++++-----
 .../presentation-layer-api/AcceptHeaderService.adoc   |   2 +-
 .../presentation-layer-api/BookmarkUiService.adoc     |   2 +-
 .../pages/presentation-layer-api/DeepLinkService.adoc |   6 +++---
 .../presentation-layer-api/GuiceBeanProvider.adoc     |   6 +++---
 .../rg/modules/svc/pages/presentation-layer-spi.adoc  |   2 +-
 .../presentation-layer-spi/ContentMappingService.adoc |   2 +-
 .../EmailNotificationService.adoc                     |   4 ++--
 .../presentation-layer-spi/ExceptionRecognizer.adoc   |   2 +-
 .../presentation-layer-spi/GridSystemService.adoc     |   2 +-
 .../svc/pages/presentation-layer-spi/HintStore.adoc   |   4 ++--
 .../pages/presentation-layer-spi/LocaleProvider.adoc  |   4 ++--
 .../pages/presentation-layer-spi/MenuBarsService.adoc |   2 +-
 .../pages/presentation-layer-spi/RoutingService.adoc  |   2 +-
 .../presentation-layer-spi/TranslationsResolver.adoc  |   4 ++--
 .../presentation-layer-spi/UserProfileService.adoc    |   2 +-
 .../components/support/modules/ROOT/pages/about.adoc  |   4 ++--
 .../support/modules/dg/pages/asciidoc-templates.adoc  |  12 ++++++------
 .../support/modules/dg/pages/hints-and-tips.adoc      |   4 ++--
 .../support/modules/dg/pages/ide/intellij.adoc        |   2 +-
 antora/components/toc/modules/ROOT/nav.adoc           |   4 ++--
 .../pages/_partials/_powered-by_gesconsultor-grc.adoc |   2 +-
 antora/components/toc/modules/ROOT/pages/about.adoc   |   4 ++--
 .../toc/modules/ROOT/pages/going-deeper/books.adoc    |   4 ++--
 .../pages/what-is-apache-isis/common-use-cases.adoc   |   4 ++--
 .../ROOT/pages/what-is-apache-isis/screencasts.adoc   |  18 +++++++++---------
 .../modules/ROOT/pages/configuring/bulk-load.adoc     |   2 +-
 .../ug-odn/modules/ROOT/pages/hints-and-tips.adoc     |   4 ++--
 .../ROOT/pages/configuring-isis-to-use-shiro.adoc     |   2 +-
 .../ug-sec/modules/ROOT/pages/hints-and-tips.adoc     |   2 +-
 .../modules/ROOT/pages/usage-by-isis-viewers.adoc     |   4 ++--
 .../pages/integ-test-support/wrapper-factory.adoc     |   2 +-
 antora/components/ug/modules/ROOT/pages/about.adoc    |   2 +-
 .../ug/modules/btb/pages/headless-access.adoc         |   4 ++--
 .../ug/modules/btb/pages/hints-and-tips.adoc          |   2 +-
 .../pages/hints-and-tips/transactions-and-errors.adoc |   4 ++--
 antora/components/ug/modules/btb/pages/web-xml.adoc   |   4 ++--
 .../fun/pages/building-blocks/identifiers/oid.adoc    |   2 +-
 .../types-of-domain-objects/view-models.adoc          |   8 ++++----
 .../fun/pages/core-concepts/apache-isis-vs/cqrs.adoc  |   2 +-
 .../core-concepts/apache-isis-vs/mvc-server-side.adoc |   2 +-
 .../fun/pages/core-concepts/deployment-options.adoc   |   2 +-
 .../modules/fun/pages/core-concepts/principles.adoc   |   2 +-
 .../core-concepts/principles/for-the-long-term.adoc   |   2 +-
 .../ug/modules/fun/pages/programming-model.adoc       |   2 +-
 .../domain-services/organizing-services.adoc          |   4 ++--
 .../fun/pages/programming-model/properties.adoc       |   2 +-
 .../view-models/dto/dto-consumers.adoc                |   4 ++--
 .../viewer-restfulobjects/_adoc}/antora.yml           |   4 ++--
 .../viewer-restfulobjects/_adoc}/examples.csv         |   0
 .../_adoc}/modules/ROOT/_attributes.adoc              |   0
 .../_adoc/modules/ROOT/assets/attachments}/.gitkeep   |   0
 .../ro-spec-resources-and-representations.png         | Bin
 .../assets/images/rgfis/service-collaborations.png    | Bin
 .../_adoc/modules/ROOT/examples}/.gitkeep             |   0
 .../_adoc}/modules/ROOT/nav.adoc                      |   0
 .../_adoc}/modules/ROOT/pages/_attributes.adoc        |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc    |   0
 .../_adoc}/modules/ROOT/pages/about.adoc              |   0
 .../_adoc}/modules/ROOT/pages/architecture.adoc       |   4 ++--
 .../modules/ROOT/pages/configuration-properties.adoc  |   6 +++---
 .../_adoc}/modules/ROOT/pages/health-check.adoc       |   0
 .../_adoc}/modules/ROOT/pages/hints-and-tips.adoc     |   4 ++--
 .../ROOT/pages/hints-and-tips/_attributes.adoc        |   0
 .../ROOT/pages/hints-and-tips/angular-tips.adoc       |   0
 .../ROOT/pages/hints-and-tips/pretty-printing.adoc    |   0
 .../pages/hints-and-tips/restful-image-property.adoc  |   0
 .../ROOT/pages/hints-and-tips/troubleshooting.adoc    |   0
 .../pages/hints-and-tips/using-chrome-devtools.adoc   |   0
 .../pages/hints-and-tips/view-model-as-parameter.adoc |   0
 .../_adoc}/modules/ROOT/pages/layout-resources.adoc   |   4 ++--
 .../_adoc}/modules/ROOT/pages/ro-spec.adoc            |   6 +++---
 .../ROOT/pages/simplified-representations.adoc        |   2 +-
 .../simplified-representations}/_attributes.adoc      |   0
 .../simplified-representations/action-invocation.adoc |   4 ++--
 .../apache-isis-profile.adoc                          |   0
 .../configuration-properties.adoc                     |   2 +-
 .../simplified-representations/domain-object.adoc     |   0
 .../simplified-representations/object-collection.adoc |   0
 .../other-representations.adoc                        |   0
 .../viewer-restfulobjects/_adoc}/sync_examples.sh     |   0
 .../modules/ROOT/pages/configuration-properties.adoc  |  18 +++++++++---------
 .../modules/ROOT/pages/customisation/about-page.adoc  |   2 +-
 .../pages/customisation/cheap-n-cheerful-theme.adoc   |   2 +-
 .../ROOT/pages/customisation/custom-javascript.adoc   |   2 +-
 .../pages/customisation/tweaking-css-classes.adoc     |   6 +++---
 .../ROOT/pages/customisation/welcome-page.adoc        |   2 +-
 .../_adoc/modules/ROOT/pages/extending.adoc           |  14 +++++++-------
 .../ROOT/pages/extending/custom-bootstrap-theme.adoc  |   2 +-
 .../modules/ROOT/pages/extending/custom-pages.adoc    |   2 +-
 .../ROOT/pages/extending/replacing-page-elements.adoc |   2 +-
 .../modules/ROOT/pages/features/blob-attachments.adoc |   2 +-
 .../modules/ROOT/pages/features/bookmarked-pages.adoc |   4 ++--
 .../ROOT/pages/features/hints-and-copy-url.adoc       |   2 +-
 .../modules/ROOT/pages/features/recent-pages.adoc     |   4 ++--
 .../ROOT/pages/features/sidebar-vs-modal-dialogs.adoc |   2 +-
 .../modules/ROOT/pages/features/titles-in-tables.adoc |   2 +-
 .../ROOT/pages/features/user-registration.adoc        |   2 +-
 .../_adoc/modules/ROOT/pages/features/where-am-i.adoc |   2 +-
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc      |   4 ++--
 .../_adoc/modules/ROOT/pages/incode-platform.adoc     |   2 +-
 .../_adoc/modules/ROOT/pages/layout.adoc              |   2 +-
 .../modules/ROOT/pages/layout/annotation-based.adoc   |   4 ++--
 .../_adoc/modules/ROOT/pages/layout/file-based.adoc   |   8 ++++----
 .../ROOT/pages/menubars-layout/file-based.adoc        |   2 +-
 .../helloworld/_adoc/modules/ROOT/pages/about.adoc    |   4 ++--
 .../simpleapp/_adoc/modules/ROOT/pages/about.adoc     |   2 +-
 site.yml                                              |   2 +-
 209 files changed, 324 insertions(+), 324 deletions(-)

diff --git a/antora/components/rg/modules/ROOT/pages/about.adoc b/antora/components/rg/modules/ROOT/pages/about.adoc
index ebc273a..3e23146 100644
--- a/antora/components/rg/modules/ROOT/pages/about.adoc
+++ b/antora/components/rg/modules/ROOT/pages/about.adoc
@@ -6,8 +6,8 @@ Apache Isis documentation is broken out into a number of user, reference and "su
 The user guides available are:
 
 * xref:ug:fun:about.adoc[Fundamentals]
-* xref:ug:vw:about.adoc[Wicket viewer]
-* xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
+* xref:vw:ROOT:about.adoc[Wicket viewer]
+* xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
 * xref:ug:sec:about.adoc[Security] (this guide)
 * xref:ug:tst:about.adoc[Testing]
diff --git a/antora/components/rg/modules/ant/pages/Action.adoc b/antora/components/rg/modules/ant/pages/Action.adoc
index ca57dd5..cc6f625 100644
--- a/antora/components/rg/modules/ant/pages/Action.adoc
+++ b/antora/components/rg/modules/ant/pages/Action.adoc
@@ -92,7 +92,7 @@ Currently this is only supported for no-arg actions.
 (`NON_IDEMPOTENT`)
 |the action's semantics (ie whether objects are modified as the result of invoking this action, and if so whether reinvoking the action would result in no further change; if not whether the results can be cached for the remainder of the request).
 
-The `...ARE_YOU_SURE` variants cause a confirmation dialog to be displayed in the xref:ug:vw:about.adoc[Wicket viewer].
+The `...ARE_YOU_SURE` variants cause a confirmation dialog to be displayed in the xref:vw:ROOT:about.adoc[Wicket viewer].
 
 |xref:rg:ant:Action/typeOf.adoc[`typeOf()`]
 |(none)
diff --git a/antora/components/rg/modules/ant/pages/Action/hidden.adoc b/antora/components/rg/modules/ant/pages/Action/hidden.adoc
index 81a2aa3..e16ce28 100644
--- a/antora/components/rg/modules/ant/pages/Action/hidden.adoc
+++ b/antora/components/rg/modules/ant/pages/Action/hidden.adoc
@@ -9,7 +9,7 @@ Actions can be hidden at the domain-level, indicating that they are not visible
 
 [TIP]
 ====
-It is also possible to use xref:rg:ant:ActionLayout/hidden.adoc[`@ActionLayout#hidden()`] or xref:ug:vw:layout/file-based.adoc[file-based layouts] such that the action can be hidden at the view layer.
+It is also possible to use xref:rg:ant:ActionLayout/hidden.adoc[`@ActionLayout#hidden()`] or xref:vw:ROOT:layout/file-based.adoc[file-based layouts] such that the action can be hidden at the view layer.
 Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
 ====
 
diff --git a/antora/components/rg/modules/ant/pages/Action/semantics.adoc b/antora/components/rg/modules/ant/pages/Action/semantics.adoc
index 692ae67..6566d0d 100644
--- a/antora/components/rg/modules/ant/pages/Action/semantics.adoc
+++ b/antora/components/rg/modules/ant/pages/Action/semantics.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 
 The `semantics()` attribute describes whether the invocation modifies state of the system, and if so whether it does so idempotently.  If the action invocation does _not_ modify the state of the system, in other words is safe, then it also can beused to specify whether the results of the action can be cached automatically for the remainder of the request.
 
-The attribute was originally introduced for the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] in order that action invocations could be using the appropriate `HTTP` verb (`GET`, `PUT` and `POST`).
+The attribute was originally introduced for the xref:vro:ROOT::about.adoc[RestfulObjects viewer] in order that action invocations could be using the appropriate `HTTP` verb (`GET`, `PUT` and `POST`).
 
 The table below summarizes the semantics:
 
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout.adoc b/antora/components/rg/modules/ant/pages/ActionLayout.adoc
index e7d014e..dfbced7 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout.adoc
@@ -34,7 +34,7 @@ For a domain service action to be contributed, the domain services must have a x
 |Any string valid as a CSS class
 |an additional CSS class around the HTML that represents for the action, to allow targetted styling in xref:rg:cfg:application-specific/application-css.adoc[`application.css`]. +
 
-Supported by the xref:ug:vw:about.adoc[Wicket viewer] but currently ignored by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+Supported by the xref:vw:ROOT:about.adoc[Wicket viewer] but currently ignored by the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 
 
 |xref:rg:ant:ActionLayout/cssClassFa.adoc[`cssClassFa()`]
@@ -98,7 +98,7 @@ public class ToDoItems {
 
 [TIP]
 ====
-As an alternative to using the `@ActionLayout` annotation, a xref:ug:vw:layout/file-based.adoc[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
+As an alternative to using the `@ActionLayout` annotation, a xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/bookmarking.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/bookmarking.adoc
index 4643c27..e8fa049 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/bookmarking.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/bookmarking.adoc
@@ -9,18 +9,18 @@ The `bookmarking()` attribute indicates if an action (with safe xref:rg:ant:Acti
 
 
 
-In the xref:ug:vw:about.adoc[Wicket viewer], a link to a bookmarked object is shown in the bookmarks panel:
+In the xref:vw:ROOT:about.adoc[Wicket viewer], a link to a bookmarked object is shown in the bookmarks panel:
 
 image::reference-annotations/ActionLayout/bookmarking.png[width="720px",link="{imagesdir}/reference-annotations/ActionLayout/bookmarking.png"]
 
 [NOTE]
 ====
-Note that this screenshot shows an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot shows an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 [TIP]
 ====
-The xref:ug:vw:about.adoc[Wicket viewer] supports `alt-[` as a shortcut for opening the bookmark panel.  `Esc` will close.
+The xref:vw:ROOT:about.adoc[Wicket viewer] supports `alt-[` as a shortcut for opening the bookmark panel.  `Esc` will close.
 ====
 
 
@@ -50,7 +50,7 @@ The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmar
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/cssClass.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/cssClass.adoc
index a13451e..26d48fa 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/cssClass.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/cssClass.adoc
@@ -28,7 +28,7 @@ to apply CSS, specifically to add http://fortawesome.github.io/Font-Awesome/icon
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 == See also
 
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/cssClassFa.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
index 3c8b92d..1677880 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
@@ -31,7 +31,7 @@ There can be multiple "fa-" classes, eg to mirror or rotate the icon. There is n
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 [NOTE]
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/describedAs.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/describedAs.adoc
index 1cdf5bd..b3fb416 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/describedAs.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/describedAs.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The `describedAs()` attribute is used to provide a short description of the action to the user.  In the xref:ug:vw:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
+The `describedAs()` attribute is used to provide a short description of the action to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
 
 
 For example:
@@ -22,7 +22,7 @@ public class Customer {
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/hidden.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/hidden.adoc
index 7af3bbb..014ff18 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/hidden.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/hidden.adoc
@@ -45,7 +45,7 @@ For actions of domain services the visibility is dependent upon its xref:rg:ant:
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/named.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/named.adoc
index fe75ec8..261c7d5 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/named.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/named.adoc
@@ -28,7 +28,7 @@ public class Customer {
 == Alternatives
 
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 The framework also provides a separate, powerful mechanism for xref:ug:btb:i18n.adoc[internationalization].
 
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/position.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/position.adoc
index efa7bdb..392c976 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/position.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/position.adoc
@@ -38,7 +38,7 @@ public class Customer {
 <3> give the action an abbreviated name, because the fact that the "status" property is to be updated is implied by its positioning
 
 
-The default is `BELOW`, which is rendered (by the xref:ug:vw:about.adoc[Wicket viewer]) as shown below:
+The default is `BELOW`, which is rendered (by the xref:vw:ROOT:about.adoc[Wicket viewer]) as shown below:
 
 image::reference-annotations/ActionLayout/position-BELOW.png[width="720px",link="{imagesdir}/reference-annotations/ActionLayout/position-BELOW.png"]
 
@@ -67,6 +67,6 @@ If there are multiple actions associated with a single property then the positio
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 The fact that the layout is dynamic (does not require a rebuild/restart) is particularly useful in that the look-n-feel can be easily experimented with and adjusted.
\ No newline at end of file
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/promptStyle.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/promptStyle.adoc
index a2615d6..8d2dd12 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/promptStyle.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/promptStyle.adoc
@@ -4,9 +4,9 @@ include::_attributes.adoc[]
 
 
 The `promptStyle()` attribute is used to specify whether, when invoking an action associated with a domain object property, the parameters for the action are prompted either in modal dialog box, a (non-modal) sidebar dialog box, or is prompted using an inline panel (replacing the property on the page).
-For more on sidebar vs modal dialogs, see xref:ug:vw:features/sidebar-vs-modal-dialogs.adoc[Wicket viewer features].
+For more on sidebar vs modal dialogs, see xref:vw:ROOT:features/sidebar-vs-modal-dialogs.adoc[Wicket viewer features].
 
-The prompt style is influenced by two xref:ug:vw:configuration-properties.adoc[configuration properties]:
+The prompt style is influenced by two xref:vw:ROOT:configuration-properties.adoc[configuration properties]:
 
 * if the `promptStyle()` attribute is set to `DIALOG`, then a configuration property is used to determine whether to render using a modal dialog or a sidebar:
 
@@ -55,6 +55,6 @@ The net effect is that a property conceptually consisting of different parts (eg
 == Alternatives
 
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/redirect.adoc b/antora/components/rg/modules/ant/pages/ActionLayout/redirect.adoc
index f128ba4..b5b8bd5 100644
--- a/antora/components/rg/modules/ant/pages/ActionLayout/redirect.adoc
+++ b/antora/components/rg/modules/ant/pages/ActionLayout/redirect.adoc
@@ -19,7 +19,7 @@ Any properties with xref:rg:ant:PropertyLayout/unchanging.adoc[`@PropertyLayout#
 
 * if set to `EVEN_IF_SAME`, then a redirect occurs and a new web page is rendered.
 
-* if set to `AS_CONFIGURED`, then the default behaviour is as specified by the `isis.viewer.wicket.redirectEvenIfSameObject` xref:ug:vw:configuration-properties.adoc[configuration property]).
+* if set to `AS_CONFIGURED`, then the default behaviour is as specified by the `isis.viewer.wicket.redirectEvenIfSameObject` xref:vw:ROOT:configuration-properties.adoc[configuration property]).
 
 One use case for choosing `EVEN_IF_SAME` is if the action "returning this" is intended in some way to require that the object use a different layout, as per multiple layout support, as specified using the xref:rg:cms:methods/reserved/layout.adoc[`layout()`] method.
 
@@ -55,6 +55,6 @@ If `switchToEditMode()` action is invoked, then the UI will attempt to render th
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
diff --git a/antora/components/rg/modules/ant/pages/Collection/domainEvent.adoc b/antora/components/rg/modules/ant/pages/Collection/domainEvent.adoc
index 39d10f8..8d7bd7c 100644
--- a/antora/components/rg/modules/ant/pages/Collection/domainEvent.adoc
+++ b/antora/components/rg/modules/ant/pages/Collection/domainEvent.adoc
@@ -17,7 +17,7 @@ Subscribers subscribe through the xref:rg:svc:core-domain-api/EventBusService.ad
 
 [WARNING]
 ====
-The xref:ug:vw:about.adoc[Wicket viewer] does _not_ currently support the modification of collections; they are rendered read-only.
+The xref:vw:ROOT:about.adoc[Wicket viewer] does _not_ currently support the modification of collections; they are rendered read-only.
 However, domain events are still relevant to determine if such collections should be hidden.
 
 The workaround is to create add/remove actions and use xref:rg:ant:MemberOrder.adoc[UI hints] to render them close to the collection.
diff --git a/antora/components/rg/modules/ant/pages/Collection/editing.adoc b/antora/components/rg/modules/ant/pages/Collection/editing.adoc
index 6b700dd..d8cb978 100644
--- a/antora/components/rg/modules/ant/pages/Collection/editing.adoc
+++ b/antora/components/rg/modules/ant/pages/Collection/editing.adoc
@@ -10,7 +10,7 @@ The related `editingDisabledReason()` attribute specifies the a hard-coded reaso
 
 [WARNING]
 ====
-The xref:ug:vw:about.adoc[Wicket viewer] does *not* currently support the modification of collections; they are rendered read-only.
+The xref:vw:ROOT:about.adoc[Wicket viewer] does *not* currently support the modification of collections; they are rendered read-only.
 
 The workaround is to create add/remove actions and use xref:rg:ant:MemberOrder.adoc[UI hints] to render them close to the collection.
 ====
diff --git a/antora/components/rg/modules/ant/pages/Collection/hidden.adoc b/antora/components/rg/modules/ant/pages/Collection/hidden.adoc
index 1aa5316..0f1ef00 100644
--- a/antora/components/rg/modules/ant/pages/Collection/hidden.adoc
+++ b/antora/components/rg/modules/ant/pages/Collection/hidden.adoc
@@ -8,7 +8,7 @@ Collections can be hidden at the domain-level, indicating that they are not visi
 
 [TIP]
 ====
-It is also possible to use xref:rg:ant:CollectionLayout/hidden.adoc[`@CollectionLayout#hidden()`] or using xref:ug:vw:layout/file-based.adoc[file-based layout] such that the collection can be hidden at the view layer.
+It is also possible to use xref:rg:ant:CollectionLayout/hidden.adoc[`@CollectionLayout#hidden()`] or using xref:vw:ROOT:layout/file-based.adoc[file-based layout] such that the collection can be hidden at the view layer.
 Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
 ====
 
@@ -48,9 +48,9 @@ The other values of the `Where` enum have no meaning for a collection.
 
 [NOTE]
 ====
-The xref:ug:vw:about.adoc[Wicket viewer] suppresses collections when displaying lists of objects.
+The xref:vw:ROOT:about.adoc[Wicket viewer] suppresses collections when displaying lists of objects.
 
-The xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] by default suppress collections when rendering a domain object.
+The xref:vro:ROOT::about.adoc[RestfulObjects viewer] by default suppress collections when rendering a domain object.
 ====
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout.adoc
index 40f24c9..498e82b 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout.adoc
@@ -88,7 +88,7 @@ public class ToDoItem {
 
 [TIP]
 ====
-As an alternative to using the `@CollectionLayout` annotation, a xref:ug:vw:layout/file-based.adoc[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
+As an alternative to using the `@CollectionLayout` annotation, a xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/cssClass.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout/cssClass.adoc
index 2cba240..d996319 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout/cssClass.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout/cssClass.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
 == Alternatives
 
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/defaultView.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout/defaultView.adoc
index a6d0546..1c6cb6e 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout/defaultView.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout/defaultView.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The xref:ug:vw:about.adoc[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the excel, fullcalendar2 and gmap3 provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^].
+The xref:vw:ROOT:about.adoc[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the excel, fullcalendar2 and gmap3 provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^].
 If the objects to be rendered have the correct "shape", then the appropriate view will be made available.  For example, objects with a date can be rendered using `calendar`; objects with locations can be rendered using `map`.
 
 The `defaultView()` attribute is used to select which of these views should be used by default for a given collection.
@@ -33,5 +33,5 @@ This attribute takes precedence over any value for the xref:rg:ant:CollectionLay
 == Alternatives
 
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/describedAs.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout/describedAs.adoc
index e453f93..0920874 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout/describedAs.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout/describedAs.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The `describedAs()` attribute is used to provide a short description of the collection to the user.  In the xref:ug:vw:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
+The `describedAs()` attribute is used to provide a short description of the collection to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
 
 The `describedAs()` attribute can also be specified for xref:rg:ant:PropertyLayout/describedAs.adoc[properties], xref:rg:ant:ActionLayout/describedAs.adoc[actions], xref:rg:ant:ParameterLayout/describedAs.adoc[parameters], xref:rg:ant:DomainObjectLayout/describedAs.adoc[domain objects] and xref:rg:ant:ViewModelLayout/describedAs.adoc[view models].
 
@@ -25,5 +25,5 @@ public class ToDoItem {
 == Alternatives
 
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/hidden.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout/hidden.adoc
index d9d83b7..c2633ee 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout/hidden.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout/hidden.adoc
@@ -50,7 +50,7 @@ The other values of the `Where` enum have no meaning for a collection.
 == Alternatives
 
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/named.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout/named.adoc
index 42670f4..dc32069 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout/named.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout/named.adoc
@@ -36,7 +36,7 @@ public class ToDoItem {
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 The framework also provides a separate, powerful mechanism for xref:ug:btb:i18n.adoc[internationalization].
 
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/paged.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout/paged.adoc
index c7e3abf..052c54b 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout/paged.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout/paged.adoc
@@ -9,8 +9,8 @@ The `paged()` attribute specifies the number of rows to display in a (parented)
 
 [WARNING]
 ====
-The xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] currently does not support paging.
-The xref:ug:vw:about.adoc[Wicket viewer] _does_ support paging, but note that the paging is performed client-side rather than server-side.
+The xref:vro:ROOT::about.adoc[RestfulObjects viewer] currently does not support paging.
+The xref:vw:ROOT:about.adoc[Wicket viewer] _does_ support paging, but note that the paging is performed client-side rather than server-side.
 
 We therefore recommend that large collections should instead be modelled as actions (to allow filtering to be applied to limit the number of rows).
 ====
@@ -33,7 +33,7 @@ It is also possible to specify a global default for the page size of standalone
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/sortedBy.adoc b/antora/components/rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
index af090cc..8df8de7 100644
--- a/antora/components/rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
+++ b/antora/components/rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
@@ -35,7 +35,7 @@ image::reference-annotations/CollectionLayout/sortedby-dependencies.png[width="7
 
 [NOTE]
 ====
-Note that this screenshot shows an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot shows an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 
@@ -45,4 +45,4 @@ Without this annotation, the order would have been inverted (because the natural
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
\ No newline at end of file
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
\ No newline at end of file
diff --git a/antora/components/rg/modules/ant/pages/Discriminator.adoc b/antora/components/rg/modules/ant/pages/Discriminator.adoc
index f6ab71d..355070c 100644
--- a/antora/components/rg/modules/ant/pages/Discriminator.adoc
+++ b/antora/components/rg/modules/ant/pages/Discriminator.adoc
@@ -22,8 +22,8 @@ This can appear in several contexts, including:
  (see xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:rg:cms:schema/cmd.adoc[command] and xref:rg:cms:schema/ixn.adoc[interaction] schemas
-* in the URLs of the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]
-* in the URLs of the xref:ug:vw:about.adoc[Wicket viewer] (in general and in particular if xref:ug:vw:features/hints-and-copy-url.adoc[copying URLs])
+* in the URLs of the xref:vro:ROOT::about.adoc[RestfulObjects viewer]
+* in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] (in general and in particular if xref:vw:ROOT:features/hints-and-copy-url.adoc[copying URLs])
 * in XML snapshots generated by the xref:rg:svc:integration-api/XmlSnapshotService.adoc[`XmlSnapshotService`]
 
 
@@ -62,7 +62,7 @@ If only `schema` is defined, then the value is "`schema.className`".
 This might be obvious, but to make explicit: we recommend that you always specify an object type for your domain objects.
 
 Otherwise, if you refactor your code (change class name or move package), then any externally held references to the OID of the object will break.
-At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:vro:ROOT::about.adoc[Restful Objects] viewer to break.
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/bounding.adoc b/antora/components/rg/modules/ant/pages/DomainObject/bounding.adoc
index 1c3c904..c51633e 100644
--- a/antora/components/rg/modules/ant/pages/DomainObject/bounding.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainObject/bounding.adoc
@@ -9,7 +9,7 @@ Often these are "reference" ("standing") data, or lookup data/pick lists.
 Typical examples could include categories, countries, states, and tax or interest rate tables.
 
 Where the number of instances is relatively small, ie bounded, then the `bounding()` attribute can be used as a hint.
-For such domain objects the framework will automatically allow instances to be selected; xref:ug:vw:about.adoc[Wicket viewer] displays these as a drop-down list.
+For such domain objects the framework will automatically allow instances to be selected; xref:vw:ROOT:about.adoc[Wicket viewer] displays these as a drop-down list.
 
 
 For example:
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/objectType.adoc b/antora/components/rg/modules/ant/pages/DomainObject/objectType.adoc
index 7ce3542..a8d32fd 100644
--- a/antora/components/rg/modules/ant/pages/DomainObject/objectType.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainObject/objectType.adoc
@@ -12,8 +12,8 @@ This can appear in several contexts, including:
  (see xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`])
 ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:rg:cms:schema/cmd.adoc[command] and xref:rg:cms:schema/ixn.adoc[interaction] schemas
-* in the URLs of the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]
-* in the URLs of the xref:ug:vw:about.adoc[Wicket viewer] (in general and in particular if xref:ug:vw:features/hints-and-copy-url.adoc[copying URLs])
+* in the URLs of the xref:vro:ROOT::about.adoc[RestfulObjects viewer]
+* in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] (in general and in particular if xref:vw:ROOT:features/hints-and-copy-url.adoc[copying URLs])
 * in XML snapshots generated by the xref:rg:svc:integration-api/XmlSnapshotService.adoc[`XmlSnapshotService`]
 
 
@@ -52,7 +52,7 @@ If only `schema` is defined, then the value is "`schema.className`".
 This might be obvious, but to make explicit: we recommend that you always specify an object type for your domain objects.
 
 Otherwise, if you refactor your code (change class name or move package), then any externally held references to the OID of the object will break.
-At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:vro:ROOT::about.adoc[Restful Objects] viewer to break.
 ====
 
 [NOTE]
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout.adoc b/antora/components/rg/modules/ant/pages/DomainObjectLayout.adoc
index 6ad8253..5556d30 100644
--- a/antora/components/rg/modules/ant/pages/DomainObjectLayout.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainObjectLayout.adoc
@@ -112,7 +112,7 @@ public class ToDoItem {
 
 [NOTE]
 ====
-Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:ug:vw:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:vw:ROOT:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc b/antora/components/rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
index 4439ac8..dd40799 100644
--- a/antora/components/rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
@@ -13,7 +13,7 @@ image::reference-annotations/DomainObjectLayout/bookmarking.png[width="720px",li
 
 [NOTE]
 ====
-Note that this screenshot shows an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot shows an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 For example:
@@ -37,7 +37,7 @@ image::reference-annotations/DomainObjectLayout/bookmarking-nested.png[width="72
 
 [NOTE]
 ====
-Note that this screenshot shows an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot shows an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc b/antora/components/rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
index 93c73d6..093286c 100644
--- a/antora/components/rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 The `describedAs()` attribute is used to provide a short description of the domain object to the user.
-In the xref:ug:vw:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
+In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
 
 For example:
 
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/paged.adoc b/antora/components/rg/modules/ant/pages/DomainObjectLayout/paged.adoc
index 0e558d8..ca07b79 100644
--- a/antora/components/rg/modules/ant/pages/DomainObjectLayout/paged.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainObjectLayout/paged.adoc
@@ -10,8 +10,8 @@ The `paged()` attribute specifies the number of rows to display in a standalone
 
 [WARNING]
 ====
-The xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] currently does not support paging.
-The xref:ug:vw:about.adoc[Wicket viewer] _does_ support paging, but note that the paging is performed client-side rather than server-side.
+The xref:vro:ROOT::about.adoc[RestfulObjects viewer] currently does not support paging.
+The xref:vw:ROOT:about.adoc[Wicket viewer] _does_ support paging, but note that the paging is performed client-side rather than server-side.
 
 We therefore recommend that large collections should instead be modelled as actions (to allow filtering to be applied to limit the number of rows).
 ====
diff --git a/antora/components/rg/modules/ant/pages/DomainService.adoc b/antora/components/rg/modules/ant/pages/DomainService.adoc
index 9efcb86..593272a 100644
--- a/antora/components/rg/modules/ant/pages/DomainService.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainService.adoc
@@ -22,7 +22,7 @@ The table below summarizes the annotation's attributes.
 
 |xref:rg:ant:DomainService/nature.adoc[`nature()`]
 |`VIEW`, `VIEW_MENU_ONLY`, `VIEW_CONTRIBUTIONS_ONLY`, `VIEW_REST_ONLY`, `DOMAIN` (`VIEW`)
-|the nature of this service: providing actions for menus, or as contributed actions, or for the xref:ug-vro:ROOT:about.adoc[RestfulObjects REST API], or neither
+|the nature of this service: providing actions for menus, or as contributed actions, or for the xref:vro:ROOT::about.adoc[RestfulObjects REST API], or neither
 
 
 |xref:rg:ant:DomainService/objectType.adoc[`objectType()`]
diff --git a/antora/components/rg/modules/ant/pages/DomainService/nature.adoc b/antora/components/rg/modules/ant/pages/DomainService/nature.adoc
index ba4d1fe..0219bbd 100644
--- a/antora/components/rg/modules/ant/pages/DomainService/nature.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainService/nature.adoc
@@ -25,7 +25,7 @@ The related xref:rg:ant:ActionLayout/contributedAs.adoc[`@ActionLayout#contribut
 
 * `VIEW_REST_ONLY` +
 +
-The service's actions are intended only to be listed in the REST API exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+The service's actions are intended only to be listed in the REST API exposed by the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 
 * `DOMAIN` +
 +
diff --git a/antora/components/rg/modules/ant/pages/DomainService/objectType.adoc b/antora/components/rg/modules/ant/pages/DomainService/objectType.adoc
index 4619ccc..243c4e6 100644
--- a/antora/components/rg/modules/ant/pages/DomainService/objectType.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainService/objectType.adoc
@@ -11,8 +11,8 @@ This can appear in several contexts, including:
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
  (see xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`])
 * in the serialization of `OidDto` in the xref:rg:cms:schema/cmd.adoc[command] and xref:rg:cms:schema/ixn.adoc[interaction] schemas
-* in the URLs of the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]
-* in the URLs of the xref:ug:vw:about.adoc[Wicket viewer] (specifically, for bookmarked actions)
+* in the URLs of the xref:vro:ROOT::about.adoc[RestfulObjects viewer]
+* in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] (specifically, for bookmarked actions)
 
 
 
@@ -46,7 +46,7 @@ The rules of precedence are:
 This might be obvious, but to make explicit: we recommend that you always specify an object type for your domain services.
 
 Otherwise, if you refactor your code (change class name or move package), then any externally held references to the OID of the service will break.
-At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:vro:ROOT::about.adoc[Restful Objects] viewer to break.
 ====
 
 [NOTE]
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout.adoc b/antora/components/rg/modules/ant/pages/DomainServiceLayout.adoc
index f873088..283c6a6 100644
--- a/antora/components/rg/modules/ant/pages/DomainServiceLayout.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainServiceLayout.adoc
@@ -8,7 +8,7 @@ The `@DomainServiceLayout` annotation applies to domain services, collecting tog
 
 [TIP]
 ====
-You will also find some additional material in the xref:ug:vw:layout/application-menu.adoc[object layout] chapter.
+You will also find some additional material in the xref:vw:ROOT:layout/application-menu.adoc[object layout] chapter.
 ====
 
 
@@ -62,7 +62,7 @@ public class ToDoItems {
 
 [NOTE]
 ====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ug:vw:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:vw:ROOT:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc b/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
index ce951ee..098a6c0 100644
--- a/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
@@ -17,7 +17,7 @@ public class ToDoItems {
 }
 ----
 
-In the xref:ug:vw:about.adoc[Wicket viewer], domain services placed on the `PRIMARY` menu bar appears to the left:
+In the xref:vw:ROOT:about.adoc[Wicket viewer], domain services placed on the `PRIMARY` menu bar appears to the left:
 
 image::reference-annotations/DomainServiceLayout/menuBar-primary.png[width="720px",link="{imagesdir}/reference-annotations/DomainServiceLayout/menuBar-primary.png"]
 
@@ -36,6 +36,6 @@ The grouping of multiple domain services actions within a single drop-down is ma
 
 [NOTE]
 ====
-The xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] does not support this attribute.
+The xref:vro:ROOT::about.adoc[RestfulObjects viewer] does not support this attribute.
 ====
 
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc b/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
index cc66ec3..8936210 100644
--- a/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
+++ b/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
@@ -18,7 +18,7 @@ For example, the screenshot below shows the "prototyping" menu from the (non-ASF
 image::reference-annotations/DomainServiceLayout/menuOrder.png[width="500px",link="{imagesdir}/reference-annotations/DomainServiceLayout/menuOrder.png"]
 
 
-The xref:ug:vw:about.adoc[Wicket viewer] automatically places separators between actions from different domain services.  From this we can infer that there are actually five different domain services that are all rendered on the "prototyping" top-level menu.
+The xref:vw:ROOT:about.adoc[Wicket viewer] automatically places separators between actions from different domain services.  From this we can infer that there are actually five different domain services that are all rendered on the "prototyping" top-level menu.
 
 One of these is the todoapp's `DemoDomainEventSubscriptions` service:
 
diff --git a/antora/components/rg/modules/ant/pages/HomePage.adoc b/antora/components/rg/modules/ant/pages/HomePage.adoc
index fb60265..34b5b75 100644
--- a/antora/components/rg/modules/ant/pages/HomePage.adoc
+++ b/antora/components/rg/modules/ant/pages/HomePage.adoc
@@ -43,7 +43,7 @@ public class ToDoAppDashboard {
     public Blob exportToWordDoc() { /* ... */ }  // <1>
 }
 ----
-<1> associated using xref:ug:vw:layout/file-based.adoc[file-based layout] with the `notYetComplete` collection.
+<1> associated using xref:vw:ROOT:layout/file-based.adoc[file-based layout] with the `notYetComplete` collection.
 
 The other two actions shown in the above screenshot -- `exportAsXml` and `downloadLayout` -- are actually contributed to the `ToDoAppDashboard` through various domain services, as is the `downloadLayout` action.
 
diff --git a/antora/components/rg/modules/ant/pages/MemberOrder.adoc b/antora/components/rg/modules/ant/pages/MemberOrder.adoc
index 575e5ca..e46a550 100644
--- a/antora/components/rg/modules/ant/pages/MemberOrder.adoc
+++ b/antora/components/rg/modules/ant/pages/MemberOrder.adoc
@@ -13,7 +13,7 @@ The annotation defines two attributes:
 * xref:rg:ant:MemberOrder/name.adoc[`name()`]
 * xref:rg:ant:MemberOrder/sequence.adoc[`sequence()`]
 
-As this is an important topic, there is a xref:ug:vw:layout.adoc[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:vw:ROOT:layout.adoc[separate chapter] that discussed object layout in full.
 
 
 [TIP]
diff --git a/antora/components/rg/modules/ant/pages/MemberOrder/name.adoc b/antora/components/rg/modules/ant/pages/MemberOrder/name.adoc
index a821839..3a4e9f3 100644
--- a/antora/components/rg/modules/ant/pages/MemberOrder/name.adoc
+++ b/antora/components/rg/modules/ant/pages/MemberOrder/name.adoc
@@ -7,5 +7,5 @@ include::_attributes.adoc[]
 
 Broadly speaking the `name()` attribute is used to group or associate members together.
 
-As this is an important topic, there is a xref:ug:vw:layout.adoc[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:vw:ROOT:layout.adoc[separate chapter] that discussed object layout in full.
 
diff --git a/antora/components/rg/modules/ant/pages/MemberOrder/sequence.adoc b/antora/components/rg/modules/ant/pages/MemberOrder/sequence.adoc
index e651c27..0eb48c1 100644
--- a/antora/components/rg/modules/ant/pages/MemberOrder/sequence.adoc
+++ b/antora/components/rg/modules/ant/pages/MemberOrder/sequence.adoc
@@ -7,4 +7,4 @@ include::_attributes.adoc[]
 
 Broadly speaking the `sequence()` attribute orders members once they have been grouped.
 
-As this is an important topic, there is a xref:ug:vw:layout.adoc[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:vw:ROOT:layout.adoc[separate chapter] that discussed object layout in full.
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout.adoc b/antora/components/rg/modules/ant/pages/ParameterLayout.adoc
index 2fce193..afb6900 100644
--- a/antora/components/rg/modules/ant/pages/ParameterLayout.adoc
+++ b/antora/components/rg/modules/ant/pages/ParameterLayout.adoc
@@ -101,7 +101,7 @@ public class ToDoItem {
 
 [NOTE]
 ====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ug:vw:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:vw:ROOT:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/describedAs.adoc b/antora/components/rg/modules/ant/pages/ParameterLayout/describedAs.adoc
index 3fe7ab1..8824f79 100644
--- a/antora/components/rg/modules/ant/pages/ParameterLayout/describedAs.adoc
+++ b/antora/components/rg/modules/ant/pages/ParameterLayout/describedAs.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The `describedAs()` attribute is used to provide a short description of the action parameter to the user.  In the xref:ug:vw:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.  The `describedAs()` attribute can also be specified for xref:rg:ant:CollectionLayout/describedAs.adoc[collections],  xref:rg:ant:PropertyLayout/describedAs.adoc[properties], xref:rg:ant:ActionLayout/describedAs.adoc[actions], xref:rg:ant:DomainObjectLayout/describedAs.adoc[domain objects] and xref:rg:ant:V [...]
+The `describedAs()` attribute is used to provide a short description of the action parameter to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.  The `describedAs()` attribute can also be specified for xref:rg:ant:CollectionLayout/describedAs.adoc[collections],  xref:rg:ant:PropertyLayout/describedAs.adoc[properties], xref:rg:ant:ActionLayout/describedAs.adoc[actions], xref:rg:ant:DomainObjectLayout/describedAs.adoc[domain objects] and xref:rg:ant [...]
 
 Descriptions may be provided for objects, members (properties, collections and actions), and for individual parameters within an action method.
 
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/labelPosition.adoc b/antora/components/rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
index d9f98b6..7897e08 100644
--- a/antora/components/rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
+++ b/antora/components/rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
@@ -34,7 +34,7 @@ public class Order {
 ----
 
 
-To get an idea of how these are rendered (in the xref:ug:vw:about.adoc[Wicket viewer]), see xref:rg:ant:PropertyLayout/labelPosition.adoc[PropertyLayout#labelPosition()].
+To get an idea of how these are rendered (in the xref:vw:ROOT:about.adoc[Wicket viewer]), see xref:rg:ant:PropertyLayout/labelPosition.adoc[PropertyLayout#labelPosition()].
 
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/typicalLength.adoc b/antora/components/rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
index e5f50f7..f901f53 100644
--- a/antora/components/rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
+++ b/antora/components/rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
@@ -9,7 +9,7 @@ It is ignored for parameters of other types.
 The attribute is also supported for xref:rg:ant:PropertyLayout/typicalLength.adoc[properties].
 
 The information is intended as a hint to the UI to determine the space that should be given to render a particular string parameter.
-That said, note that the xref:ug:vw:about.adoc[Wicket viewer] uses the maximum space available for all fields, so in effect ignores this attribute.
+That said, note that the xref:vw:ROOT:about.adoc[Wicket viewer] uses the maximum space available for all fields, so in effect ignores this attribute.
 
 For example:
 
diff --git a/antora/components/rg/modules/ant/pages/PersistenceCapable.adoc b/antora/components/rg/modules/ant/pages/PersistenceCapable.adoc
index a4a78c1..d819399 100644
--- a/antora/components/rg/modules/ant/pages/PersistenceCapable.adoc
+++ b/antora/components/rg/modules/ant/pages/PersistenceCapable.adoc
@@ -23,8 +23,8 @@ This can appear in several contexts, including:
  (see xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:rg:cms:schema/cmd.adoc[command] and xref:rg:cms:schema/ixn.adoc[interaction] schemas
-* in the URLs of the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]
-* in the URLs of the xref:ug:vw:about.adoc[Wicket viewer] (in general and in particular if xref:ug:vw:features/hints-and-copy-url.adoc[copying URLs])
+* in the URLs of the xref:vro:ROOT::about.adoc[RestfulObjects viewer]
+* in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] (in general and in particular if xref:vw:ROOT:features/hints-and-copy-url.adoc[copying URLs])
 * in XML snapshots generated by the xref:rg:svc:integration-api/XmlSnapshotService.adoc[`XmlSnapshotService`]
 
 
@@ -90,7 +90,7 @@ If only `schema` is defined, then the value is "`schema.className`".
 This might be obvious, but to make explicit: we recommend that you always specify an object type for your domain objects.
 
 Otherwise, if you refactor your code (change class name or move package), then any externally held references to the OID of the object will break.
-At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:vro:ROOT::about.adoc[Restful Objects] viewer to break.
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/Property/hidden.adoc b/antora/components/rg/modules/ant/pages/Property/hidden.adoc
index a287cfc..8b5e851 100644
--- a/antora/components/rg/modules/ant/pages/Property/hidden.adoc
+++ b/antora/components/rg/modules/ant/pages/Property/hidden.adoc
@@ -63,7 +63,7 @@ tables. Annotating with `@Property(where=Where.NOWHERE)` overrides this.
 
 [NOTE]
 ====
-The xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] has only partial support for these `Where` enums.
+The xref:vro:ROOT::about.adoc[RestfulObjects viewer] has only partial support for these `Where` enums.
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout.adoc
index 23b3c0c..e970e99 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout.adoc
@@ -120,7 +120,7 @@ It is also possible to apply the annotation to actions of domain services that a
 
 [TIP]
 ====
-As an alternative to using the `@PropertyLayout` annotation, a xref:ug:vw:layout/file-based.adoc[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
+As an alternative to using the `@PropertyLayout` annotation, a xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used (and is generally to be preferred since it is more flexible/powerful).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/cssClass.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/cssClass.adoc
index 5145561..55265f5 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/cssClass.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/cssClass.adoc
@@ -21,7 +21,7 @@ public class ToDoItem {
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/describedAs.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/describedAs.adoc
index c1d2bd3..8bad975 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/describedAs.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/describedAs.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The `describedAs()` attribute is used to provide a short description of the property to the user.  In the xref:ug:vw:about.adoc[Wicket viewer] it is displayed as a 'tool tip'. The attribute can also be specified for xref:rg:ant:CollectionLayout/describedAs.adoc[collections],  xref:rg:ant:ActionLayout/describedAs.adoc[actions], xref:rg:ant:ParameterLayout/describedAs.adoc[parameters], xref:rg:ant:DomainObjectLayout/describedAs.adoc[domain objects] and xref:rg:ant:ViewModelLayout/described [...]
+The `describedAs()` attribute is used to provide a short description of the property to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'. The attribute can also be specified for xref:rg:ant:CollectionLayout/describedAs.adoc[collections],  xref:rg:ant:ActionLayout/describedAs.adoc[actions], xref:rg:ant:ParameterLayout/describedAs.adoc[parameters], xref:rg:ant:DomainObjectLayout/describedAs.adoc[domain objects] and xref:rg:ant:ViewModelLayout/describ [...]
 
 For example:
 
@@ -20,4 +20,4 @@ public class Customer {
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
\ No newline at end of file
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
\ No newline at end of file
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/hidden.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/hidden.adoc
index fbf2777..6ca096b 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/hidden.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/hidden.adoc
@@ -8,7 +8,7 @@ The `hidden()` attribute indicates where (in the UI) the property should be hidd
 
 [TIP]
 ====
-It is also possible to use xref:rg:ant:PropertyLayout/hidden.adoc[`@PropertyLayout#hidden()`] or a xref:ug:vw:layout/file-based.adoc[file-based layout] such that the property can be hidden at the view layer.
+It is also possible to use xref:rg:ant:PropertyLayout/hidden.adoc[`@PropertyLayout#hidden()`] or a xref:vw:ROOT:layout/file-based.adoc[file-based layout] such that the property can be hidden at the view layer.
 Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
 ====
 
@@ -62,13 +62,13 @@ tables. Annotating with `@Property(where=Where.NOWHERE)` overrides this.
 
 [NOTE]
 ====
-The xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] has only partial support for these `Where` enums.
+The xref:vro:ROOT::about.adoc[RestfulObjects viewer] has only partial support for these `Where` enums.
 ====
 
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 == See also
 
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/labelPosition.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
index 2ee6048..b28b46b 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
@@ -29,7 +29,7 @@ public class ToDoItem {
 ----
 
 
-To get an idea of how these are rendered (in the xref:ug:vw:about.adoc[Wicket viewer]), we can look at the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] that happens to have examples of most of these various label positions.
+To get an idea of how these are rendered (in the xref:vw:ROOT:about.adoc[Wicket viewer]), we can look at the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] that happens to have examples of most of these various label positions.
 
 The default `LEFT` label positioning is used by the `cost` property:
 
@@ -82,7 +82,7 @@ If these are not present then Apache Isis will render according to internal defa
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/multiLine.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/multiLine.adoc
index 19fb16a..b2ecb37 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/multiLine.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/multiLine.adoc
@@ -29,5 +29,5 @@ If set > 1 (as would normally be the case), then the default xref:rg:ant:Propert
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/named.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/named.adoc
index 025af0a..cd79249 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/named.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/named.adoc
@@ -33,7 +33,7 @@ public class ToDoItem {
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 The framework also provides a separate, powerful mechanism for xref:ug:btb:i18n.adoc[internationalization].
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/navigable.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/navigable.adoc
index 6131a02..58be483 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/navigable.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/navigable.adoc
@@ -20,5 +20,5 @@ public class Employee {
 }
 ----
 
-For further details on using a navigable tree-structure, see xref:ug:vw:features/where-am-i.adoc[Where am I] in the user guide.
+For further details on using a navigable tree-structure, see xref:vw:ROOT:features/where-am-i.adoc[Where am I] in the user guide.
 
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/promptStyle.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
index 70b45be..93acd33 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 The `promptStyle()` attribute is used to specify whether, when editing a domain object property, the new value for the property is prompted by way of a dialog box, or is prompted using an inline panel (replacing the property on the page).
 
-If the attribute is not set, then the value of the xref:ug:vw:configuration-properties.adoc[configuration property] `isis.viewer.wicket.promptStyle` is used.
+If the attribute is not set, then the value of the xref:vw:ROOT:configuration-properties.adoc[configuration property] `isis.viewer.wicket.promptStyle` is used.
 If this is itself not set, then an inline prompt is used.
 
 For example:
@@ -23,5 +23,5 @@ public class Customer {
 <1> prompt for the new value for the property using an inline panel
 Note that the value `INLINE_AS_IF_EDIT` does not make sense for properties; if specified then it will be interpreted as just `INLINE`.
 
-Alternatively, the `promptStyle()` can be specified using xref:ug:vw:layout/file-based.adoc[file-based layouts].
+Alternatively, the `promptStyle()` can be specified using xref:vw:ROOT:layout/file-based.adoc[file-based layouts].
 
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
index 3bab676..66664e3 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
@@ -35,7 +35,7 @@ public class Tenancy {
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
 
 
 == See also
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/typicalLength.adoc b/antora/components/rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
index 9360fa5..32e1c32 100644
--- a/antora/components/rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
+++ b/antora/components/rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
@@ -9,7 +9,7 @@ It is ignored for properties of other types.
 The attribute is also supported for xref:rg:ant:ParameterLayout/typicalLength.adoc[parameters].
 
 The information is intended as a hint to the UI to determine the space that should be given to render a particular string property.
-That said, note that the xref:ug:vw:about.adoc[Wicket viewer] uses the maximum space available for all fields, so in effect ignores this attribute.
+That said, note that the xref:vw:ROOT:about.adoc[Wicket viewer] uses the maximum space available for all fields, so in effect ignores this attribute.
 
 For example:
 
@@ -26,4 +26,4 @@ public class Customer {
 
 == Alternatives
 
-As an alternative to using the annotation, the dynamic xref:ug:vw:layout/file-based.adoc[file-based layout] can be used instead.
\ No newline at end of file
+As an alternative to using the annotation, the dynamic xref:vw:ROOT:layout/file-based.adoc[file-based layout] can be used instead.
\ No newline at end of file
diff --git a/antora/components/rg/modules/ant/pages/ViewModel/objectType.adoc b/antora/components/rg/modules/ant/pages/ViewModel/objectType.adoc
index 56747c2..bdf305f 100644
--- a/antora/components/rg/modules/ant/pages/ViewModel/objectType.adoc
+++ b/antora/components/rg/modules/ant/pages/ViewModel/objectType.adoc
@@ -12,8 +12,8 @@ This can appear in several contexts, including:
  (see xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:rg:cms:schema/cmd.adoc[command] and xref:rg:cms:schema/ixn.adoc[interaction] schemas
-* in the URLs of the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]
-* in the URLs of the xref:ug:vw:about.adoc[Wicket viewer] (in general and in particular if xref:ug:vw:features/hints-and-copy-url.adoc[copying URLs])
+* in the URLs of the xref:vro:ROOT::about.adoc[RestfulObjects viewer]
+* in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] (in general and in particular if xref:vw:ROOT:features/hints-and-copy-url.adoc[copying URLs])
 * in XML snapshots generated by the xref:rg:svc:integration-api/XmlSnapshotService.adoc[`XmlSnapshotService`]
 
 
@@ -52,7 +52,7 @@ If only `schema` is defined, then the value is "`schema.className`".
 This might be obvious, but to make explicit: we recommend that you always specify an object type for your domain objects.
 
 Otherwise, if you refactor your code (change class name or move package), then any externally held references to the OID of the object will break.
-At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:vro:ROOT::about.adoc[Restful Objects] viewer to break.
 ====
 
 [NOTE]
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout.adoc b/antora/components/rg/modules/ant/pages/ViewModelLayout.adoc
index e59a8bb..86143fe 100644
--- a/antora/components/rg/modules/ant/pages/ViewModelLayout.adoc
+++ b/antora/components/rg/modules/ant/pages/ViewModelLayout.adoc
@@ -100,7 +100,7 @@ If a view model has been specified using the equivalent xref:rg:ant:DomainObject
 
 [NOTE]
 ====
-Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ug:vw:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:vw:ROOT:layout/file-based.adoc[`.layout.xml`] file (only for properties, collections and actions are supported).
 ====
 
 
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/describedAs.adoc b/antora/components/rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
index 12050d2..7da8a42 100644
--- a/antora/components/rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
+++ b/antora/components/rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The `describedAs()` attribute is used to provide a short description of the view model to the user; in the xref:ug:vw:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
+The `describedAs()` attribute is used to provide a short description of the view model to the user; in the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
 
 This attribute is the same as xref:rg:ant:DomainObjectLayout/describedAs.adoc[`@DomainObjectLayout#describedAs()`], but for view models instead of entities.
 
diff --git a/antora/components/rg/modules/ant/pages/XmlRootElement.adoc b/antora/components/rg/modules/ant/pages/XmlRootElement.adoc
index b2b49e1..d695788 100644
--- a/antora/components/rg/modules/ant/pages/XmlRootElement.adoc
+++ b/antora/components/rg/modules/ant/pages/XmlRootElement.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 The `@XmlRootElement` annotation provides an alternative way to define a
 xref:ug:fun:building-blocks/types-of-domain-objects/view-models.adoc[view model], in particular one intended to act as a DTO for use within
-xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer], or which contains arbitrarily complex state.
+xref:vro:ROOT::about.adoc[RestfulObjects viewer], or which contains arbitrarily complex state.
 
 A view model is a non-persisted domain object whose state is converted to/from a string memento.  In the case of a
 JAXB-annotated object this memento is its XML representation.  JAXB generally requires that the root element of the
@@ -16,7 +16,7 @@ xref:rg:ant:ViewModel.adoc[`@ViewModel`] annotation, using `@XmlRootElement` has
 significant advantages:
 
 * the view model can be used as a "canonical" DTO, for example when accessing data using the
-xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] in combination with the
+xref:vro:ROOT::about.adoc[RestfulObjects viewer] in combination with the
 xref:rg:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`]. +
 +
 This provides a stable and
diff --git a/antora/components/rg/modules/ant/pages/aaa/jdo.adoc b/antora/components/rg/modules/ant/pages/aaa/jdo.adoc
index caf4e59..69ac2a0 100644
--- a/antora/components/rg/modules/ant/pages/aaa/jdo.adoc
+++ b/antora/components/rg/modules/ant/pages/aaa/jdo.adoc
@@ -34,7 +34,7 @@ The table below lists the JDO annotations currently recognized by Apache Isis.
 
 |xref:rg:ant:Discriminator.adoc[`@javax.jdo.annotations.` +
 `Discriminator`]
-|Override for the object type, as used in `Bookmark`s, URLs for xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] and elsewhere. +
+|Override for the object type, as used in `Bookmark`s, URLs for xref:vro:ROOT::about.adoc[RestfulObjects viewer] and elsewhere. +
 
 Note that the discriminator overrides the object type that may otherwise be inferred from the xref:rg:ant:PersistenceCapable.adoc[`@PersistenceCapable`] annotation.
 |Domain / persistence
@@ -54,7 +54,7 @@ Note that the discriminator overrides the object type that may otherwise be infe
 `PersistenceCapable`]
 |Used to build Apache Isis' own internal identifier for objects. +
 
-If the `schema()` attribute is specified (and if xref:rg:ant:Discriminator.adoc[`@Discriminator`] __hasn't__ been specified), is also used to derive the object type, as used in `Bookmark`s, URLs for xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] and elsewhere.
+If the `schema()` attribute is specified (and if xref:rg:ant:Discriminator.adoc[`@Discriminator`] __hasn't__ been specified), is also used to derive the object type, as used in `Bookmark`s, URLs for xref:vro:ROOT::about.adoc[RestfulObjects viewer] and elsewhere.
 
 |Domain / persistence
 |Class
diff --git a/antora/components/rg/modules/ant/pages/aaa/jee.adoc b/antora/components/rg/modules/ant/pages/aaa/jee.adoc
index 1279618..a8940c7 100644
--- a/antora/components/rg/modules/ant/pages/aaa/jee.adoc
+++ b/antora/components/rg/modules/ant/pages/aaa/jee.adoc
@@ -14,7 +14,7 @@ The table below lists the JEE annotations currently recognized.  Expect to see m
 |Annotation
 |Purpose
 |Layer
-|xref:ug:vw:layout/file-based.adoc[File-based layout]?
+|xref:vw:ROOT:layout/file-based.adoc[File-based layout]?
 
 |xref:rg:ant:Digits.adoc[`@javax.validation.` +
 `constraints.` +
diff --git a/antora/components/rg/modules/ant/pages/aaa/main.adoc b/antora/components/rg/modules/ant/pages/aaa/main.adoc
index 64ac0e8..a84c644 100644
--- a/antora/components/rg/modules/ant/pages/aaa/main.adoc
+++ b/antora/components/rg/modules/ant/pages/aaa/main.adoc
@@ -9,7 +9,7 @@ For each of these domain types and members there are two annotations.  One cover
 
 [TIP]
 ====
-Most UI semantics can also be specified using xref:ug:vw:layout/file-based.adoc[dynamic object layout].
+Most UI semantics can also be specified using xref:vw:ROOT:layout/file-based.adoc[dynamic object layout].
 ====
 
 
@@ -22,7 +22,7 @@ The table below summarizes these most commonly used annotations in Apache Isis.
 |Annotation
 |Purpose
 |Layer
-|xref:ug:vw:layout/file-based.adoc[File-based layout]?
+|xref:vw:ROOT:layout/file-based.adoc[File-based layout]?
 
 |xref:rg:ant:Action.adoc[`@Action`]
 |Domain semantics for actions
diff --git a/antora/components/rg/modules/ant/pages/aaa/other.adoc b/antora/components/rg/modules/ant/pages/aaa/other.adoc
index 3592f43..873eeb2 100644
--- a/antora/components/rg/modules/ant/pages/aaa/other.adoc
+++ b/antora/components/rg/modules/ant/pages/aaa/other.adoc
@@ -11,7 +11,7 @@ These annotations are also commonly used, but relate _not_ to objects or object
 |Annotation
 |Purpose
 |Layer
-|xref:ug:vw:layout/file-based.adoc[File-based layout]?
+|xref:vw:ROOT:layout/file-based.adoc[File-based layout]?
 
 |xref:rg:ant:Facets.adoc[`@Facets`]
 |Install arbitrary facets within the Apache Isis metamodel.
diff --git a/antora/components/rg/modules/cfg/pages/about.adoc b/antora/components/rg/modules/cfg/pages/about.adoc
index 275c759..0646378 100644
--- a/antora/components/rg/modules/cfg/pages/about.adoc
+++ b/antora/components/rg/modules/cfg/pages/about.adoc
@@ -9,7 +9,7 @@ This guide describes how to configure an Apache Isis application.
 [NOTE]
 ====
 This guide covers only the core configuration properties (relating to Apache Isis' metamodel and runtime management).
-Configuration properties for the viewers can be found in the xref:ug:vw:about.adoc[Wicket Viewer] guide and the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] guide.
+Configuration properties for the viewers can be found in the xref:vw:ROOT:about.adoc[Wicket Viewer] guide and the xref:vro:ROOT::about.adoc[RestfulObjects viewer] guide.
 Likewise details of configuring security (Apache Shiro) can be
 found in the xref:ug:sec:about.adoc#[Security] guide, and details for configuring the DataNucleus Object Store can be found in the xref:ug-odn:ROOT:about.adoc#[DataNucleus] guide.
 ====
diff --git a/antora/components/rg/modules/cfg/pages/configuration-files.adoc b/antora/components/rg/modules/cfg/pages/configuration-files.adoc
index 8155ec6..6ae9ca7 100644
--- a/antora/components/rg/modules/cfg/pages/configuration-files.adoc
+++ b/antora/components/rg/modules/cfg/pages/configuration-files.adoc
@@ -9,9 +9,9 @@ The `WEBINF/isis.properties` file is always read and must exist.
 
 In addition, the following other properties are searched for and if present also read:
 
-* `viewer_wicket.properties` - if the xref:ug:vw:about.adoc[Wicket viewer] is in use
+* `viewer_wicket.properties` - if the xref:vw:ROOT:about.adoc[Wicket viewer] is in use
 
-* `viewer_restfulobjects.properties` - if the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] is in use
+* `viewer_restfulobjects.properties` - if the xref:vro:ROOT::about.adoc[RestfulObjects viewer] is in use
 
 * `viewer.properties` - for any other viewer configuration (but there are none currently)
 
diff --git a/antora/components/rg/modules/cfg/pages/configuring-core.adoc b/antora/components/rg/modules/cfg/pages/configuring-core.adoc
index 95db9f0..d6ca95e 100644
--- a/antora/components/rg/modules/cfg/pages/configuring-core.adoc
+++ b/antora/components/rg/modules/cfg/pages/configuring-core.adoc
@@ -6,7 +6,7 @@ This section lists the core/runtime configuration properties recognized by Apach
 
 [NOTE]
 ====
-Configuration properties for the JDO/DataNucleus objectstore can be found in the xref:ug-odn:ROOT:configuring.adoc[Configuring DataNucleus] section later in this chapter, while configuration properties for the viewers can be found in the their respective chapters, xref:ug:vw:configuration-properties.adoc[here for Wicket viewer], and xref:ug-vro:ROOT:configuration-properties.adoc[here for the Restful Objects viewer].
+Configuration properties for the JDO/DataNucleus objectstore can be found in the xref:ug-odn:ROOT:configuring.adoc[Configuring DataNucleus] section later in this chapter, while configuration properties for the viewers can be found in the their respective chapters, xref:vw:ROOT:configuration-properties.adoc[here for Wicket viewer], and xref:vro:ROOT::configuration-properties.adoc[here for the Restful Objects viewer].
 ====
 
 
@@ -437,7 +437,7 @@ Note that the application must be bootstrapped using an `AppManifest2`.
 (`false`)
 | Whether to check that the class has an object type explicitly specified somehow.
 
-The object type is used by the framework as an alias for the object's concrete class; it is one part of the object's OID and can be seen in the URLs of the xref:ug:vw:about.adoc[Wicket viewer] and xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], and is encoded in the ``Bookmark``s returned by the xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`].
+The object type is used by the framework as an alias for the object's concrete class; it is one part of the object's OID and can be seen in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] and xref:vro:ROOT::about.adoc[Restful Objects viewer], and is encoded in the ``Bookmark``s returned by the xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`].
 In this was it may also be persisted, for example in polymorphic associations or command or auditing tables.
 
 If the object type is not specified explicitly, then this can cause data migration issues if the class is subsequently refactored (eg renamed, or moved to a different package).
@@ -616,7 +616,7 @@ See xref:ug:btb:programming-model/finetuning.adoc[finetuning the programming mod
 |`isis.reflector.` +
 `layoutMetadataReaders`
 |`FQCN`,`FQCN2`,...
-|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ug:vw:layout/file-based.adoc[file-based layout]s. +
+|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:vw:ROOT:layout/file-based.adoc[file-based layout]s. +
 
 See xref:ug:btb:programming-model/layout-metadata-reader.adoc[Layout Metadata Reader] for more information.
 
@@ -705,7 +705,7 @@ By default this configuration property is enabled.  To disable the visibility fi
 isis.reflector.facet.filterVisibility=false
 ----
 
-Filtering is supported by the xref:ug:vw:about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], and also by the xref:rg:svc:application-layer-api/WrapperFactory.adoc[`WrapperFactory`] domain service (provided the wrapper's execution mode is __not__ "skip rules").
+Filtering is supported by the xref:vw:ROOT:about.adoc[Wicket viewer] and the xref:vro:ROOT::about.adoc[Restful Objects viewer], and also by the xref:rg:svc:application-layer-api/WrapperFactory.adoc[`WrapperFactory`] domain service (provided the wrapper's execution mode is __not__ "skip rules").
 
 [NOTE]
 ====
diff --git a/antora/components/rg/modules/cfg/pages/deployment-types.adoc b/antora/components/rg/modules/cfg/pages/deployment-types.adoc
index ae044cb..6caaeed 100644
--- a/antora/components/rg/modules/cfg/pages/deployment-types.adoc
+++ b/antora/components/rg/modules/cfg/pages/deployment-types.adoc
@@ -15,7 +15,7 @@ When running in development/prototyping mode, certain capabilities are enabled;
 
 == Using the Wicket Viewer
 
-Most of the you're likely to run Apache Isis using the xref:ug:vw:about.adoc[Wicket viewer].  In this case Apache Isis' "deployment type" concept maps to Wicket's "configuration" concept:
+Most of the you're likely to run Apache Isis using the xref:vw:ROOT:about.adoc[Wicket viewer].  In this case Apache Isis' "deployment type" concept maps to Wicket's "configuration" concept:
 
 .Apache Isis' deployment type corresponds to Apache Wicket's configuration
 [cols="1,1,2", options="header"]
@@ -64,7 +64,7 @@ Wicket's mechanism for specifying the "configuration" is to use a context parame
 
 == Restful Objects viewer only
 
-Most Apache Isis applications will consist of at least the xref:ug:vw:about.adoc[Wicket viewer] and optionally the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].  When both viewers are deployed in the same app, then the bootstrapping is performed by Wicket, and so the deployment type is configured as described in the previous section.
+Most Apache Isis applications will consist of at least the xref:vw:ROOT:about.adoc[Wicket viewer] and optionally the xref:vro:ROOT::about.adoc[RestfulObjects viewer].  When both viewers are deployed in the same app, then the bootstrapping is performed by Wicket, and so the deployment type is configured as described in the previous section.
 
 In some cases though you may be using Apache Isis to provide a REST API only, that is, you won't have deployed the Wicket viewer.  In these cases your app will be bootstrapped using  Apache Isis' xref:ug:btb:web-xml/servlet-context-listeners.adoc[ `IsisWebAppBootstrapper`].
 
diff --git a/antora/components/rg/modules/cms/pages/classes.adoc b/antora/components/rg/modules/cms/pages/classes.adoc
index bd32dde..7af6b5f 100644
--- a/antora/components/rg/modules/cms/pages/classes.adoc
+++ b/antora/components/rg/modules/cms/pages/classes.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rg:svc:about.adoc[domain services], xref:ug:vw:layout.adoc[object layout] or xref:rg:cfg:about[configuration].
+This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rg:svc:about.adoc[domain services], xref:vw:ROOT:layout.adoc[object layout] or xref:rg:cfg:about[configuration].
 
 
 
diff --git a/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc b/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
index 4559da3..d4fcc95 100644
--- a/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
@@ -201,7 +201,7 @@ What then remains is to update the bootstrapping code itself.
 
 There are several different contexts in which the framework needs to be bootstrapped:
 
-* the first is as a "regular" webapp (using the xref:ug:vw:about.adoc[Wicket viewer]).
+* the first is as a "regular" webapp (using the xref:vw:ROOT:about.adoc[Wicket viewer]).
 Here the `AppManifest` just needs to be specified as a configuration property, usually done using the `WEB-INF/isis.properties` configuration file: +
 +
 [source,ini]
diff --git a/antora/components/rg/modules/cms/pages/classes/layout.adoc b/antora/components/rg/modules/cms/pages/classes/layout.adoc
index f385a7f..36bc1b2 100644
--- a/antora/components/rg/modules/cms/pages/classes/layout.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/layout.adoc
@@ -11,7 +11,7 @@ These classes fall into two main categories:
 * common component classes, that capture the layout metadata for an object's properties, collections and actions.
 These are bound (or associated) to the regions of the grid
 
-The framework provides an implementation of the grid classes modelled closely on link:http://getbootstrap.com[Bootstrap 3], along with xref:ug:vw:about.adoc[Wicket viewer] components capable of rendering that grid system.
+The framework provides an implementation of the grid classes modelled closely on link:http://getbootstrap.com[Bootstrap 3], along with xref:vw:ROOT:about.adoc[Wicket viewer] components capable of rendering that grid system.
 In principle it is also possible to extend the layout architecture for other grid systems.
 The component classes, though, are intended to be reusable across all grid systems.
 
@@ -19,7 +19,7 @@ The component classes, meanwhile, are broadly equivalent to the "layout" annotat
 
 All of the classes in this package are JAXB-annotated, meaning that they can be serialized to/from XML (the `component` classes in the `http://isis.apache.org/applib/layout/component` XSD namespace, the bootstrap 3 grid classes in the `http://isis.apache.org/applib/layout/grid/bootstrap3` XSD namespace).
 This ability to serialize to/from XML is used by the xref:rg:svc:presentation-layer-spi/GridLoaderService.adoc[`GridLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
-It also allows the grid to be exposed through the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], as either XML or JSON.
+It also allows the grid to be exposed through the REST API provided by the xref:vro:ROOT::about.adoc[Restful Objects viewer], as either XML or JSON.
 
 The various components (properties, collections, actions and domain object) also allow a link to be associated with each.
 These links are populated by the framework automatically when exposing the object layout grid through the REST API, pointing back to the standard Restful Objects resources.
@@ -102,7 +102,7 @@ These map to Bootstrap's link:http://getbootstrap.com/css/#responsive-utilities[
 As you can probably guess, the `BS3Grid` is the top-level object (that is, it is JAXB `@XmlRootElement`); this is the object that is serialized to/from XML.
 
 All of these classes also allow custom CSS to be specified; these are added to the CSS classes for the corresponding `<div`> in the rendered page.
-The xref:ug:vw:customisation/tweaking-css-classes.adoc[`application.css`] file can then be used for application-specific CSS, allowing arbitrary fine-tuning of the layout of the page.
+The xref:vw:ROOT:customisation/tweaking-css-classes.adoc[`application.css`] file can then be used for application-specific CSS, allowing arbitrary fine-tuning of the layout of the page.
 
 The XSD for these classes is available at link:http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd[].
 
diff --git a/antora/components/rg/modules/cms/pages/classes/menubars.adoc b/antora/components/rg/modules/cms/pages/classes/menubars.adoc
index 4f719d0..8751beb 100644
--- a/antora/components/rg/modules/cms/pages/classes/menubars.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/menubars.adoc
@@ -14,7 +14,7 @@ Service actions are grouped into menu sections.
 
 All of the classes in this package are JAXB-annotated, meaning that they can be serialized to/from XML (in the `http://isis.apache.org/applib/layout/menubars/bootstrap3` XSD namespace).
 This ability to serialize to/from XML is used by the xref:rg:svc:presentation-layer-spi/MenuBarsLoaderService.adoc[`MenuBarsLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
-It also allows the menu bars to be exposed through the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], as either XML or JSON.
+It also allows the menu bars to be exposed through the REST API provided by the xref:vro:ROOT::about.adoc[Restful Objects viewer], as either XML or JSON.
 
 The service action component also allows a link to be associated with it.
 Each such link is populated by the framework automatically when exposing the menu bars layout through the REST API, pointing back to the standard Restful Objects resources.
@@ -29,7 +29,7 @@ The menu classes reside in the `org.apache.isis.applib.layout.menubars.bootstrap
 
 +
 The top-level structure that define three fields: a primary `BS3MenuBar`, secondary `BS3MenuBar` and tertiary `BS3MenuBar`.
-The xref:ug:vw:about.adoc[Wicket viewer] places the primary bar to the left, the secondary bar aligned right, and the tertiary bar (expected to consist of just one `BS3Menu`) under the user names.
+The xref:vw:ROOT:about.adoc[Wicket viewer] places the primary bar to the left, the secondary bar aligned right, and the tertiary bar (expected to consist of just one `BS3Menu`) under the user names.
 
 * `BS3MenuBar`
 
@@ -40,7 +40,7 @@ consisting of one or many ``BS3Menu``s.
 
 +
 consisting of one or many ``BS3MenuSection``s.
-The xref:ug:vw:about.adoc[Wicket viewer] renders a separator between each section.
+The xref:vw:ROOT:about.adoc[Wicket viewer] renders a separator between each section.
 
 * `BS3MenuSection`
 
diff --git a/antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc b/antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc
index a52a30b..c2161f4 100644
--- a/antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc
@@ -15,7 +15,7 @@ A number of other xref:rg:cms:classes/mixins/Persistable.adoc[mixins] also contr
 
 When a domain object is rendered the end-user can select different tabs, and for collections can sort the columns,
 navigate to second pages, or select different views of collections.
-If the user revisits that object, the xref:ug:vw:about.adoc[Wicket viewer] will remember these hints and render the domain object in the same state.
+If the user revisits that object, the xref:vw:ROOT:about.adoc[Wicket viewer] will remember these hints and render the domain object in the same state.
 These rendering hints are also included if the user copies the URL using the anchor link (to right hand of the object's title).
 
 The `Object_clearHints` mixin provides the ability for the end-user to discard these hints so that the object is
@@ -36,7 +36,7 @@ This mixin uses the xref:rg:svc:presentation-layer-spi/HintStore.adoc[`HintStore
 
 == `downloadLayoutXml()`
 
-The `Object_downloadLayoutXml` mixin provides an action to download the xref:ug:vw:layout/file-based.adoc[layout XML] for the current domain object.
+The `Object_downloadLayoutXml` mixin provides an action to download the xref:vw:ROOT:layout/file-based.adoc[layout XML] for the current domain object.
 It has the following signature:
 
 [source,java]
@@ -50,7 +50,7 @@ public Object downloadLayoutXml(
 ----
 <1> either current, complete, normalized or minimal.
 
-See the documentation on xref:ug:vw:layout/file-based.adoc[layout XML] and also
+See the documentation on xref:vw:ROOT:layout/file-based.adoc[layout XML] and also
 the xref:rg:svc:metadata-api/LayoutService.adoc[`LayoutService`] for more information on these styles
 
 
@@ -82,7 +82,7 @@ This mixin calls xref:rg:svc:metadata-api/MetamodelService.adoc[`MetaModelServic
 
 == `downloadLayoutXml()`
 
-The `Object_downloadLayoutXml` mixin provides an action to download the xref:ug:vw:layout/file-based.adoc[layout XML] for the current domain object.
+The `Object_downloadLayoutXml` mixin provides an action to download the xref:vw:ROOT:layout/file-based.adoc[layout XML] for the current domain object.
 It has the following signature:
 
 [source,java]
@@ -96,7 +96,7 @@ public Object downloadLayoutXml(
 ----
 <1> either current, complete, normalized or minimal.
 
-See the documentation on xref:ug:vw:layout/file-based.adoc[layout XML] and also
+See the documentation on xref:vw:ROOT:layout/file-based.adoc[layout XML] and also
 the xref:rg:svc:metadata-api/LayoutService.adoc[`LayoutService`] for more information on these styles
 
 
@@ -108,7 +108,7 @@ This mixin calls xref:rg:svc:metadata-api/LayoutService.adoc[`LayoutService`] to
 
 == `openRestApi()`
 
-The `Object_openRestApi` mixin provides an action to navigate to the URL of the xref:ug-vro:ROOT:about.adoc[Restful Objects resource] corresponding to the domain object.
+The `Object_openRestApi` mixin provides an action to navigate to the URL of the xref:vro:ROOT::about.adoc[Restful Objects resource] corresponding to the domain object.
 It has the following signature:
 
 [source,java]
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes.adoc
index 038c5e7..6baa362 100644
--- a/antora/components/rg/modules/cms/pages/methods/prefixes.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/prefixes.adoc
@@ -42,7 +42,7 @@ Param
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
 ====
 
 See also xref:rg:cms:methods/prefixes/removeFrom.adoc[`removeFrom...()`]`
@@ -140,7 +140,7 @@ See also xref:rg:cms:methods/prefixes/clear.adoc[`clear...()`]`.
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
 ====
 
 See also xref:rg:cms:methods/prefixes/addTo.adoc[`addTo...()`]`
@@ -175,7 +175,7 @@ AddTo...()`]
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
 ====
 
 See also xref:rg:cms:methods/prefixes/validateRemoveFrom.adoc[`validateRemoveFrom...()`], and xref:rg:cms:methods/prefixes/validate.adoc[`validate...()`] for properties and actions.
@@ -191,7 +191,7 @@ RemoveFrom...()`]
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
 ====
 
 See also xref:rg:cms:methods/prefixes/validateAddTo.adoc[`validateAddTo...()`], and xref:rg:cms:methods/prefixes/validate.adoc[`validate...()`] for properties and actions.
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc
index ead4ce0..6ca7097 100644
--- a/antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc
@@ -9,7 +9,7 @@ The `addTo...()` supporting method is called whenever an object is added to a co
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].  The suggested workaround is to simply define an action.
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].  The suggested workaround is to simply define an action.
 ====
 
 
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
index e051bea..e28bd8b 100644
--- a/antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
@@ -9,7 +9,7 @@ The `removeFrom...()` supporting method is called whenever an object is removed
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].  The suggested workaround is to simply define an action.
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].  The suggested workaround is to simply define an action.
 ====
 
 
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
index 2c5b0c5..dc04137 100644
--- a/antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
@@ -9,7 +9,7 @@ The `validateAddTo...()` supporting method is called whenever an object is to be
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
 The suggested workaround is to simply define an action.
 ====
 
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
index cedcb0c..35caebb 100644
--- a/antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
@@ -9,7 +9,7 @@ The `validateRemoveFrom...()` supporting method is called whenever an object is
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the xref:ug:vw:about.adoc[Wicket viewer].
+Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
 The suggested workaround is to simply define an action.
 ====
 
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc
index 66af439..4a7ae0c 100644
--- a/antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 
 The `cssClass()` returns a CSS class for a particular object instance.
 
-The xref:ug:vw:about.adoc[Wicket viewer] wraps the object's representation in a containing `<div>` with the class added.
+The xref:vw:ROOT:about.adoc[Wicket viewer] wraps the object's representation in a containing `<div>` with the class added.
 This is done both for rendering the object either in a table or when rendering the object on its own page.
 
 In conjunction with xref:rg:cfg:application-specific/application-css.adoc[`application.css`], can therefore provide custom styling of an object instance wherever it is rendered. +
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc
index 5c2b1af..05034ff 100644
--- a/antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc
@@ -11,8 +11,8 @@ This can appear in several contexts, including:
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
  (see xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`])
 * in the serialization of `OidDto` in the xref:rg:cms:schema/cmd.adoc[command] and xref:rg:cms:schema/ixn.adoc[interaction] schemas
-* in the URLs of the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]
-* in the URLs of the xref:ug:vw:about.adoc[Wicket viewer] (specifically, for bookmarked actions)
+* in the URLs of the xref:vro:ROOT::about.adoc[RestfulObjects viewer]
+* in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] (specifically, for bookmarked actions)
 
 
 
@@ -45,7 +45,7 @@ The rules of precedence are:
 This might be obvious, but to make explicit: we recommend that you always specify an object type for your domain services.
 
 Otherwise, if you refactor your code (change class name or move package), then any externally held references to the OID of the service will break.
-At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could cause external clients accessing data through the xref:vro:ROOT::about.adoc[Restful Objects] viewer to break.
 ====
 
 [NOTE]
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc
index 1dad289..57c056e 100644
--- a/antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 Every object is represented by an icon; this is based on the domain object's simple name.
-The xref:ug:vw:about.adoc[Wicket viewer] searches for the image in the same package as the `.class` file for the domain object or in the `images` package.
+The xref:vw:ROOT:about.adoc[Wicket viewer] searches for the image in the same package as the `.class` file for the domain object or in the `images` package.
 It will find any matching name and one of the following suffixes `.png`, `.gif`, `.jpeg`, `.jpg` or `.svg`.
 If none is found, then `Default.png` will be used as fallback.
 
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc
index 9a0efe8..2cfa9e2 100644
--- a/antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc
@@ -3,8 +3,8 @@
 include::_attributes.adoc[]
 
 
-Every object has a xref:ug:vw:layout.adoc[layout] .
-This may be specified using annotations such as xref:rg:ant:MemberOrder.adoc[`@MemberOrder`], xref:rg:ant:DomainObjectLayout.adoc[`@DomainObjectLayout`] and the like,  but it much more commonly specified using an xref:ug:vw:layout/file-based .adoc[XML layout file].
+Every object has a xref:vw:ROOT:layout.adoc[layout] .
+This may be specified using annotations such as xref:rg:ant:MemberOrder.adoc[`@MemberOrder`], xref:rg:ant:DomainObjectLayout.adoc[`@DomainObjectLayout`] and the like,  but it much more commonly specified using an xref:vw:ROOT:layout/file-based .adoc[XML layout file].
 
 The `layout` method allows the domain object to specify an alternate layout to its usual layout.
 
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc b/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
index 642be97..1e5ffea 100644
--- a/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
+++ b/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The `ContentNegotiationService` is a plug-in point for the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] so that it can generate representations according to HTTP `Accept` header of the request.  This idea is discussed in section 34.1 of the link:http://restfulobjects.org[Restful Objects spec] v1.0.
+The `ContentNegotiationService` is a plug-in point for the xref:vro:ROOT::about.adoc[RestfulObjects viewer] so that it can generate representations according to HTTP `Accept` header of the request.  This idea is discussed in section 34.1 of the link:http://restfulobjects.org[Restful Objects spec] v1.0.
 
 The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.
 
@@ -131,7 +131,7 @@ This can be useful for generic viewers.
 
 * `ContentNegotiationServiceOrgApacheIsisV1` +
 +
-which returns xref:ug-vro:ROOT:simplified-representations.adoc[simplified representations]
+which returns xref:vro:ROOT::simplified-representations.adoc[simplified representations]
 
 
 
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc b/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
index 1a3cde3..5343cd5 100644
--- a/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
+++ b/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 
-The `RepresentationService` is the main plug-in point for the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] to generate representations.
+The `RepresentationService` is the main plug-in point for the xref:vro:ROOT::about.adoc[RestfulObjects viewer] to generate representations.
 
 The default implementations ultimately generate representations according to the link:http://restfulobjects.org[Restful Objects spec] v1.0.
 However, it also delegates to the xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] which provides a mechanism for altering representations according to the HTTP `Accept` header.
diff --git a/antora/components/rg/modules/mvn/pages/intro.adoc b/antora/components/rg/modules/mvn/pages/intro.adoc
index cb6d189..c1537a0 100644
--- a/antora/components/rg/modules/mvn/pages/intro.adoc
+++ b/antora/components/rg/modules/mvn/pages/intro.adoc
@@ -12,7 +12,7 @@ This runs the `MetaModelValidator` that is also run when the application is star
 
 * `swagger` +
 +
-Uses the xref:rg:svc:metadata-api/SwaggerService.adoc[`SwaggerService`] to generate link:http://swagger.io[Swagger] spec files that describe the public and/or private RESTful APIs exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+Uses the xref:rg:svc:metadata-api/SwaggerService.adoc[`SwaggerService`] to generate link:http://swagger.io[Swagger] spec files that describe the public and/or private RESTful APIs exposed by the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 
 * `xsd` +
 +
diff --git a/antora/components/rg/modules/mvn/pages/swagger.adoc b/antora/components/rg/modules/mvn/pages/swagger.adoc
index 27c1909..ee0272c 100644
--- a/antora/components/rg/modules/mvn/pages/swagger.adoc
+++ b/antora/components/rg/modules/mvn/pages/swagger.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 The `swagger` goal of the `isis-maven-plugin` uses the xref:rg:svc:metadata-api/SwaggerService.adoc[`SwaggerService`] to
-generate link:http://swagger.io[Swagger] spec files to describe the public and/or private RESTful APIs exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+generate link:http://swagger.io[Swagger] spec files to describe the public and/or private RESTful APIs exposed by the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 
 These spec files, once generated, can then be used in the build pipeline to generate client-side stubs, typically using Swagger's own link:https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen-maven-plugin[swagger-codegen-maven] plugin.
 
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc b/antora/components/rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
index 934be47..c2699ba 100644
--- a/antora/components/rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
+++ b/antora/components/rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
@@ -71,7 +71,7 @@ public class ToDoItem ... {
 }
 ----
 <1> if invoked as a regular action, return this object;
-<2> otherwise (if invoked on collection of objects), return null, so that the xref:ug:vw:about.adoc[Wicket viewer] will re-render the list of objects
+<2> otherwise (if invoked on collection of objects), return null, so that the xref:vw:ROOT:about.adoc[Wicket viewer] will re-render the list of objects
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/CommandContext.adoc b/antora/components/rg/modules/svc/pages/application-layer-api/CommandContext.adoc
index 396ead3..a991e1b 100644
--- a/antora/components/rg/modules/svc/pages/application-layer-api/CommandContext.adoc
+++ b/antora/components/rg/modules/svc/pages/application-layer-api/CommandContext.adoc
@@ -33,7 +33,7 @@ It also shows how commands can be run in the background either explicitly by sch
 
 [NOTE]
 ====
-Note that this screencast shows an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screencast shows an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/MessageService.adoc b/antora/components/rg/modules/svc/pages/application-layer-api/MessageService.adoc
index 75c9133..2de968f 100644
--- a/antora/components/rg/modules/svc/pages/application-layer-api/MessageService.adoc
+++ b/antora/components/rg/modules/svc/pages/application-layer-api/MessageService.adoc
@@ -29,11 +29,11 @@ public interface MessageService {
     ...
 }
 ----
-<1> display as a transient message to the user (not requiring acknowledgement).  In the xref:ug:vw:about.adoc[Wicket viewer] this is implemented as a toast that automatically disappears after a period of time.
+<1> display as a transient message to the user (not requiring acknowledgement).  In the xref:vw:ROOT:about.adoc[Wicket viewer] this is implemented as a toast that automatically disappears after a period of time.
 <2> ditto, but with translatable string, for xref:ug:btb:i18n.adoc[i18n support].
-<3> warn the user about a situation with the specified message.  In the xref:ug:vw:about.adoc[Wicket viewer] this is implemented as a toast that must be closed by the end-user.
+<3> warn the user about a situation with the specified message.  In the xref:vw:ROOT:about.adoc[Wicket viewer] this is implemented as a toast that must be closed by the end-user.
 <4> ditto, but with translatable string, for i18n support.
-<5> show the user an unexpected application error.  In the xref:ug:vw:about.adoc[Wicket viewer] this is implemented as a toast (with a different colour) that must be closed by the end-user.
+<5> show the user an unexpected application error.  In the xref:vw:ROOT:about.adoc[Wicket viewer] this is implemented as a toast (with a different colour) that must be closed by the end-user.
 <6> ditto, but with translatable string, for i18n support.
 
 The i18n versions of these methods all have an override which simply creates a single context string from the `contextClass` and `contextMethod` parameters (eg "com.mycompany.Customer#placeOrder").
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/TransactionService.adoc b/antora/components/rg/modules/svc/pages/application-layer-api/TransactionService.adoc
index 2cd3c5e..d866832 100644
--- a/antora/components/rg/modules/svc/pages/application-layer-api/TransactionService.adoc
+++ b/antora/components/rg/modules/svc/pages/application-layer-api/TransactionService.adoc
@@ -55,7 +55,7 @@ Again, may not flush or abort or commit.
 
 
 As noted above, `nextTransaction()` can be useful for actions used to perform data migration, say, or for large fixture scripts.
-It is also used by the xref:ug:vw:about.adoc[Wicket viewer]'s support for bulk actions; each action is invoked in its own transaction.
+It is also used by the xref:vw:ROOT:about.adoc[Wicket viewer]'s support for bulk actions; each action is invoked in its own transaction.
 An overload of this method takes a `Policy` enum, defined as:
 
 [source,java]
diff --git a/antora/components/rg/modules/svc/pages/application-layer-spi/CommandService.adoc b/antora/components/rg/modules/svc/pages/application-layer-spi/CommandService.adoc
index 95e2641..62bfd7f 100644
--- a/antora/components/rg/modules/svc/pages/application-layer-spi/CommandService.adoc
+++ b/antora/components/rg/modules/svc/pages/application-layer-spi/CommandService.adoc
@@ -35,7 +35,7 @@ It also shows how commands can be run in the background either explicitly by sch
 
 [NOTE]
 ====
-Note that this screencast shows an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screencast shows an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/Scratchpad.adoc b/antora/components/rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
index f5b319b..84b92fd 100644
--- a/antora/components/rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
+++ b/antora/components/rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
@@ -100,7 +100,7 @@ Scratchpad scratchpad;
 <1> look for the `ToDoItemBulkUpdate` in the scratchpad...
 <2> ... and add one if there isn't one (ie for the first object returned).
 
-If using the xref:ug:vw:about.adoc[Wicket viewer], the `ToDoItemBulkUpdate` view model returned from the last action invoked will be displayed. Thereafter this view model can be used to perform a bulk update of the "enlisted" items.
+If using the xref:vw:ROOT:about.adoc[Wicket viewer], the `ToDoItemBulkUpdate` view model returned from the last action invoked will be displayed. Thereafter this view model can be used to perform a bulk update of the "enlisted" items.
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc b/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
index 7b558ba..07e6eb5 100644
--- a/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
+++ b/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
@@ -49,7 +49,7 @@ public final class RoleMemento {
 
 The roles associated with the `UserMemento` will be based on the configured xref:ug:sec:about.adoc[security] (typically Shiro).
 
-In addition, when using the xref:ug:vw:about.adoc[Wicket viewer] there will be an additional "org.apache.isis.viewer.wicket.roles.USER" role; this is used internally to restrict access to web pages without authenticating.
+In addition, when using the xref:vw:ROOT:about.adoc[Wicket viewer] there will be an additional "org.apache.isis.viewer.wicket.roles.USER" role; this is used internally to restrict access to web pages without authenticating.
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/integration-api/EmailService.adoc b/antora/components/rg/modules/svc/pages/integration-api/EmailService.adoc
index 1efd1f4..563b3aa 100644
--- a/antora/components/rg/modules/svc/pages/integration-api/EmailService.adoc
+++ b/antora/components/rg/modules/svc/pages/integration-api/EmailService.adoc
@@ -227,7 +227,7 @@ The socket connection timeout, defaulting to 2000ms.
 If you wish to write an alternative implementation, be aware that it should process the message body as HTML (as opposed to plain text or any other format).
 
 Also, note that (unlike most Apache Isis domain services) the implementation is also instantiated and injected by Google Guice.
-This is because `EmailService` is used as part of the xref:ug:vw:features/user-registration.adoc[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Apache Isis runtime.
+This is because `EmailService` is used as part of the xref:vw:ROOT:features/user-registration.adoc[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Apache Isis runtime.
 This implies a couple of additional constraints:
 
 * first, implementation class should also be annotated with `@com.google.inject.Singleton`
diff --git a/antora/components/rg/modules/svc/pages/intro.adoc b/antora/components/rg/modules/svc/pages/intro.adoc
index 1812600..4d4cae6 100644
--- a/antora/components/rg/modules/svc/pages/intro.adoc
+++ b/antora/components/rg/modules/svc/pages/intro.adoc
@@ -14,7 +14,7 @@ The diagram below shows these categories:
 image::reference-services/categories.png[width="600px",link="{imagesdir}/reference-services/categories.png"]
 
 
-A small number of domain services can be considered both API and SPI; a good example is the xref:rg:svc:integration-api/EmailService.adoc[`EmailService`] that is of direct use for domain objects wishing to send out emails, but is also used by the framework to support the xref:ug:vw:features/user-registration.adoc[user registration] functionality supported by the xref:ug:vw:about.adoc[Wicket viewer].
+A small number of domain services can be considered both API and SPI; a good example is the xref:rg:svc:integration-api/EmailService.adoc[`EmailService`] that is of direct use for domain objects wishing to send out emails, but is also used by the framework to support the xref:vw:ROOT:features/user-registration.adoc[user registration] functionality supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
 The same is true of the xref:rg:svc:core-domain-api/EventBusService.adoc[`EventBusService`]; this can be used by domain objects to broadcast arbitrary events, but is also used by the framework to automatically emit events for
 xref:rg:ant:Action/domainEvent.adoc[`@Action#domainEvent()`] etc.
 
diff --git a/antora/components/rg/modules/svc/pages/metadata-api.adoc b/antora/components/rg/modules/svc/pages/metadata-api.adoc
index 05e23c6..fb471fd 100644
--- a/antora/components/rg/modules/svc/pages/metadata-api.adoc
+++ b/antora/components/rg/modules/svc/pages/metadata-api.adoc
@@ -69,7 +69,7 @@ within the metamodel.
 |xref:rg:svc:metadata-api/SwaggerService.adoc[`o.a.i.applib.` +
 `services.swagger` +
 `SwaggerService`]
-|Generates link:http://swagger.io/[Swagger] spec files to describe the public and/or private RESTful APIs exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].  These can then be used with the link:http://swagger.io/swagger-ui/[Swagger UI] page to explore the REST API, or used to generate client-side stubs using the link:http://swagger.io/swagger-codegen/[Swagger codegen] tool, eg for use in a custom REST client app.
+|Generates link:http://swagger.io/[Swagger] spec files to describe the public and/or private RESTful APIs exposed by the xref:vro:ROOT::about.adoc[RestfulObjects viewer].  These can then be used with the link:http://swagger.io/swagger-ui/[Swagger UI] page to explore the REST API, or used to generate client-side stubs using the link:http://swagger.io/swagger-codegen/[Swagger codegen] tool, eg for use in a custom REST client app.
 |`SwaggerServiceDefault` +
 ``o.a.i.core`` +
 ``isis-core-metamodel``
diff --git a/antora/components/rg/modules/svc/pages/metadata-api/SwaggerService.adoc b/antora/components/rg/modules/svc/pages/metadata-api/SwaggerService.adoc
index 8d3c589..702178f 100644
--- a/antora/components/rg/modules/svc/pages/metadata-api/SwaggerService.adoc
+++ b/antora/components/rg/modules/svc/pages/metadata-api/SwaggerService.adoc
@@ -4,13 +4,13 @@ include::_attributes.adoc[]
 
 
 
-The `SwaggerService` generates link:http://swagger.io/[Swagger] spec files to describe the public and/or private RESTful APIs exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+The `SwaggerService` generates link:http://swagger.io/[Swagger] spec files to describe the public and/or private RESTful APIs exposed by the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 
 These spec files can then be used with the link:http://swagger.io/swagger-ui/[Swagger UI] page to explore the REST API, or used to generate client-side stubs using the link:http://swagger.io/swagger-codegen/[Swagger codegen] tool, eg for use in a custom REST client app.
 
 [NOTE]
 ====
-Not all of the REST API exposed by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] is included in the Swagger schema definition files; the emphasis is those REST resources that are used to develop custom apps: domain objects, domain object collections and action invocations.  When combined with Apache Isis' own xref:ug-vro:ROOT:simplified-representations.adoc[simplified representations], these are pretty much all that is needed  for this use case.
+Not all of the REST API exposed by the xref:vro:ROOT::about.adoc[Restful Objects viewer] is included in the Swagger schema definition files; the emphasis is those REST resources that are used to develop custom apps: domain objects, domain object collections and action invocations.  When combined with Apache Isis' own xref:vro:ROOT::simplified-representations.adoc[simplified representations], these are pretty much all that is needed  for this use case.
 ====
 
 
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc b/antora/components/rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
index ebc3fb9..83c2098 100644
--- a/antora/components/rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
+++ b/antora/components/rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 The `UserRegistrationService` provides the ability for users to sign-up to access an application by providing a valid email address, and also provides the capability for users to reset their password if forgotten.
 
-For user sign-up, the xref:ug:vw:about.adoc[Wicket viewer] will check whether an implementation of this service (and also the xref:rg:svc:presentation-layer-spi/EmailNotificationService.adoc[`EmailNotificationService`]) is available, and if so will render a sign-up page where the user enters their email address.
+For user sign-up, the xref:vw:ROOT:about.adoc[Wicket viewer] will check whether an implementation of this service (and also the xref:rg:svc:presentation-layer-spi/EmailNotificationService.adoc[`EmailNotificationService`]) is available, and if so will render a sign-up page where the user enters their email address.
 A verification email is sent (using the aforementioned `EmailNotificationService`) which includes a link back to the running application; this allows the user then to complete their registration process (choose user name, password and so on).
 When the user has provided the additional details, the Wicket viewer calls _this_ service in order to create an account for them, and then logs the user on.
 
@@ -17,7 +17,7 @@ That said, we expect that such use cases will be comparatively rare; the primary
 
 [NOTE]
 ====
-For further details on the user registration feature (as supported by the Wicket viewer), see xref:ug:vw:features/user-registration.adoc[here].
+For further details on the user registration feature (as supported by the Wicket viewer), see xref:vw:ROOT:features/user-registration.adoc[here].
 ====
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-api.adoc
index c48a7bf..f772084 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-api.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-api.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 Domain service APIs for the presentation layer allow the domain objects to control aspects of the user interface.
-The implementations are specific to the particular viewer (xref:ug:vw:about.adoc[Wicket viewer] or xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]) so the domain code must guard against them being unavailable in some cases.
+The implementations are specific to the particular viewer (xref:vw:ROOT:about.adoc[Wicket viewer] or xref:vro:ROOT::about.adoc[Restful Objects viewer]) so the domain code must guard against them being unavailable in some cases.
 
 
 The table below summarizes the presentation layer APIs defined by Apache Isis.
@@ -27,7 +27,7 @@ It also lists their corresponding implementation.
 |`AcceptHeaderServiceDefault` +
 ``o.a.i.core`` +
 ``isis-core-viewer-restfulobjects-rendering``
-|Implementation only usable within the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer].
+|Implementation only usable within the xref:vro:ROOT::about.adoc[Restful Objects viewer].
 
 
 |xref:rg:svc:presentation-layer-api/BookmarkUiService.adoc[`o.a.i.applib.` +
@@ -37,7 +37,7 @@ It also lists their corresponding implementation.
 |`BookmarkUiServiceWicket` +
 ``o.a.i.core`` +
 ``isis-core-viewer-wicket-impl``
-|(Implementation only usable within the xref:ug:vw:about.adoc[Wicket viewer].
+|(Implementation only usable within the xref:vw:ROOT:about.adoc[Wicket viewer].
 
 
 |xref:rg:svc:presentation-api/DeepLinkService.adoc[`o.a.i.applib` +
@@ -47,7 +47,7 @@ It also lists their corresponding implementation.
 |`DeepLinkServiceWicket` +
 ``o.a.i.viewer`` +
 ``isis-core-viewer-wicket-impl``
-|Implementation only usable within the xref:ug:vw:about.adoc[Wicket viewer].
+|Implementation only usable within the xref:vw:ROOT:about.adoc[Wicket viewer].
 
 
 |xref:rg:svc:presentation-api/GuiceBeanProvider.adoc[`o.a.i.applib.` +
@@ -57,7 +57,7 @@ It also lists their corresponding implementation.
 |`GuiceBeanProviderWicket` +
 ``o.a.i.core`` +
 ``isis-core-viewer-wicket-impl``
-|Implementation only usable within the xref:ug:vw:about.adoc[Wicket viewer].
+|Implementation only usable within the xref:vw:ROOT:about.adoc[Wicket viewer].
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
index a20b729..e887a0b 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
@@ -32,7 +32,7 @@ The default implementation is provided by `o.a.i.v.ro.rendering.service.accepthe
 
 [NOTE]
 ====
-Note that the service will only return a list when the request is initiated through the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer].  Otherwise the service will return `null`.
+Note that the service will only return a list when the request is initiated through the xref:vro:ROOT::about.adoc[Restful Objects viewer].  Otherwise the service will return `null`.
 ====
 
 To use an alternative implementation, use xref:rg:ant:DomainServiceLayout/menuOrder.adoc[`@DomainServiceLayout#menuOrder()`] (as explained in the xref:rg:svc:intro/overriding-the-services.adoc[introduction] to this guide).
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
index 6b884e6..ef13927 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
@@ -22,7 +22,7 @@ public interface BookmarkUiService {
 ----
 <1> Simply clears the current list of breadcrumbs and bookmarks.
 
-The xref:ug:vw:about.adoc[Wicket viewer] provides an implementation of this service, `o.a.i.viewer.wicket.viewer.services.BookmarkUiServiceWicket`.
+The xref:vw:ROOT:about.adoc[Wicket viewer] provides an implementation of this service, `o.a.i.viewer.wicket.viewer.services.BookmarkUiServiceWicket`.
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
index 563b905..a4c5b23 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
@@ -22,15 +22,15 @@ public interface DeepLinkService {
 ----
 <1> Creates a URI that can be used to obtain a representation of the provided domain object in one of the Apache Isis viewers.
 
-The xref:ug:vw:about.adoc[Wicket viewer] provides an implementation of this service `o.a.i.viewer.wicket.viewer.services.DeepLinkServiceWicket`.
+The xref:vw:ROOT:about.adoc[Wicket viewer] provides an implementation of this service `o.a.i.viewer.wicket.viewer.services.DeepLinkServiceWicket`.
 
-For the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer], a URL can be constructed according to the link:http://www.restfulobjects.org[Restful Objects spec] in conjunction with a `Bookmark` obtained via the xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`].
+For the xref:vro:ROOT::about.adoc[RestfulObjects viewer], a URL can be constructed according to the link:http://www.restfulobjects.org[Restful Objects spec] in conjunction with a `Bookmark` obtained via the xref:rg:svc:integration-api/BookmarkService.adoc[`BookmarkService`].
 
 
 
 == Usage within the framework
 
-The xref:rg:svc:presentation-layer-spi/EmailNotificationService.adoc[`EmailNotificationService`] uses this service in order to generate emails as part of xref:ug:vw:features/user-registration.adoc[user registration].
+The xref:rg:svc:presentation-layer-spi/EmailNotificationService.adoc[`EmailNotificationService`] uses this service in order to generate emails as part of xref:vw:ROOT:features/user-registration.adoc[user registration].
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
index b902c0f..013e1cd 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 TODO: v2: this service has been deleted - remove this doc and update the migration guide.
 
-The `GuiceBeanProvider` domain service acts as a bridge between Apache Isis' xref:ug:vw:about.adoc[Wicket viewer] internal bootstrapping using link:https://github.com/google/guice[Google Guice].
+The `GuiceBeanProvider` domain service acts as a bridge between Apache Isis' xref:vw:ROOT:about.adoc[Wicket viewer] internal bootstrapping using link:https://github.com/google/guice[Google Guice].
 
 This service operates at a very low-level, and you are unlikely to have a need for it.
 It is used internally by the framework, in the default implementation of the xref:rg:svc:presentation-api/DeepLinkService.adoc[`DeepLinkService`].
@@ -32,7 +32,7 @@ public interface GuiceBeanProvider {
 }
 ----
 
-The xref:ug:vw:about.adoc[Wicket viewer] this provides a default implementation of this service.
+The xref:vw:ROOT:about.adoc[Wicket viewer] this provides a default implementation of this service.
 
 To use an alternative implementation, implement the `GuideBeanProvider` interface and use xref:rg:ant:DomainServiceLayout/menuOrder.adoc[`@DomainServiceLayout#menuOrder()`] (as explained in the xref:rg:svc:intro/overriding-the-services.adoc[introduction] to this guide).
 
@@ -41,7 +41,7 @@ To use an alternative implementation, implement the `GuideBeanProvider` interfac
 
 == Usage
 
-Using the xref:ug:vw:about.adoc[Wicket viewer] requires subclassing of `IsisWicketApplication`.
+Using the xref:vw:ROOT:about.adoc[Wicket viewer] requires subclassing of `IsisWicketApplication`.
 In the subclass it is commonplace to override `newIsisWicketModule()`, for example:
 
 [source,java]
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi.adoc
index 11c973d..151eb6d 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi.adoc
@@ -125,7 +125,7 @@ grids for any domain class.
 ``o.a.i.core`` +
 ``isis-core-applib``
 |The default implementation will return the home page (per xref:rg:svc:application-layer-spi/HomePageProviderService.adoc[`HomePageProviderService`]) if a void or null is returned. +
-Used by the xref:ug:vw:about.adoc[Wicket viewer] only.
+Used by the xref:vw:ROOT:about.adoc[Wicket viewer] only.
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
index 4c072de..0ab1832 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The `ContentMappingService` supports the (default implementation of the) xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] enabling the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] to represent domain objects in some other format as specified by the HTTP `Accept` header.
+The `ContentMappingService` supports the (default implementation of the) xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] enabling the xref:vro:ROOT::about.adoc[RestfulObjects viewer] to represent domain objects in some other format as specified by the HTTP `Accept` header.
 
 See xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] for further discussion.
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
index 3364799..a3a2cfd 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The `EmailNotificationService` supports the xref:ug:vw:features/user-registration.adoc[user registration] (self sign-up) features of the xref:ug:vw:about.adoc[Wicket viewer] whereby a user can sign-up to access an application by providing a valid email address.
+The `EmailNotificationService` supports the xref:vw:ROOT:features/user-registration.adoc[user registration] (self sign-up) features of the xref:vw:ROOT:about.adoc[Wicket viewer] whereby a user can sign-up to access an application by providing a valid email address.
 
 The Wicket viewer will check whether an implementation of this service (and also the xref:rg:svc:persistence-layer-spi/UserRegistrationService.adoc[`UserRegistrationService`]) is available, and if so will (unless configured not to) expose a sign-up page where the user enters their email address. A verification email is sent using this service; the email includes a link back to the running application. The user then completes the registration process (choosing a user name, password and so [...]
 
@@ -48,7 +48,7 @@ The text of these email templates is hard-coded as resources, in other words bak
 
 If you have configured an alternative email service implementation, it should process the message body as HTML.
 
-If you wish to write an alternative implementation of this service, note that (unlike most Apache Isis domain services) the implementation is also instantiated and injected by Google Guice. This is because `EmailNotificationService` is used as part of the xref:ug:vw:features/user-registration.adoc[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Apache Isis runtime.
+If you wish to write an alternative implementation of this service, note that (unlike most Apache Isis domain services) the implementation is also instantiated and injected by Google Guice. This is because `EmailNotificationService` is used as part of the xref:vw:ROOT:features/user-registration.adoc[user registration] functionality and is used by Wicket pages that are accessed outside of the usual Apache Isis runtime.
 
 This implies a couple of additional constraints:
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
index a5a3abd..aeba252 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
@@ -75,7 +75,7 @@ In essence, if an exception is recognized then it is also categorized.
 This lets the viewer act accordingly.
 For example, if an exception is raised from the loading of an individual object, then this is passed by the registered ``ExceptionRecognizer``s.
 If any of these recognize the exception as representing a not-found exception, then an Apache Isis `ObjectNotFoundException` is raised.
-Both the viewers interprets this correctly (the xref:ug:vw:about.adoc[Wicket viewer] as a suitable error page, the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] as a 404 status return code).
+Both the viewers interprets this correctly (the xref:vw:ROOT:about.adoc[Wicket viewer] as a suitable error page, the xref:vro:ROOT::about.adoc[Restful Objects viewer] as a 404 status return code).
 
 
 If the implementation recognizes the exception then it returns a user-friendly message to be rendered (by the viewer) back to the user; otherwise it returns `null`.
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
index 460a0cb..595a0f6 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
@@ -53,7 +53,7 @@ the service with the lowest xref:rg:ant:DomainServiceLayout/menuOrder.adoc[`@Dom
 == Implementation
 
 The framework provides `GridSystemServiceBS3`, an implementation that encodes the bootstrap3 grid system.
-(The framework also provides xref:ug:vw:about.adoc[Wicket viewer] components that are capable of interpreting and rendering this metadata).
+(The framework also provides xref:vw:ROOT:about.adoc[Wicket viewer] components that are capable of interpreting and rendering this metadata).
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
index 2e2f5f3..6a3adf9 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The `HintStore` service defines an SPI for the xref:ug:vw:about.adoc[Wicket viewer] to store UI hints on a per-object basis.
+The `HintStore` service defines an SPI for the xref:vw:ROOT:about.adoc[Wicket viewer] to store UI hints on a per-object basis.
 For example, the viewer remembers which tabs are selected, and for collections which view is selected (eg table or hidden),
 which page of a table to render, or whether "show all" (rows) is toggled.
 
@@ -93,6 +93,6 @@ public class CustomerAndOrders implements HintStore.HintIdProvider {
 
 == Related Services
 
-The xref:ug:vw:about.adoc[Wicket viewer] exposes the xref:rg:cms:rgcms.adoc#__rgcms_classes_mixins_Object_clearHints["clear hints"]
+The xref:vw:ROOT:about.adoc[Wicket viewer] exposes the xref:rg:cms:rgcms.adoc#__rgcms_classes_mixins_Object_clearHints["clear hints"]
 mixin action that is for use by end-users of the application to clear any UI hints that have accumulated for a
 domain object.
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
index 80ef3db..d99a2c6 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
@@ -35,11 +35,11 @@ This is notionally request-scoped, returning the `Locale` of the current user; _
 
 == Implementation
 
-Isis' xref:ug:vw:about.adoc[Wicket viewer] provides an implementation of this service (`LocaleProviderWicket`) which leverages Apache Wicket APIs.
+Isis' xref:vw:ROOT:about.adoc[Wicket viewer] provides an implementation of this service (`LocaleProviderWicket`) which leverages Apache Wicket APIs.
 
 [NOTE]
 ====
-Currently there is no equivalent implementation for the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+Currently there is no equivalent implementation for the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 ====
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
index 06f1435..e980159 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 The `MenuBarsService` is responsible for returning a xref:rg:cms:classes/menubars.adoc[`MenuBars`] instance, a data structure representing the arrangement of domain service actions across multiple menu bars, menus and sections.
-This is used by the Wicket viewer to build up the menu, and is also served as the "menuBars" resource by the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer.
+This is used by the Wicket viewer to build up the menu, and is also served as the "menuBars" resource by the xref:vro:ROOT::about.adoc[Restful Objects] viewer.
 
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
index e4e460c..963fac9 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
@@ -18,7 +18,7 @@ of the implementation to figure out what the "owning" object might be.
 +
 For example, return the home page (eg as defined by the xref:rg:ant:HomePage.adoc[`@HomePage`] annotation).
 
-Currently the routing service is used only by the xref:ug:vw:about.adoc[Wicket viewer]; it is ignored by the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer.
+Currently the routing service is used only by the xref:vw:ROOT:about.adoc[Wicket viewer]; it is ignored by the xref:vro:ROOT::about.adoc[Restful Objects] viewer.
 
 
 [NOTE]
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
index f71f9ca..2e2d0b1 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
@@ -31,11 +31,11 @@ public interface TranslationsResolver {
 
 == Implementation
 
-Isis' xref:ug:vw:about.adoc[Wicket viewer] provides an implementation of this service (`TranslationsResolverWicket`) which leverages Apache Wicket APIs.  This searches for translation files in the standard `WEB-INF/` directory.
+Isis' xref:vw:ROOT:about.adoc[Wicket viewer] provides an implementation of this service (`TranslationsResolverWicket`) which leverages Apache Wicket APIs.  This searches for translation files in the standard `WEB-INF/` directory.
 
 [NOTE]
 ====
-Currently there is no equivalent implementation for the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+Currently there is no equivalent implementation for the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 ====
 
 
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
index 3d37232..eaacf1e 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The `UserProfileService` provides the ability for the domain application to return supplementary metadata about the current user. This information is used (by the xref:ug:vw:about.adoc[Wicket viewer]) to customize the appearance of the tertiary "Me" menu bar (top right). For example, rather than display the username, instead the user's first and last name could be displayed.
+The `UserProfileService` provides the ability for the domain application to return supplementary metadata about the current user. This information is used (by the xref:vw:ROOT:about.adoc[Wicket viewer]) to customize the appearance of the tertiary "Me" menu bar (top right). For example, rather than display the username, instead the user's first and last name could be displayed.
 
 Another use case is to allow the user to switch context in some fashion or other. This might be to emulate a sort of "sudo"-like function, or perhaps to focus on some particular set of data.
 
diff --git a/antora/components/support/modules/ROOT/pages/about.adoc b/antora/components/support/modules/ROOT/pages/about.adoc
index 086d31f..8e12c5d 100644
--- a/antora/components/support/modules/ROOT/pages/about.adoc
+++ b/antora/components/support/modules/ROOT/pages/about.adoc
@@ -6,8 +6,8 @@ Apache Isis documentation is broken out into a number of user, reference and "su
 The user guides available are:
 
 * xref:ug:fun:about.adoc[Fundamentals]
-* xref:ug:vw:about.adoc[Wicket viewer]
-* xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
+* xref:vw:ROOT:about.adoc[Wicket viewer]
+* xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
 * xref:ug:sec:about.adoc[Security]
 * xref:ug:tst:about.adoc[Testing]
diff --git a/antora/components/support/modules/dg/pages/asciidoc-templates.adoc b/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
index f368c3a..dbcb2d2 100644
--- a/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
+++ b/antora/components/support/modules/dg/pages/asciidoc-templates.adoc
@@ -307,7 +307,7 @@ include::_attributes.adoc[]
 //
 //
 //|`adugvw`
-//|`\xref:ug:vw:about.adoc#xxx[ttt]`
+//|`\xref:vw:ROOT:about.adoc#xxx[ttt]`
 //
 //A hyperlink to a bookmark within the Wicket viewer guide, where:
 //
@@ -316,13 +316,13 @@ include::_attributes.adoc[]
 //
 //for example:
 //
-//`\xref:ug:vw:customisation.adoc[Customisation]`
+//`\xref:vw:ROOT:customisation.adoc[Customisation]`
 //
-//|xref:ug:vw:customisation.adoc[Customisation]
+//|xref:vw:ROOT:customisation.adoc[Customisation]
 //
 //
 //|`adugvro`
-//|`\xref:ug-vro:ROOT:about.adoc#xxx[ttt]`
+//|`\xref:vro:ROOT::about.adoc#xxx[ttt]`
 //
 //A hyperlink to a bookmark within the Restful Objects viewer guide, where:
 //
@@ -331,9 +331,9 @@ include::_attributes.adoc[]
 //
 //for example:
 //
-//`\xref:ug-vro:ROOT:ro-spec.adoc[RestfulObjects specification]`
+//`\xref:vro:ROOT::ro-spec.adoc[RestfulObjects specification]`
 //
-//|xref:ug-vro:ROOT:ro-spec.adoc[RestfulObjects specification]
+//|xref:vro:ROOT::ro-spec.adoc[RestfulObjects specification]
 //
 //
 //
diff --git a/antora/components/support/modules/dg/pages/hints-and-tips.adoc b/antora/components/support/modules/dg/pages/hints-and-tips.adoc
index 7a84884..40c1191 100644
--- a/antora/components/support/modules/dg/pages/hints-and-tips.adoc
+++ b/antora/components/support/modules/dg/pages/hints-and-tips.adoc
@@ -10,9 +10,9 @@ See also hints-n-tips chapters in the:
 
 * the xref:support:dg:hints-and-tips.adoc[Developers'] guide (this chapter)
 
-* the xref:ug:vw:hints-and-tips.adoc[Wicket viewer] guide
+* the xref:vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide
 
-* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
+* the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
 * the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
diff --git a/antora/components/support/modules/dg/pages/ide/intellij.adoc b/antora/components/support/modules/dg/pages/ide/intellij.adoc
index 571fdf8..bfa787a 100644
--- a/antora/components/support/modules/dg/pages/ide/intellij.adoc
+++ b/antora/components/support/modules/dg/pages/ide/intellij.adoc
@@ -548,7 +548,7 @@ image::intellij-idea/070-advanced/004-gradle-output.png[width="600px",link="{ima
 === Using Gradle for liveReload
 
 Similarly, gradle can be run to reduce the turn-around time when tweaking the UI (defined by the
- xref:ug:vw:layout/file-based.adoc[`*.layout.xml`] file for each domain class), when the app is running.
+ xref:vw:ROOT:layout/file-based.adoc[`*.layout.xml`] file for each domain class), when the app is running.
 
 The framework will automatically notice any changes to `.layout.xml` files, but these are read from the classpath (the `target/classes` directory), not the source path.  With IntelliJ these can be copied over manually
 by invoking `Run > Reload Changed Classes`.  Once the browser is refreshed, the new layout will be rendered.
diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index 2f4c829..e14b4d7 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -20,8 +20,8 @@
 * User Guides
 
 ** *xref:ug:fun:about.adoc[Fundamentals]*
-**  xref:ug:vw:about.adoc[Wicket Viewer]
-**  xref:ug-vro:ROOT:about.adoc[Restful Objects Viewer]
+**  xref:vw:ROOT:about.adoc[Wicket Viewer]
+**  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
 **  xref:ug-odn:ROOT:about.adoc[DataNucleus Object Store]
 **  xref:ug:sec:about.adoc[Security]
 ** *xref:ug:tst:about.adoc[Testing]*
diff --git a/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc b/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc
index b80debd..1de9cf7 100644
--- a/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc
+++ b/antora/components/toc/modules/ROOT/pages/_partials/_powered-by_gesconsultor-grc.adoc
@@ -75,7 +75,7 @@ All the business rules are on a Domain fully implemented in Apache Isis.
 The GRC application require a more sophisticating and customizable viewer than is provided "out-of-the-box" by Apache Isis.
 We chose http://wavemaker.com[Wavemaker] for implementing the viewer, also leveraging and integrating with various Wavemaker services.
 
-Even so, while GRC does (as the figures above show) include custom views, the majority of the views exposed by GRC are automatically generated from the underlying domain entities; the GRC viewer is a proprietary version of Isis' own xref:ug:vw:about.adoc[Wicket viewer].
+Even so, while GRC does (as the figures above show) include custom views, the majority of the views exposed by GRC are automatically generated from the underlying domain entities; the GRC viewer is a proprietary version of Isis' own xref:vw:ROOT:about.adoc[Wicket viewer].
 At the last count more than 400 domain entities, across 6 different Bounded Contexts, are surfaced in the UI in this this way.
 
 At the Domain level, we also extensively use the xref:ug:fun:building-blocks/events/domain-events.adoc[domain events] functionality available in Apache Isis, along with many of the (non-ASF) link:http://platform.incode.org[Incode Platform^] (such as audit, security and excel modules).
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 66861a0..9d5699e 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -39,8 +39,8 @@ include::_attributes.adoc[]
 |*User Guides*
 
 * *xref:ug:fun:about.adoc[Fundamentals]*
-*  xref:ug:vw:about.adoc[Wicket Viewer]
-*  xref:ug-vro:ROOT:about.adoc[Restful Objects Viewer]
+*  xref:vw:ROOT:about.adoc[Wicket Viewer]
+*  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
 *  xref:ug-odn:ROOT:about.adoc[DataNucleus Object Store]
 *  xref:ug:sec:about.adoc[Security]
 * *xref:ug:tst:about.adoc[Testing]*
diff --git a/antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc b/antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc
index 43ae909..346bc92 100644
--- a/antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc
+++ b/antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 
 
 Although it has evolved since, the _Apache Isis_ framework started out as an open source implementation of the naked objects pattern.
-Indeed, the generic user interfaces provided by Apache Isis xref:ug:vw:about.adoc[Wicket] viewer and the xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings.
+Indeed, the generic user interfaces provided by Apache Isis xref:vw:ROOT:about.adoc[Wicket] viewer and the xref:vro:ROOT::about.adoc[Restful Objects] viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings.
 
 If the idea of naked objects is of interest, then there are a couple of books on the topic that you might want to read.
 
@@ -61,4 +61,4 @@ Dan Haywood
 The http://restfulobjects.org[Restful Objects specification] defines a set of RESTful resources, and corresponding JSON representations, for accessing and manipulating a domain object model.
 
 This is a comprehensive specification, running to over 200 pages in length.
-It is implemented by Apache Isis' xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer, and is also implemented by another (non-Apache) open source project, http://nakedobjects.codeplex.com[Naked Objects MVC].
+It is implemented by Apache Isis' xref:vro:ROOT::about.adoc[Restful Objects] viewer, and is also implemented by another (non-Apache) open source project, http://nakedobjects.codeplex.com[Naked Objects MVC].
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
index af224e2..40c90d4 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
@@ -22,7 +22,7 @@ Once you've sketched out your domain model, you can then either start-over using
 One of the original motivations for Apache Isis itself was to be able automatically generate a user interface for a domain object model.
 
 Apache Isis' has a pluggable architecture allowing different user interface technologies.
- The principal implementation (as configured by the xref:simpleapp:ROOT:about.adoc[SimpleApp archetype]) is the xref:ug:vw:about.adoc[Wicket viewer].
+ The principal implementation (as configured by the xref:simpleapp:ROOT:about.adoc[SimpleApp archetype]) is the xref:vw:ROOT:about.adoc[Wicket viewer].
   This provides an appealing default user interface, with the ability to customize the user interface by writing new http://wicket.apache.org[Apache Wicket] components.
 Some third-party components can be found in the (non-ASF) link:http://platform.incode.org[Incode Platform^].
 
@@ -40,7 +40,7 @@ REST (Representation State Transfer) is an architectural style for building high
 Many commercial web APIs (twitter, facebook, Amazon) are implemented as either pure REST APIs or some approximation therein.
 
 The http://restfulobjects.org[Restful Objects specification] defines a means by a domain object model can be exposed as RESTful resources using JSON representations over HTTP.
-Apache Isis' xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] is an implementation of that spec, making any Apache Isis domain object automatically available via REST.
+Apache Isis' xref:vro:ROOT::about.adoc[RestfulObjects viewer] is an implementation of that spec, making any Apache Isis domain object automatically available via REST.
 
 There are two main use cases for deploying Apache Isis as a RESTful web service are:
 
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 2029c38..7cc4c3e 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -64,7 +64,7 @@ Walking through the main classes that make up the SimpleApp: `SimpleObject` pers
 
 
 |link:https://www.youtube.com/watch?v=KCJ1ZPPB3pA[004^] +
-Using the optional `Xxx.layout.xml` file to provide xref:ug:vw:layout/file-based.adoc[layout metadata] to dynamically render a domain object using the link:http://getbootstrap.com[Bootstrap 3] grid system.
+Using the optional `Xxx.layout.xml` file to provide xref:vw:ROOT:layout/file-based.adoc[layout metadata] to dynamically render a domain object using the link:http://getbootstrap.com[Bootstrap 3] grid system.
 ||x|||||||||
 
 
@@ -108,7 +108,7 @@ Writing end-to-end xref:ug:tst:integ-test-support.adoc[integration tests] for a
 include::partial$_screencasts-playlists.adoc[]
 
 |link:https://www.youtube.com/watch?v=lkZxRSS0Zwg[009^] +
-Using the Swagger UI to access the xref:ug-vro:ROOT:about.adoc[REST API] automatically exposed for domain services, entities, and/or view models
+Using the Swagger UI to access the xref:vro:ROOT::about.adoc[REST API] automatically exposed for domain services, entities, and/or view models
 ||||||||||x|
 
 
@@ -139,7 +139,7 @@ include::partial$_screencasts-playlists.adoc[]
 
 
 |link:https://www.youtube.com/watch?v=dfRZeYqzMtI[012^] +
-Implementing business logic using a (no-arg) action, and associating with a property using either the xref:rg:ant:MemberOrder.adoc[`@MemberOrder`] annotations or using xref:ug:vw:layout/file-based.adoc[dynamic (XML) layouts].
+Implementing business logic using a (no-arg) action, and associating with a property using either the xref:rg:ant:MemberOrder.adoc[`@MemberOrder`] annotations or using xref:vw:ROOT:layout/file-based.adoc[dynamic (XML) layouts].
 |x||||||||x||
 
 
@@ -198,7 +198,7 @@ Extending a xref:ug:tst:fixture-scripts.adoc[fixture script] to more easily demo
 
 
 |link:https://www.youtube.com/watch?v=39Hpd7C4Kvo[018^] +
-Using xref:ug:vw:layout/file-based.adoc[dynamic (XML) layouts] to specify the page size for a domain object's collection.
+Using xref:vw:ROOT:layout/file-based.adoc[dynamic (XML) layouts] to specify the page size for a domain object's collection.
 ||||x|||||||
 
 
@@ -212,20 +212,20 @@ Using xref:ug:vw:layout/file-based.adoc[dynamic (XML) layouts] to specify the pa
 include::partial$_screencasts-playlists.adoc[]
 
 |link:https://www.youtube.com/watch?v=0d713-V4vrg[019^] +
-Demonstrates how Apache Isis' xref:ug:vw:about.adoc[Wicket viewer] remembers the state of rendered domain objects, and how the end-user of the
+Demonstrates how Apache Isis' xref:vw:ROOT:about.adoc[Wicket viewer] remembers the state of rendered domain objects, and how the end-user of the
  application can clear these UI hints using the (framework-provided) xref:rg:cms:rgcms.adoc#__rgcms_classes_mixins_Object_clearHints["clear hints"] action.
 |||x||||||||
 
 
 
 |link:https://www.youtube.com/watch?v=Kqch-XNlBMA[020^] +
-Demonstrates how the end-user can copy and share URLs for domain objects - including UI hints - using Apache Isis' xref:ug:vw:about.adoc[Wicket viewer].
+Demonstrates how the end-user can copy and share URLs for domain objects - including UI hints - using Apache Isis' xref:vw:ROOT:about.adoc[Wicket viewer].
 |||x||||||||
 
 
 
 |link:https://www.youtube.com/watch?v=a0QQLT_16To[021^] +
-Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' xref:ug:vw:about.adoc[Wicket viewer], and how the developer can ensure that xref:rg:ant:DomainObjectLayout/bookmarking.adoc[domain objects] and (xref:rg:ant:Action/semantics.adoc[query-only]) xref:rg:ant:ActionLayout/bookmarking.adoc[actions] can be bookmarked.
+Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' xref:vw:ROOT:about.adoc[Wicket viewer], and how the developer can ensure that xref:rg:ant:DomainObjectLayout/bookmarking.adoc[domain objects] and (xref:rg:ant:Action/semantics.adoc[query-only]) xref:rg:ant:ActionLayout/bookmarking.adoc[actions] can be bookmarked.
 |||x||||||||
 
 
@@ -425,7 +425,7 @@ include::partial$_screencasts-playlists.adoc[]
 
 
 |link:https://www.youtube.com/watch?v=esujf_DFeWA[041^] +
-Using BigDecimal as a property within a domain object, also demonstrating the "summary" view within the xref:ug:vw:about.adoc[Wicket viewer].
+Using BigDecimal as a property within a domain object, also demonstrating the "summary" view within the xref:vw:ROOT:about.adoc[Wicket viewer].
 |||||||x||x|x|
 
 
@@ -549,7 +549,7 @@ The (very simple) steps required to rename a domain entity class.
 
 
 |link:https://www.youtube.com/watch?v=J5xobU6X0ng[057^] +
-How to rename a menu (on the top-level menubar) as rendered in the  xref:ug:vw:about.adoc[Wicket viewer].
+How to rename a menu (on the top-level menubar) as rendered in the  xref:vw:ROOT:about.adoc[Wicket viewer].
 |x||||||||||
 
 
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring/bulk-load.adoc b/antora/components/ug-odn/modules/ROOT/pages/configuring/bulk-load.adoc
index aeb2948..7748fe2 100644
--- a/antora/components/ug-odn/modules/ROOT/pages/configuring/bulk-load.adoc
+++ b/antora/components/ug-odn/modules/ROOT/pages/configuring/bulk-load.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The implementation of user interactions (meaning either an action invocations or a property edits) in the xref:ug:vw:about.adoc[Wicket viewer] is splits into two.
+The implementation of user interactions (meaning either an action invocations or a property edits) in the xref:vw:ROOT:about.adoc[Wicket viewer] is splits into two.
 The first phase performs the actual interaction, with the results (dirtied objects) flushed to the database.
 The second phase then renders the results of the interaction.
 
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc b/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc
index e36c924..0f4249d 100644
--- a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc
+++ b/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc
@@ -9,9 +9,9 @@ See also hints-n-tips chapters in the:
 
 * the xref:support:dg:hints-and-tips.adoc[Developers'] guide
 
-* the xref:ug:vw:hints-and-tips.adoc[Wicket viewer] guide
+* the xref:vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide
 
-* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
+* the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
 * the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide (this chapter)
 
diff --git a/antora/components/ug-sec/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc b/antora/components/ug-sec/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
index 843a489..bba53a7 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
@@ -48,7 +48,7 @@ This can be configured in `authentication_shiro.properties` file:
 isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false
 ----
 
-This configuration property only comes into effect for the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]; if set then the Shiro subject - if found to be still authenticated - will be logged out anyway and then re-authenticated.
+This configuration property only comes into effect for the xref:vro:ROOT::about.adoc[Restful Objects viewer]; if set then the Shiro subject - if found to be still authenticated - will be logged out anyway and then re-authenticated.
 
 [WARNING]
 ====
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
index a6d626a..b79b5eb 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
@@ -13,7 +13,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vw:ROOT::hints-and-tips.adoc[Wicket viewer] guide
 
-* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
+* the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
 * the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
diff --git a/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc b/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
index 8778e79..7089ad7 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-By and large the security mechanisms within Isis are transparent to the rest of the framework (the xref:vw:ROOT::about.adoc[Wicket Viewer] and xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], and the overall xref:rg:cfg:about[core runtime]).
+By and large the security mechanisms within Isis are transparent to the rest of the framework (the xref:vw:ROOT::about.adoc[Wicket Viewer] and xref:vro:ROOT::about.adoc[Restful Objects viewer], and the overall xref:rg:cfg:about[core runtime]).
 
 That said, it is the responsibility of the viewers to ensure that for each request there is a valid user session present.  The sections below explain how this works.
 
@@ -65,7 +65,7 @@ If you are using an LDAP realm and want to enable user-self registration then yo
 
 == Restful Objects Viewer
 
-Unlike the Wicket viewer, the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] does *not* provide any sort of login page; rather it provides a pluggable authentication strategy, delegated to by the `IsisSessionFilter` filter (set up by the framework's web bootstrapping).
+Unlike the Wicket viewer, the xref:vro:ROOT::about.adoc[Restful Objects viewer] does *not* provide any sort of login page; rather it provides a pluggable authentication strategy, delegated to by the `IsisSessionFilter` filter (set up by the framework's web bootstrapping).
 The authentication strategy is responsible for ensuring that a session is available for the REST resource.
 
 The API of `AuthenticationSessionStrategy` is simply:
diff --git a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc b/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
index 32f74d8..08ace3f 100644
--- a/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
+++ b/antora/components/ug-tst/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
@@ -90,7 +90,7 @@ It can also call `add(...)` or `remove(...)` on the collection (returned by the
 +
 [NOTE]
 ====
-In this respect the wrapper is more functional than the xref:ug:vw:about.adoc[Wicket viewer] (which does not expose the ability to mutate collections directly).
+In this respect the wrapper is more functional than the xref:vw:ROOT:about.adoc[Wicket viewer] (which does not expose the ability to mutate collections directly).
 ====
 
 * for *_object actions_* the test can call the action method itself.
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/antora/components/ug/modules/ROOT/pages/about.adoc
index 229ab71..e2f2199 100644
--- a/antora/components/ug/modules/ROOT/pages/about.adoc
+++ b/antora/components/ug/modules/ROOT/pages/about.adoc
@@ -7,7 +7,7 @@ The user guides available are:
 
 * xref:ug:fun:about.adoc[Fundamentals]
 * xref:vw:ROOT::about.adoc[Wicket viewer]
-* xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
+* xref:vro:ROOT::about.adoc[Restful Objects viewer]
 * xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
 * xref:ug-sec:ROOT:about.adoc[Security]
 * xref:ug-tst:ROOT:about.adoc[Testing]
diff --git a/antora/components/ug/modules/btb/pages/headless-access.adoc b/antora/components/ug/modules/btb/pages/headless-access.adoc
index b4890f9..b19d761 100644
--- a/antora/components/ug/modules/btb/pages/headless-access.adoc
+++ b/antora/components/ug/modules/btb/pages/headless-access.adoc
@@ -2,7 +2,7 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 include::_attributes.adoc[]
 
-This section tackles the topic of enabling access to an Apache Isis application directly, or at least, not through either the xref:vw:ROOT::about.adoc[Wicket] or xref:ug-vro:ROOT:about.adoc[Restful] viewers.
+This section tackles the topic of enabling access to an Apache Isis application directly, or at least, not through either the xref:vw:ROOT::about.adoc[Wicket] or xref:vro:ROOT::about.adoc[Restful] viewers.
 
 There are several main use-cases:
 
@@ -12,7 +12,7 @@ There are several main use-cases:
 
 * leveraging an Apache Isis application within a batch process
 
-Note that the calling thread runs in the same process space as the Apache Isis domain object model (must be physically linked to the JAR files containing the domain classes).  For use cases where the calling thread runs in some other process space (eg migrating data from a legacy system), then the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] is usually the way to go.
+Note that the calling thread runs in the same process space as the Apache Isis domain object model (must be physically linked to the JAR files containing the domain classes).  For use cases where the calling thread runs in some other process space (eg migrating data from a legacy system), then the xref:vro:ROOT::about.adoc[Restful Objects viewer] is usually the way to go.
 
 The API described in this chapter is reasonably low-level, allowing code to interact very directly with the Apache Isis metamodel and runtime.  Such callers should be considered trusted: they do not (by default) honour any business rules eg implicit in the Isis annotations or hide/disable/validate methods.  However the xref:rg:svc:application-layer-api/WrapperFactory.adoc[`WrapperFactory`] service could be used to enforce such business rules if required.
 
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
index 1a0f303..51d8c19 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
@@ -12,7 +12,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vw:ROOT::hints-and-tips.adoc[Wicket viewer] guide
 
-* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
+* the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
 * the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
index a095da7..14183b3 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
@@ -40,7 +40,7 @@ You get the idea.
 
 The framework provides the xref:rg:svc:application-layer-api/MessageService.adoc[`MessageService`] as a means to return an out-of-band
 message to the end-user.  In the xref:vw:ROOT::about.adoc[Wicket viewer] these are shown as "toast" pop-ups; the
-xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] returns an HTTP header.
+xref:vro:ROOT::about.adoc[Restful Objects viewer] returns an HTTP header.
 
 The `UserService` provides three APIs, for different:
 
@@ -57,7 +57,7 @@ None of these messages/errors has any influence on the transaction; any changes
 
 If you want to abort Apache Isis' transaction, this can be done by throwing an exception.  The exception message
 is displayed to the user on the error page (if xref:vw:ROOT::about.adoc[Wicket viewer]) or a 500 status error code (if the
-xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer).
+xref:vro:ROOT::about.adoc[Restful Objects] viewer).
 
 If the exception thrown is because of an unexpected error (eg a `NullPointerException` in the domain app itself), then
 the error page will include a stack trace.  If however you want to indicate that the exception is in some sense
diff --git a/antora/components/ug/modules/btb/pages/web-xml.adoc b/antora/components/ug/modules/btb/pages/web-xml.adoc
index d239b30..7472870 100644
--- a/antora/components/ug/modules/btb/pages/web-xml.adoc
+++ b/antora/components/ug/modules/btb/pages/web-xml.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 // TODO: v2: a lot of this has changed, because we now use `WebModule_Xxx` instead of `web.xml`, ie set this stuff up programmatically.
 
 
-Apache Isis provides two different viewers, the xref:vw:ROOT::about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+Apache Isis provides two different viewers, the xref:vw:ROOT::about.adoc[Wicket viewer] and the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 You can deploy both of these concurrently, or deploy just the Wicket viewer, or deploy just the Restful Objects viewer.
 The configuration in `web.xml` varies accordingly, both in terms of the servlet context listeners, filters and servlets.
 
@@ -466,7 +466,7 @@ This filter should be mapped to the `servlet-name` for the RestEasy `HttpServlet
 
 === `IsisTransactionFilterForRestfulObjects`
 
-The `IsisTransactionFilterForRestfulObjects` filter simply ensures that a transaction is in progress for all calls routed to the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+The `IsisTransactionFilterForRestfulObjects` filter simply ensures that a transaction is in progress for all calls routed to the xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 
 Its definition is:
 
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
index 8236a8c..fee6e45 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
@@ -29,7 +29,7 @@ When the PDF is scanned by the mail room, the barcode could be read to attach th
 
 * similarly within implementations of xref:rg:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`] to persist published action invocations
 
-* and of course both the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] and xref:vw:ROOT::about.adoc[Wicket viewer] use the oid tuple to look up, render and allow the user to interact with domain objects.
+* and of course both the xref:vro:ROOT::about.adoc[RestfulObjects viewer] and xref:vw:ROOT::about.adoc[Wicket viewer] use the oid tuple to look up, render and allow the user to interact with domain objects.
 
 Although the exact content of an OID should be considered opaque by domain objects, it is possible for domain objects to obtain OIDs.
 These are represented as ``Bookmark``s, obtained from the xref:rg:svc:integration-api/BookmarkService.adoc[``BookmarkService``].
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
index df8a64f..df3b005 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
@@ -8,7 +8,7 @@ End users interact with view models in the same way as a domain entity, indeed t
 
 However, whereas domain entities are mapped to a datastore, view models are not.
 Instead they are recreated dynamically by serializing their state, ultimately into the URL itself (meaning their state it is in effect implicitly managed by the client browser).
-You will notice that the URL for view models (as shown in xref:vw:ROOT::about.adoc[Wicket viewer] or xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) tends to be quite long.
+You will notice that the URL for view models (as shown in xref:vw:ROOT::about.adoc[Wicket viewer] or xref:vro:ROOT::about.adoc[RestfulObjects viewer]) tends to be quite long.
 
 This capability opens up a number of more advanced use cases:
 
@@ -101,10 +101,10 @@ However, if the application needs to integrate with other systems, or if the app
 
 DTOs (data transfer objects) are simple classes that (according to link:https://en.wikipedia.org/wiki/Data_transfer_object[wikipedia]) "carry data between processes".
 
-If those two processes are parts of the same overall application (the same team builds and deploys both server and client) then there's generally no need to define a DTO; just access the entities using Apache Isis' xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+If those two processes are parts of the same overall application (the same team builds and deploys both server and client) then there's generally no need to define a DTO; just access the entities using Apache Isis' xref:vro:ROOT::about.adoc[RestfulObjects viewer].
 
 On the other hand, if the client consuming the DTO is a different application -- by which we mean developed/deployed by a different (possible third-party) team -- then the DTOs act as a formal contract between the provider and the consumer.
-In such cases, exposing domain entities over xref:ug-vro:ROOT:about.adoc[RestfulObjects] would be "A Bad Thing"(TM) because the consumer would in effect have access to implementation details that could then not be easily changed by the producer.
+In such cases, exposing domain entities over xref:vro:ROOT::about.adoc[RestfulObjects] would be "A Bad Thing"(TM) because the consumer would in effect have access to implementation details that could then not be easily changed by the producer.
 
 To support this use case, a view model can be defined such that it can act as a DTO.
 This is done by annotating the class using JAXB annotations; this allows the consumer to obtain the DTO in XML format along with a corresponding XSD schema describing the structure of that XML.
@@ -124,7 +124,7 @@ Details of how to consume such DTOs can be found xref:ug:fun:programming-model/v
 
 == For REST Clients
 
-The xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer automatically provides a REST API for both domain entities.
+The xref:vro:ROOT::about.adoc[Restful Objects] viewer automatically provides a REST API for both domain entities.
 Or, you can use it to only expose view models, taking care to map the state of the domain entity/ies into a view model.
 
 Which beckons the question: when is it safe to safe to expose domain entities directly as REST resources, and when should view models be exposed instead.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
index b961e66..44b85d0 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
@@ -42,6 +42,6 @@ In CQRS the commands correspond to the business logic that mutates the system.
 Whether this logic is part of the command class (`PlaceOrderCommand`) or whether that command delegates to methods on the domain object is an implementation detail; but it certainly is common for the business logic to be wholly within the command object and for the domain object to be merely a data holder of the data within the command/write datastore.
 
 In Apache Isis this same separation of business logic from the underlying data can be accomplished most straightforwardly using xref:ug:fun:building-blocks/types-of-domain-objects/mixins.adoc[mixins].
-In the UI (surfaced by the xref:vw:ROOT::about.adoc[Wicket viewer]) or in the REST API (surfaced by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
+In the UI (surfaced by the xref:vw:ROOT::about.adoc[Wicket viewer]) or in the REST API (surfaced by the xref:vro:ROOT::about.adoc[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
 
 
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index ab210de..a2f5480 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -12,7 +12,7 @@ The views provided out of the box by these frameworks tend to be simple  _CRUD_-
 More sophisticated behavior is accomplished by customizing the generated controllers.
 
 The most obvious difference when developing an Apache Isis application is its deliberate lack of an explicit controller layer; non- _CRUD_ behavior is automatically made available in its generic object-oriented  __UI__s.
-More sophisticated UIs can be built either by xref:vw:ROOT::extending.adoc[extending Apache Isis' Wicket viewer] or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by Apache Isis' xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer.
+More sophisticated UIs can be built either by xref:vw:ROOT::extending.adoc[extending Apache Isis' Wicket viewer] or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by Apache Isis' xref:vro:ROOT::about.adoc[Restful Objects] viewer.
 Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.
 
 Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent link:http://platform.incode.org[Incode Platform^] modules (non-ASF) tend to work at a higher-level of abstraction.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc b/antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc
index 92135a1..99e0968 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc
@@ -60,7 +60,7 @@ REST (Representation State Transfer) is an architectural style for building high
 Many commercial web APIs (twitter, facebook, Amazon) are implemented as either pure REST APIs or some approximation therein.
 
 The http://restfulobjects.org[Restful Objects specification] defines a means by a domain object model can be exposed as RESTful resources using JSON representations over HTTP.
-Apache Isis' xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] is an implementation of that spec, making any Apache Isis domain object automatically available via REST.
+Apache Isis' xref:vro:ROOT::about.adoc[RestfulObjects viewer] is an implementation of that spec, making any Apache Isis domain object automatically available via REST.
 
 There are a number of use cases for deploying Isis as a REST API, including:
 
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc b/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
index 92e572d..c6159f9 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 
 Apache Isis is primarily aimed at custom-built "enterprise" applications.
 The UI provided by the xref:vw:ROOT::about.adoc[Wicket viewer] is intended to be usable by domain experts, typically end-users within the organization.
-The REST API exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] allows custom apps to be developed -- eg using Angular or similar -- for use by those requiring more guidance; typically end-users outside of the organization.
+The REST API exposed by the xref:vro:ROOT::about.adoc[RestfulObjects viewer] allows custom apps to be developed -- eg using Angular or similar -- for use by those requiring more guidance; typically end-users outside of the organization.
 This section describes some of the core principles and values that the framework aims to honour and support.
 
 
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc b/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
index 37bf646..56b392a 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
@@ -21,7 +21,7 @@ The diagram below illustrates this:
 .decoupled applications
 image::core-concepts/philosophy/decoupled-applications.png[width="800px",link="{imagesdir}/core-concepts/philosophy/decoupled-applications.png"]
 
-Here, the presentation layer (xref:vw:ROOT::about.adoc[Wicket UI] or xref:ug-vro:ROOT:about.adoc[REST API]) is handled by the framework, while the developer focusses on just the domain layer.
+Here, the presentation layer (xref:vw:ROOT::about.adoc[Wicket UI] or xref:vro:ROOT::about.adoc[REST API]) is handled by the framework, while the developer focusses on just the domain layer.
 The framework encourages splitting this functionality into modules; each such module has its counterpart (typically tables within a given RDBMS database schema) within the persistence layer.
 
 This architecture means that it's impossible for business logic to leach out into the adjacent presentation layer because the developer doesn't (can't) write any code for presentation layer.
diff --git a/antora/components/ug/modules/fun/pages/programming-model.adoc b/antora/components/ug/modules/fun/pages/programming-model.adoc
index fe856bf..18e8780 100644
--- a/antora/components/ug/modules/fun/pages/programming-model.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model.adoc
@@ -49,7 +49,7 @@ Indeed, they can additionally be annotated using `@XmlTypeAdapter` if required.
 As for view models, which is used is a matter of personal preference.
 
 * finally, *domain services*` are annotated with `@DomainService(nature=...)` where the nature is either `VIEW` (for domain services whose actions appear in the viewers, eg on the top-level menu bars), or `DOMAIN` (for domain services whose
-functionality is simply for other domain objects to invoke programmatically), or `VIEW_REST_ONLY` (for domain services whose functionality is surfaced only by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]).
+functionality is simply for other domain objects to invoke programmatically), or `VIEW_REST_ONLY` (for domain services whose functionality is surfaced only by the xref:vro:ROOT::about.adoc[RestfulObjects viewer]).
 
 You can generally recognize an Apache Isis domain class because it will be probably be annotated using `@DomainObject` and `@DomainService`.
 
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc b/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
index 277beaa..3e34bda 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
@@ -8,11 +8,11 @@ In larger applications we have found it worthwhile to ensure that our domain ser
 
 The application provides the `@DomainService(nature=...)` annotation that helps distinguish some of these responsibilities:
 
-* `VIEW` indicates that the actions should appear on the menu of the xref:vw:ROOT::about.adoc[Wicket viewer], and as top-level actions for the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
+* `VIEW` indicates that the actions should appear on the menu of the xref:vw:ROOT::about.adoc[Wicket viewer], and as top-level actions for the REST API provided by the xref:vro:ROOT::about.adoc[Restful Objects viewer]
 
 * `DOMAIN` indicates that the actions are for other domain objects to invoke (either directly or indirectly through the event bus), but in any case should not be rendered at all in the UI
 
-* `VIEW_REST_ONLY` indicates that the actions should appear in the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], but not rendered by the xref:vw:ROOT::about.adoc[Wicket viewer].
+* `VIEW_REST_ONLY` indicates that the actions should appear in the REST API provided by the xref:vro:ROOT::about.adoc[Restful Objects viewer], but not rendered by the xref:vw:ROOT::about.adoc[Wicket viewer].
 
 If the domain service nature is not specified (or is left to its default, `VIEW`), then the service's actions will appear in the UI.
 
diff --git a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc b/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
index d4100b0..df07916 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
@@ -123,7 +123,7 @@ If this is omitted then whether editing is enabled or disabled is defined global
 
 == Ignoring Properties
 
-By default Apache Isis will automatically render all properties in the xref:vw:ROOT::about.adoc[Wicket UI] or in the xref:ug-vro:ROOT:about.adoc[REST API].
+By default Apache Isis will automatically render all properties in the xref:vw:ROOT::about.adoc[Wicket UI] or in the xref:vro:ROOT::about.adoc[REST API].
 To get Apache Isis to ignore a property (exclude it from its metamodel), annotate the getter using `@Programmatic`.
 
 Similarly, you can tell JDO/DataNucleus to ignore a property using the `@javax.jdo.annotations.NotPersistent` annotation.
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc b/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
index 2c71f9e..d52602f 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-The actual consumers of DTOs will generally obtain the XML of the view models either by requesting the XML directly, eg using the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer], or may have the XML sent to them asynchronously using an ESB such as Apache Camel.
+The actual consumers of DTOs will generally obtain the XML of the view models either by requesting the XML directly, eg using the xref:vro:ROOT::about.adoc[RestfulObjects viewer], or may have the XML sent to them asynchronously using an ESB such as Apache Camel.
 
 In the former case, the consumer requests the DTO by calling the REST API with the appropriate HTTP `Accept` header.
 An appropriate implementation of xref:rg:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`] can then be used to return the appropriate DTO (as XML).
@@ -23,7 +23,7 @@ In our case we focus on the validation (to determine the nature of the inbound m
 The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module provides an out-of-the-box solution of this design.
 It provides an implementation of the xref:rg:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`], but which simply publishes instances of xref:rg:cms:schema/ixn.adoc[`InteractionDto`] to an ActiveMQ queue.
 Camel (or similar) can then be hooked up to consume these events from this queue, and use a processor to parse the action memento to determine what has changed on the source system.
-Thereafter, a subsequent Camel processor can then call back to the source - via the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] - to enrich the message with additional details using a DTO.
+Thereafter, a subsequent Camel processor can then call back to the source - via the xref:vro:ROOT::about.adoc[Restful Objects viewer] - to enrich the message with additional details using a DTO.
 
 
 
diff --git a/antora/components/ug-vro/antora.yml b/core/viewer-restfulobjects/_adoc/antora.yml
similarity index 55%
rename from antora/components/ug-vro/antora.yml
rename to core/viewer-restfulobjects/_adoc/antora.yml
index 914e826..62fff18 100644
--- a/antora/components/ug-vro/antora.yml
+++ b/core/viewer-restfulobjects/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: ug-vro
-title: "User Guides - Restful Objects Viewer"
+name: vro
+title: "Restful Objects Viewer"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/ug-vro/examples.csv b/core/viewer-restfulobjects/_adoc/examples.csv
similarity index 100%
rename from antora/components/ug-vro/examples.csv
rename to core/viewer-restfulobjects/_adoc/examples.csv
diff --git a/antora/components/ug-vro/modules/ROOT/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/_attributes.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/examples/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/examples/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ug-vro/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png b/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png
diff --git a/antora/components/ug-vro/modules/ROOT/assets/images/rgfis/service-collaborations.png b/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis/service-collaborations.png
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/assets/images/rgfis/service-collaborations.png
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis/service-collaborations.png
diff --git a/antora/components/ug-vro/modules/ROOT/assets/attachments/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/assets/attachments/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ug-vro/modules/ROOT/nav.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/nav.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/_attributes.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations/_attributes.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/about.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/about.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/architecture.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc
similarity index 91%
rename from antora/components/ug-vro/modules/ROOT/pages/architecture.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc
index 3ffabef..4190055 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/architecture.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] implements the http://restfulobjects.org[Restful Object spec], meaning
+The xref:vro:ROOT::about.adoc[RestfulObjects viewer] implements the http://restfulobjects.org[Restful Object spec], meaning
 that it defines a well-defined set of endpoint URLs as resources, and generates a well-defined set of (JSON)
 representations when these resources are accessed.
 
@@ -31,7 +31,7 @@ xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiatio
 HTTP `Accept` header.  If the implementation does not recognize the value of the header, if can simply return `null`. +
 +
 The framework provides a number of implementations; an implementation that handles the
-xref:ug-vro:ROOT:simplified-representations.adoc[simplified representation] of the Apache Isis profile; an implementation that provides support for the `x-ro-domain-type` parameter, and a
+xref:vro:ROOT::simplified-representations.adoc[simplified representation] of the Apache Isis profile; an implementation that provides support for the `x-ro-domain-type` parameter, and a
 default/fallback implementation that returns the representations defined by the RO spec.
 
 * `ContentMappingService` +
diff --git a/antora/components/ug-vro/modules/ROOT/pages/configuration-properties.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/configuration-properties.adoc
similarity index 94%
rename from antora/components/ug-vro/modules/ROOT/pages/configuration-properties.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/configuration-properties.adoc
index 187169c..c6f21ea 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/configuration-properties.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/configuration-properties.adoc
@@ -26,7 +26,7 @@ The following configuration properties are supported:
 |`isis.viewer.restfulobjects.` +
 `honorUiHints`
 | `true`,`false` (`_false_`)
-|A mechanism for reducing the number of round-trips by eagerly rendering collections; discussed xref:ug-vro:ROOT:ro-spec.adoc#honor-ui-hints[here].
+|A mechanism for reducing the number of round-trips by eagerly rendering collections; discussed xref:vro:ROOT::ro-spec.adoc#honor-ui-hints[here].
 
 |`isis.viewer.restfulobjects.` +
 `strictAcceptChecking`
@@ -35,7 +35,7 @@ The following configuration properties are supported:
 `ContentNegotiationServiceForRestfulObjectsV1_0` service). Will otherwise accept anything.  +
 
 This is convenient because it allows the `Accept` header to be set to that of the
-xref:ug-vro:ROOT:simplified-representations.adoc[Apache Isis profile] for all resources, rather than simply the
+xref:vro:ROOT::simplified-representations.adoc[Apache Isis profile] for all resources, rather than simply the
 handful of resources that supported that profile.
 
 |===
@@ -135,7 +135,7 @@ isis.viewer.restfulobjects.suppressMemberDisabledReason=true
 
 [NOTE]
 ====
-If these configuration settings are set in conjunction with using the xref:ug-vro:ROOT:simplified-representations.adoc#apache-isis-profile[Apache Isis profile], then the special `$$ro` property in the representations with reflect these settings.
+If these configuration settings are set in conjunction with using the xref:vro:ROOT::simplified-representations.adoc#apache-isis-profile[Apache Isis profile], then the special `$$ro` property in the representations with reflect these settings.
 ====
 
 
diff --git a/antora/components/ug-vro/modules/ROOT/pages/health-check.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/health-check.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/health-check.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/health-check.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 91%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index a4d2dfe..ccd06e2 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -9,9 +9,9 @@ See also hints-n-tips chapters in the:
 
 * the xref:support:dg:hints-and-tips.adoc[Developers'] guide
 
-* the xref:ug:vw:hints-and-tips.adoc[Wicket viewer] guide
+* the xref:vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide
 
-* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide (this chapter)
+* the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide (this chapter)
 
 * the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/_attributes.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/angular-tips.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/layout-resources.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/layout-resources.adoc
similarity index 94%
rename from antora/components/ug-vro/modules/ROOT/pages/layout-resources.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/layout-resources.adoc
index 51cc002..cfa6cad 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/layout-resources.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/layout-resources.adoc
@@ -244,9 +244,9 @@ The representation returned by this resource is essentially exactly the same as
 
 == Static vs Dynamic Resources
 
-The xref:ug-vro:ROOT:layout-resources.adoc#menu-layout[menu layout] representation includes all possible domain services; it does not follow that the current user has access to all of these actions (some may be hidden or disabled).
+The xref:vro:ROOT::layout-resources.adoc#menu-layout[menu layout] representation includes all possible domain services; it does not follow that the current user has access to all of these actions (some may be hidden or disabled).
 
-Similarly, the xref:ug-vro:ROOT:layout-resources.adoc#domain-object-layout[domain object layout] representation include all _possible_ properties, collections and actions of the domain object; again, the current user may not have access to all of these members.
+Similarly, the xref:vro:ROOT::layout-resources.adoc#domain-object-layout[domain object layout] representation include all _possible_ properties, collections and actions of the domain object; again, the current user may not have access to all of these members.
 It is also often the case that the domain object's internal state will determine which members to make available (eg, show only one of "lock" and "unlock" actions at any given time).
 
 To determine what should actually be rendered, the REST client should follow the links to the standard Restful Objects resources.
diff --git a/antora/components/ug-vro/modules/ROOT/pages/ro-spec.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/ro-spec.adoc
similarity index 96%
rename from antora/components/ug-vro/modules/ROOT/pages/ro-spec.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/ro-spec.adoc
index b0da90a..d416b3f 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/ro-spec.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/ro-spec.adoc
@@ -125,7 +125,7 @@ Accept: application/xml;x-ro-domain-type="com.mycompany.viewmodels.v2.CustomerVi
 
 The server will use the xref:rg:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`] to attempt to
 transform the domain object into the requested `x-ro-domain-type`.  The whole process is discussed in more detail in
-the xref:ug-vro:ROOT:architecture.adoc[architecture] chapter.
+the xref:vro:ROOT::architecture.adoc[architecture] chapter.
 
 
 ==== Apache Isis profile
@@ -137,7 +137,7 @@ link:http://angular-ui.github.io/bootstrap/[Angular Bootstrap],
 link:http://vitalets.github.io/angular-xeditable/[Angular XEditable],
 link:https://github.com/mgcrea/angular-strap[Angular Strap].
 
-This support is discussed further in the xref:ug-vro:ROOT:simplified-representations.adoc[simplified representations]
+This support is discussed further in the xref:vro:ROOT::simplified-representations.adoc[simplified representations]
 chapter.
 
 
@@ -145,7 +145,7 @@ chapter.
 
 The Restful Objects viewer supports the `x-ro-follow-links` query parameter in a way very similar to that suggested
 in the RO spec, the main point being to avoid the "N+1" problem of too many (slow) network calls.  For example, using
-this feature one can load a grid of data in a single call.  (That said, the xref:ug-vro:ROOT:simplified-representations.adoc[simplified representations]
+this feature one can load a grid of data in a single call.  (That said, the xref:vro:ROOT::simplified-representations.adoc[simplified representations]
 supported by Restful Objects viewer also support this use case, albeit in way that deviates from the RO spec).
 
 This link:https://www.youtube.com/watch?v=hSKnqqBQ7Zo[screencast] demonstrates the Restful Object viewer's support for `x-ro-follow-links` parameter, using the (non-ASF) http://github.com/isisaddons/isis-app-kitchensink[Isis addons' kitchensink] app as the example,
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
similarity index 96%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
index cabd00f..d26dce4 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
@@ -14,7 +14,7 @@ link:https://github.com/mgcrea/angular-strap[Angular Strap].
 
 Apache Isis also provides support for its own simplified representation for the most commonly-used representations.
 This is implemented using the `ContentNegotiationService` described in the
-xref:ug-vro:ROOT:architecture.adoc[architecture] chapter.
+xref:vro:ROOT::architecture.adoc[architecture] chapter.
 
 
 
diff --git a/antora/components/ug-vro/modules/ROOT/pages/_partials/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/_attributes.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/action-invocation.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
similarity index 90%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations/action-invocation.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
index 16cd25d..18dbe3f 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/action-invocation.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
@@ -8,7 +8,7 @@ When an action is invoked, it can return a domain object, a list, a scalar, or r
 
 == Returning an Object
 
-If the action returned an object, then the xref:ug-vro:ROOT:simplified-representations/domain-object.adoc[domain object representation] is returned.
+If the action returned an object, then the xref:vro:ROOT::simplified-representations/domain-object.adoc[domain object representation] is returned.
 
 For example, using the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing
 this resource:
@@ -58,7 +58,7 @@ Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="objec
 == Returning a List
 
 On the other hand if the action returned a list (a "standalone" collection, then an array representation is returned.
-This is very similar to that returned by a xref:ug-vro:ROOT:simplified-representations/object-collection.adoc[(parented) object collection], though with a slightly different `Content-Type` to distinguish.
+This is very similar to that returned by a xref:vro:ROOT::simplified-representations/object-collection.adoc[(parented) object collection], though with a slightly different `Content-Type` to distinguish.
 
 For example, using the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing
 this resource:
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/configuration-properties.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
similarity index 94%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
index 6d0490c..fa8ba68 100644
--- a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
@@ -11,6 +11,6 @@ are limited by the fact that they are global configuration settings, so cannot b
 basis (as is the case with the `Accept` header used for the Apache Isis profile). They have therefore been
 deprecated, and may be removed in the future.
 
-Details can be found in xref:ug-vro:ROOT:configuration-properties.adoc#deprecated[here].
+Details can be found in xref:vro:ROOT::configuration-properties.adoc#deprecated[here].
 
 
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/domain-object.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations/domain-object.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/object-collection.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations/object-collection.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc
diff --git a/antora/components/ug-vro/modules/ROOT/pages/simplified-representations/other-representations.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
similarity index 100%
rename from antora/components/ug-vro/modules/ROOT/pages/simplified-representations/other-representations.adoc
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
diff --git a/antora/components/ug-vro/sync_examples.sh b/core/viewer-restfulobjects/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ug-vro/sync_examples.sh
rename to core/viewer-restfulobjects/_adoc/sync_examples.sh
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
index 4add7c5..4ec9523 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
@@ -244,7 +244,7 @@ In prototype mode, though, a fixed key will still be used; this saves the develo
 (`_false_`)
 |Whether to suppress "remember me" checkbox on the login page.
 
-Further discussion xref:ug:vw:configuration-properties.adoc#sign-in_remember-me[below].
+Further discussion xref:vw:ROOT:configuration-properties.adoc#sign-in_remember-me[below].
 
 |`isis.viewer.wicket.` +
 `suppressPasswordReset`
@@ -252,7 +252,7 @@ Further discussion xref:ug:vw:configuration-properties.adoc#sign-in_remember-me[
 (`_false_`)
 |If user registration is enabled, whether to suppress the "password reset" link on the login page.
 
-Further discussion xref:ug:vw:configuration-properties.adoc#sign-in_password-reset[below].
+Further discussion xref:vw:ROOT:configuration-properties.adoc#sign-in_password-reset[below].
 
 |`isis.viewer.wicket.` +
 `suppressSignUp`
@@ -262,7 +262,7 @@ Further discussion xref:ug:vw:configuration-properties.adoc#sign-in_password-res
 
 Note though that user registration services must also be configured.
 
-Further discussion xref:ug:vw:configuration-properties.adoc#sign-in_sign-up[below].
+Further discussion xref:vw:ROOT:configuration-properties.adoc#sign-in_sign-up[below].
 
 
 |===
@@ -345,7 +345,7 @@ image::suppress-password-reset/login-page-suppress-password-reset.png[width="300
 
 Configuration properties that influence the appearance of the header and footer panels.
 
-See also the xref:ug:vw:configuration-properties.adoc#bookmarks-and-breadcrumbs[bookmarks and breadcrumbs] and xref:ug:vw:configuration-properties.adoc#themes
+See also the xref:vw:ROOT:configuration-properties.adoc#bookmarks-and-breadcrumbs[bookmarks and breadcrumbs] and xref:vw:ROOT:configuration-properties.adoc#themes
 [themes] configuration properties, because these also control UI elements that appear on the header/footer panels.
 
 .Header and Footer
@@ -536,7 +536,7 @@ Note that `inline_as_if_edit` does not make sense for a configuration property d
 (`_sidebar_`)
 | Whether an action on a domain object (entity or view model) which prompts with a style of `DIALOG` - as in, `@ActionLayout(promptStyle="DIALOG")` - should be rendered using a sidebar or alternatively in a modal dialog box.
 
-See the discussion on the xref:ug:vw:features/sidebar-vs-modal-dialogs.adoc[sidebar vs modal dialogs] feature for further details.
+See the discussion on the xref:vw:ROOT:features/sidebar-vs-modal-dialogs.adoc[sidebar vs modal dialogs] feature for further details.
 
 |`isis.viewer.wicket.` +
 `dialogModeForMenu`
@@ -544,7 +544,7 @@ See the discussion on the xref:ug:vw:features/sidebar-vs-modal-dialogs.adoc[side
 (`_sidebar_`)
 | Whether an action for a domain service should be rendered using a sidebar or alternatively in a modal dialog box.
 
-See the discussion on the xref:ug:vw:features/sidebar-vs-modal-dialogs.adoc[sidebar vs modal dialogs] feature for further details.
+See the discussion on the xref:vw:ROOT:features/sidebar-vs-modal-dialogs.adoc[sidebar vs modal dialogs] feature for further details.
 
 
 
@@ -552,7 +552,7 @@ See the discussion on the xref:ug:vw:features/sidebar-vs-modal-dialogs.adoc[side
 
 
 Objects whose title is overly long can be cumbersome in titles.
-The Wicket viewer has a xref:ug:vw:features/titles-in-tables.adoc[mechanism to automatically shorten] the titles of objects specified using `@Title`.
+The Wicket viewer has a xref:vw:ROOT:features/titles-in-tables.adoc[mechanism to automatically shorten] the titles of objects specified using `@Title`.
 As an alternative/in addition, the viewer can also be configured to simply truncate titles longer than a certain length.
 
 The properties themselves are:
@@ -712,7 +712,7 @@ where the value is the list of themes (from http://bootswatch.com[bootswatch.com
 
 [TIP]
 ====
-You can also develop and install a custom themes (eg to fit your company's look-n-feel/interface guidelines); see the xref:ug:vw:extending/custom-bootstrap-theme.adoc[Extending] chapter for further details.
+You can also develop and install a custom themes (eg to fit your company's look-n-feel/interface guidelines); see the xref:vw:ROOT:extending/custom-bootstrap-theme.adoc[Extending] chapter for further details.
 ====
 
 
@@ -862,7 +862,7 @@ These configuration properties are used to enable/disable features that are eith
 `whereAmI.enabled`
 | `true`,`false` +
 (`_true_`)
-| To disable the xref:ug:vw:features/where-am-i.adoc["Where am I"] feature.
+| To disable the xref:vw:ROOT:features/where-am-i.adoc["Where am I"] feature.
 
 
 |`isis.viewer.wicket.` +
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
index 992e323..af44de9 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
@@ -17,7 +17,7 @@ image::about-page/about-page.png[width="800px",link="{imagesdir}/about-page/abou
 
 [NOTE]
 ====
-Note that this screenshot shows an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot shows an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 Note that the `Build-Time` attribute has been used as the version number.
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
index 9e1ba32..df98c7e 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
@@ -20,7 +20,7 @@ You can therefore use this CSS class as a way of building your own "theme" for t
 
 [TIP]
 ====
-Alternatively you could "do it properly" and create your xref:ug:vw:extending/custom-bootstrap-theme.adoc[own Bootstrap theme], as described in the xref:ug:vw:extending.adoc[extending] chapter.
+Alternatively you could "do it properly" and create your xref:vw:ROOT:extending/custom-bootstrap-theme.adoc[own Bootstrap theme], as described in the xref:vw:ROOT:extending.adoc[extending] chapter.
 ====
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
index 52009af..1bf518a 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
@@ -24,7 +24,7 @@ Currently only one such `.js` file can be registered.
 Just because something is possible, it doesn't necessarily mean we encourage it.
 Please be aware that there is no formal API for any custom javascript that you might implement to target; future versions of Apache Isis might break your code.
 
-As an alternative, consider using the `ComponentFactory` API described in the xref:ug:vw:extending.adoc[Extending] chapter.
+As an alternative, consider using the `ComponentFactory` API described in the xref:vw:ROOT:extending.adoc[Extending] chapter.
 ====
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
index a826dc9..35b2b69 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
@@ -91,7 +91,7 @@ div.x-myapp-highlight span.scalarName {
 }
 ----
 
-Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:ug:vw:layout/file-based.adoc[layout file].
+Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:vw:ROOT:layout/file-based.adoc[layout file].
 
 
 
@@ -186,7 +186,7 @@ For example:
 ----
 <1> the parent class identifier
 <2> the collection identifier.
-This element's class also has the entity type within the collection (as xref:ug:vw:customisation/tweaking-css-classes.adoc#columns-in-tables_globally[discussed above]).
+This element's class also has the entity type within the collection (as xref:vw:ROOT:customisation/tweaking-css-classes.adoc#columns-in-tables_globally[discussed above]).
 
 Using this, the `productRef` property could be targeted using:
 
@@ -231,7 +231,7 @@ Standalone collections will be wrapped in a ``<div>`` that identifies the action
 </div>
 ----
 <1> action identifier.
-This element's class also identifies the entity type within the collection (as xref:ug:vw:customisation/tweaking-css-classes.adoc#columns-in-tables_globally[discussed above]).
+This element's class also identifies the entity type within the collection (as xref:vw:ROOT:customisation/tweaking-css-classes.adoc#columns-in-tables_globally[discussed above]).
 
 Using this, the `quantity` property could be targeted using:
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
index 82464a8..188d631 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
@@ -17,7 +17,7 @@ isis.viewer.wicket.application.about=My Wonderful App v1.0
 
 [TIP]
 ====
-Do not confuse the welcome page file with the xref:ug:vw:customisation/top-level-index-page.adoc[top-level index page]; they are different things!
+Do not confuse the welcome page file with the xref:vw:ROOT:customisation/top-level-index-page.adoc[top-level index page]; they are different things!
 ====
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
index a1d23d9..a435b0d 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
@@ -5,17 +5,17 @@ include::_attributes.adoc[]
 
 The Wicket viewer allows you to customize the GUI in several (progressively more sophisticated) ways:
 
-* the xref:ug:vw:customisation.adoc[customisation] chapter described:
+* the xref:vw:ROOT:customisation.adoc[customisation] chapter described:
 
-** by xref:ug:vw:customisation/tweaking-css-classes.adoc[tweaking the UI using CSS]
-** by xref:ug:vw:customisation/custom-javascript.adoc[tweaking the UI using Javascript]
+** by xref:vw:ROOT:customisation/tweaking-css-classes.adoc[tweaking the UI using CSS]
+** by xref:vw:ROOT:customisation/custom-javascript.adoc[tweaking the UI using Javascript]
 
 * in this chapter we have a number of heavier-weight approaches:
 
-** by writing a xref:ug:vw:extending/custom-bootstrap-theme.adoc[custom bootstrap theme]
-** by xref:ug:vw:extending/replacing-page-elements.adoc[replacing elements of the page] using the `ComponentFactory` interface
-** by implementing xref:ug:vw:extending/custom-pages.adoc[replacement page implementations] for the standard page types
+** by writing a xref:vw:ROOT:extending/custom-bootstrap-theme.adoc[custom bootstrap theme]
+** by xref:vw:ROOT:extending/replacing-page-elements.adoc[replacing elements of the page] using the `ComponentFactory` interface
+** by implementing xref:vw:ROOT:extending/custom-pages.adoc[replacement page implementations] for the standard page types
 
-The chapter also includes a technique useful when prototyping, allowing xref:ug:vw:extending/login-via-query-args-prototyping.adoc[user/passwords to be specified as query arguments].
+The chapter also includes a technique useful when prototyping, allowing xref:vw:ROOT:extending/login-via-query-args-prototyping.adoc[user/passwords to be specified as query arguments].
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
index 976e0a9..afd36e4 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
@@ -7,7 +7,7 @@ include::_attributes.adoc[]
 The Apache Isis Wicket viewer uses http://getbootstrap.com/[Bootstrap] styles and components, courtesy of the https://github.com/l0rdn1kk0n/wicket-bootstrap[Wicket Bootstrap] integration.
 
 By default the viewer uses the default bootstrap theme.
-It is possible to configure the Wicket viewer to allow the user to xref:ug:vw:configuration-properties.adoc#themes[select other themes] provided by http://bootswatch.com[bootswatch.com], and if required one of these can be xref:ug:vw:customisation/default-theme.adoc[set as the default].
+It is possible to configure the Wicket viewer to allow the user to xref:vw:ROOT:configuration-properties.adoc#themes[select other themes] provided by http://bootswatch.com[bootswatch.com], and if required one of these can be xref:vw:ROOT:customisation/default-theme.adoc[set as the default].
 
 However, you may instead want to write your own custom theme, for example to fit your company's look-n-feel/interface guidelines.
 This is done by implementing https://github.com/l0rdn1kk0n/wicket-bootstrap[Wicket Bootstrap]'s `de.agilecoders.wicket.core.settings.ITheme` class.
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
index 41b18a8..f026979 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-In the vast majority of cases customization should be sufficient by xref:ug:vw:extending/replacing-page-elements.adoc[replacing elements of a page].
+In the vast majority of cases customization should be sufficient by xref:vw:ROOT:extending/replacing-page-elements.adoc[replacing elements of a page].
 However, it is also possible to define an entirely new page for a given page type.
 
 Isis defines eight page types (see the `org.apache.isis.viewer.wicket.model.models.PageType` enum):
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
index 9dfc9a6..4c68ac0 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
@@ -33,7 +33,7 @@ There will typically be only one `ComponentFactory` capable of rendering a parti
 
 [NOTE]
 ====
-There is one refinement to the above algorithm where multiple component factories might be used to render an object; this is discussed in xref:ug:vw:extending/replacing-page-elements.adoc#collections[Additional Views of Collections], below.
+There is one refinement to the above algorithm where multiple component factories might be used to render an object; this is discussed in xref:vw:ROOT:extending/replacing-page-elements.adoc#collections[Additional Views of Collections], below.
 ====
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
index 259a042..77d4721 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
@@ -24,7 +24,7 @@ The following screenshots are taken from the Isis addons example https://github.
 
 image::blob-attachments/010-attachment-field-940.png[width="800px",link="{imagesdir}/blob-attachments/010-attachment-field.png"]
 
-Note that this screenshot show an earlier version of the xref:ug:vw:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot show an earlier version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 
 
 === Edit mode
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
index 432f7cb..f1cf154 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
@@ -15,7 +15,7 @@ Bookmarking is automatic; whenever a bookmarkable object/action is visited, then
 
 == Screenshots
 
-The following screenshot (nb: using a pre 1.8.0 version of the xref:ug:vw:about.adoc[Wicket viewer] UI), taken from https://github.com/isisaddons/isis-app-todoapp[Isisaddons example todoapp] (not ASF), shows how the bookmarks are listed in a sliding panel.
+The following screenshot (nb: using a pre 1.8.0 version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI), taken from https://github.com/isisaddons/isis-app-todoapp[Isisaddons example todoapp] (not ASF), shows how the bookmarks are listed in a sliding panel.
 
 image::bookmarked-pages/panel.png[width="800px",link="{imagesdir}/bookmarked-pages/panel.png"]
 
@@ -86,7 +86,7 @@ Alternatively, `alt+[` will toggle open/close the panel; it can also be closed u
 
 === Related functionality
 
-The xref:ug:vw:features/recent-pages.adoc[Recent Pages] also lists recently visited pages, selected from a drop-down.
+The xref:vw:ROOT:features/recent-pages.adoc[Recent Pages] also lists recently visited pages, selected from a drop-down.
 
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
index 73ef051..15ac886 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
@@ -19,7 +19,7 @@ The following screenshots are taken from the https://github.com/estatio/estatio[
 
 === Copy URL
 
-This screenshot (nb: using a pre 1.8.0 version of the xref:ug:vw:about.adoc[Wicket viewer] UI) shows the copy URL button (top right):
+This screenshot (nb: using a pre 1.8.0 version of the xref:vw:ROOT:about.adoc[Wicket viewer] UI) shows the copy URL button (top right):
 
 image::copy-link/010-copy-link-button.png[width="800px",link="{imagesdir}/copy-link/010-copy-link-button.png"]
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
index d61cafb..8202456 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
@@ -16,7 +16,7 @@ The following screenshot, taken from the https://github.com/estatio/estatio[Esta
 image::features/recent-pages/recent-pages.png[width="800px",link="{imagesdir}/features/recent-pages/recent-pages.png"]
 
 
-This screenshot is based on v1.7.x of the xref:ug:vw:about.adoc[Wicket viewer] UI.
+This screenshot is based on v1.7.x of the xref:vw:ROOT:about.adoc[Wicket viewer] UI.
 
 // TODO: v2: update this old screenshot.
 
@@ -38,7 +38,7 @@ Selecting the domain object from the list causes the viewer to automatically nav
 
 == Related functionality
 
-The xref:ug:vw:features/bookmarked-pages.adoc[bookmarked pages] (sliding panel) also provides links to recently visited objects, but only those explicitly marked as `@DomainObject(bookmarking=...)`.  The bookmarks panel also nests related objects together hierarchically (the recent pages drop-down does not).
+The xref:vw:ROOT:features/bookmarked-pages.adoc[bookmarked pages] (sliding panel) also provides links to recently visited objects, but only those explicitly marked as `@DomainObject(bookmarking=...)`.  The bookmarks panel also nests related objects together hierarchically (the recent pages drop-down does not).
 
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
index fbc65a9..e39a597 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
@@ -29,4 +29,4 @@ image::dialog-mode/sidebar.png[width="800px",link="{imagesdir}/dialog-mode/sideb
 
 
 
-However, the original modal dialog can still be be used if end-users prefer that style, by setting the `isis.viewer.wicket.dialog` xref:ug:vw:configuration-properties.adoc#presentation[configuration property].
+However, the original modal dialog can still be be used if end-users prefer that style, by setting the `isis.viewer.wicket.dialog` xref:vw:ROOT:configuration-properties.adoc#presentation[configuration property].
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
index f46f79b..549b929 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
@@ -73,5 +73,5 @@ The above annotations mean that titles usually "just work", altering according t
 
 [TIP]
 ====
-It is also possible to configure the Wicket viewer to xref:ug:vw:configuration-properties.adoc#presentation.[abbreviate titles or suppress them] completely.
+It is also possible to configure the Wicket viewer to xref:vw:ROOT:configuration-properties.adoc#presentation.[abbreviate titles or suppress them] completely.
 ====
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
index bee520d..70ac9f6 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
@@ -72,7 +72,7 @@ There are two prerequisites:
 
 The latter is required if you are using the default email notification service and email service. If you are using your own alternative implementation of the email notification service then it may be omitted (and configure your own alternative implementation as required).
 
-It is also possible to configure the Wicket viewer to suppress the sign-up page link and/or the password reset page, see xref:ug:vw:configuration-properties.adoc#sign-in[here] for further details.
+It is also possible to configure the Wicket viewer to suppress the sign-up page link and/or the password reset page, see xref:vw:ROOT:configuration-properties.adoc#sign-in[here] for further details.
 
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
index 8e0d17c..b78f31d 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
@@ -83,7 +83,7 @@ Horizontally arranged text links separated by the 'greater than' symbol (>) are
 == Related functionality
 
 
-The navigable tree-structure, as provided by the 'Where am I' feature, is declared at compile-time (predefined by the programmer), whereas related features (xref:ug:vw:features/recent-pages.adoc[Recent Pages] and xref:ug:vw:features/bookmarked-pages.adoc[Bookmarked Pages]) are populated at runtime only after user interaction.
+The navigable tree-structure, as provided by the 'Where am I' feature, is declared at compile-time (predefined by the programmer), whereas related features (xref:vw:ROOT:features/recent-pages.adoc[Recent Pages] and xref:vw:ROOT:features/bookmarked-pages.adoc[Bookmarked Pages]) are populated at runtime only after user interaction.
 
 
 == Configuration
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index ed867e6..4264380 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -10,9 +10,9 @@ See also hints-n-tips chapters in the:
 
 * the xref:support:dg:hints-and-tips.adoc[Developers'] guide
 
-* the xref:ug:vw:hints-and-tips.adoc[Wicket viewer] guide (this chapter)
+* the xref:vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide (this chapter)
 
-* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
+* the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
 * the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
index debbbb6..2481b6e 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-The (non-ASF) link:http://platform.incode.org[Incode Platform^] provides a number of extensions to the Wicket viewer (leveraging the APIs described in xref:ug:vw:extending.adoc[Extending the Wicket viewer] section, later.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^] provides a number of extensions to the Wicket viewer (leveraging the APIs described in xref:vw:ROOT:extending.adoc[Extending the Wicket viewer] section, later.
 While you are free to fork and adapt any of them to your needs, they are also intended for use "out-of-the-box".
 
 At the time of writing the addons available are:
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
index d133613..dcd29c5 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
@@ -8,7 +8,7 @@ Nevertheless, some metadata relating solely to the UI is inevitably required.
 This chapter describes how this is done both for domain objects using either annotations or using an associated layout file.
 
 The chapter also describes how to customising which columns of associated objects appear in tables.
-The layout of application menu items is described in a xref:ug:vw:menubars-layout.adoc[separate chapter].
+The layout of application menu items is described in a xref:vw:ROOT:menubars-layout.adoc[separate chapter].
 
 
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
index 6894351..0898e72 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
@@ -3,7 +3,7 @@
 include::_attributes.adoc[]
 
 
-Metadata providing UI hints can be specified either using annotations, or using a xref:ug:vw:layout/file-based.adoc[`layout.xml`] file.
+Metadata providing UI hints can be specified either using annotations, or using a xref:vw:ROOT:layout/file-based.adoc[`layout.xml`] file.
 
 In most cases you will probably want to use the file-based approach: changes to file layouts are picked up dynamically, and using a file also allows tabs and tab groups to be specified: this is not supported using annotations.
 
@@ -111,7 +111,7 @@ The property groups/fieldsets in this case are those that are inferred from the
 
 [TIP]
 ====
-It is also possible to combine `@MemberOrder` with a xref:ug:vw:layout/file-based.adoc[file-based layout].
+It is also possible to combine `@MemberOrder` with a xref:vw:ROOT:layout/file-based.adoc[file-based layout].
 The layout file defines only the regions of a grid structure (fieldsets/columns etc), but does __not__ specify the properties/collections/actions within those grid regions.
 The `@MemberOrder` annotation in effect "binds" the properties or collections to those regions of the grid.
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
index eafaed3..c8409d2 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-Metadata providing UI hints can be specified either xref:ug:vw:layout/annotation-based.adoc[using annotations], or using an `Xxx.layout.xml` file (where `Xxx` is the entity or view model object to be rendered).
+Metadata providing UI hints can be specified either xref:vw:ROOT:layout/annotation-based.adoc[using annotations], or using an `Xxx.layout.xml` file (where `Xxx` is the entity or view model object to be rendered).
 
 File-based layouts offer a number of benefits:
 
@@ -59,7 +59,7 @@ The layout file distinguishes between two types of element:
 
 * those that define a grid structure, of: rows, columns, tab groups and tabs. +
 +
-The rows and columns are closely modelled on link:http://getbootstrap.com[Bootstrap 3] (used in the implementation of the xref:ug:vw:about.adoc[Wicket viewer]).
+The rows and columns are closely modelled on link:http://getbootstrap.com[Bootstrap 3] (used in the implementation of the xref:vw:ROOT:about.adoc[Wicket viewer]).
 
 * those that defines common components, of: fieldsets (previously called member groups or property groups), properties, collections, actions and also the title/icon of the domain object itself.
 
@@ -142,7 +142,7 @@ This corresponds to the following XML:
 
 
 You will notice that one of the ``col``umns has an ``unreferencedActions`` attribute, while one of the ``tabGroup``s has a similar ``unreferencedCollections`` attribute.
-This topic is discussed in more detail xref:ug:vw:layout/file-based/adoc#unreferenced[below].
+This topic is discussed in more detail xref:vw:ROOT:layout/file-based/adoc#unreferenced[below].
 
 
 
@@ -188,7 +188,7 @@ Notice how actions - such as `duplicate` and `delete` - can be associated with t
 Thereafter the fieldset lists the properties in order.
 Actions can be associated with properties too; here they are rendered underneath or to the right of the field.
 
-Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:ug:vw:layout/file-based.adoc#unreferenced[below].
+Note also the `unreferencedProperties` attribute for the fieldset; this topic is discussed in more detail xref:vw:ROOT:layout/file-based.adoc#unreferenced[below].
 
 [NOTE]
 ====
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
index 2b627b5..f2d8a77 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 The domain service actions can be arranged across menu items using the `menubars.layout.xml` file.
 Not only is this easier to work with, it also can be reloaded dynamically (if in prototype mode), substantially reducing the edit compile run cycle.
 
-As for xref:ug:vw:layout/file-based.adoc[file-based object layouts], this offers a number of benefits:
+As for xref:vw:ROOT:layout/file-based.adoc[file-based object layouts], this offers a number of benefits:
 
 * Probably most significantly, the layout can be updated without requiring a recompile of the code and redeploy of the app; fine-tuning the layout with your end users is easy to do
 
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc
index f9f6d39..2730661 100644
--- a/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc
+++ b/examples/apps/helloworld/_adoc/modules/ROOT/pages/about.adoc
@@ -327,7 +327,7 @@ where `myapp` is the `artifactId` entered above.
 
 == Running the App
 
-The `helloworld` archetype generates a single WAR file, configured to run both the xref:ug:vw:about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer].
+The `helloworld` archetype generates a single WAR file, configured to run both the xref:vw:ROOT:about.adoc[Wicket viewer] and the xref:vro:ROOT::about.adoc[Restful Objects viewer].
 The archetype also configures the DataNucleus/JDO Objectstore to use an in-memory HSQLDB connection.
 
 Once you've built the app, you can run the WAR in a variety of ways.
@@ -377,7 +377,7 @@ image::helloworld-before-launch.png[width="600px",link="{imagesdir}/helloworld-b
 
 == Using the App
 
-When you start the app, you'll be presented with a welcome page from which you can access the webapp using either the xref:ug:vw:about.adoc[Wicket viewer] or the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]:
+When you start the app, you'll be presented with a welcome page from which you can access the webapp using either the xref:vw:ROOT:about.adoc[Wicket viewer] or the xref:vro:ROOT::about.adoc[Restful Objects viewer]:
 
 image::using-hello-world/010-root-page.png[width="600px",link="{imagesdir}/using-hello-world/010-root-page.png"]
 
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc
index d62c43c..826978f 100644
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc
+++ b/examples/apps/simpleapp/_adoc/modules/ROOT/pages/about.adoc
@@ -575,7 +575,7 @@ where `myapp` is the `artifactId` entered above.
 
 == Running the App
 
-The `simpleapp` archetype generates a single WAR file, configured to run both the xref:ug:vw:about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer].
+The `simpleapp` archetype generates a single WAR file, configured to run both the xref:vw:ROOT:about.adoc[Wicket viewer] and the xref:vro:ROOT::about.adoc[Restful Objects viewer].
 The archetype also configures the DataNucleus/JDO Objectstore to use an in-memory HSQLDB connection.
 
 Once you've built the app, you can run the WAR in a variety of ways.
diff --git a/site.yml b/site.yml
index d8f329a..b85229b 100644
--- a/site.yml
+++ b/site.yml
@@ -18,7 +18,7 @@ content:
     start_path: antora/components/ug-tst
     branches: HEAD
   - url: .
-    start_path: antora/components/ug-vro
+    start_path: core/viewer-restfulobjects/_adoc
     branches: HEAD
   - url: .
     start_path: core/viewer-wicket/_adoc


[isis] 04/13: ISIS-2062: moves ug-vw alongside code, and renames to just 'Wicket Viewer'.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit be007682800a7fd2d9122f6257e8433d9694d4b6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:10:03 2019 +0200

    ISIS-2062: moves ug-vw alongside code, and renames to just 'Wicket Viewer'.
---
 .../ug-sec/modules/ROOT/pages/hints-and-tips.adoc           |   2 +-
 .../ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc    |   8 ++++----
 antora/components/ug/modules/ROOT/pages/about.adoc          |   2 +-
 antora/components/ug/modules/btb/pages/headless-access.adoc |   2 +-
 antora/components/ug/modules/btb/pages/hints-and-tips.adoc  |   2 +-
 .../ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc   |   2 +-
 .../btb/pages/hints-and-tips/transactions-and-errors.adoc   |   4 ++--
 antora/components/ug/modules/btb/pages/i18n.adoc            |   8 ++++----
 antora/components/ug/modules/btb/pages/web-xml.adoc         |   2 +-
 antora/components/ug/modules/fun/pages/about.adoc           |   2 +-
 .../modules/fun/pages/building-blocks/identifiers/oid.adoc  |   2 +-
 .../identifiers/title-and-icon-and-css-class.adoc           |   2 +-
 .../ug/modules/fun/pages/building-blocks/metamodel.adoc     |   2 +-
 .../types-of-domain-objects/domain-services.adoc            |   2 +-
 .../types-of-domain-objects/view-models.adoc                |   4 ++--
 .../fun/pages/core-concepts/apache-isis-vs/cqrs.adoc        |   2 +-
 .../pages/core-concepts/apache-isis-vs/mvc-server-side.adoc |   2 +-
 .../ug/modules/fun/pages/core-concepts/principles.adoc      |   2 +-
 .../pages/core-concepts/principles/for-the-long-term.adoc   |   2 +-
 .../components/ug/modules/fun/pages/programming-model.adoc  |   2 +-
 .../ug/modules/fun/pages/programming-model/collections.adoc |   2 +-
 .../fun/pages/programming-model/domain-services/menu.adoc   |   2 +-
 .../domain-services/organizing-services.adoc                |   4 ++--
 .../ug/modules/fun/pages/programming-model/properties.adoc  |   4 ++--
 .../ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc |   2 +-
 antora/components/ug/modules/fun/pages/ui-hints/layout.adoc |   2 +-
 .../modules/fun/pages/ui-hints/object-titles-and-icons.adoc |   8 ++++----
 .../ug-vw => core/viewer-wicket/_adoc}/antora.yml           |   4 ++--
 .../ug-vw => core/viewer-wicket/_adoc}/examples.csv         |   0
 .../viewer-wicket/_adoc}/modules/ROOT/_attributes.adoc      |   0
 .../_adoc/modules/ROOT/assets/attachments}/.gitkeep         |   0
 .../modules/ROOT/assets/images/about-page/about-page.png    | Bin
 .../ROOT/assets/images/application-menu/dividers.png        | Bin
 .../ROOT/assets/images/application-menu/layout-menus.pdn    | Bin
 .../ROOT/assets/images/application-menu/layout-menus.png    | Bin
 .../ROOT/assets/images/application-menu/tertiary.png        | Bin
 .../images/blob-attachments/010-attachment-field-940.png    | Bin
 .../assets/images/blob-attachments/010-attachment-field.png | Bin
 .../images/blob-attachments/020-edit-choose-file-940.png    | Bin
 .../assets/images/blob-attachments/020-edit-choose-file.png | Bin
 .../blob-attachments/030-choose-file-using-browser-520.png  | Bin
 .../blob-attachments/030-choose-file-using-browser.png      | Bin
 .../blob-attachments/040-edit-chosen-file-indicated-940.png | Bin
 .../blob-attachments/040-edit-chosen-file-indicated.png     | Bin
 .../blob-attachments/050-ok-if-image-then-rendered-940.png  | Bin
 .../blob-attachments/050-ok-if-image-then-rendered.png      | Bin
 .../assets/images/blob-attachments/060-download-940.png     | Bin
 .../ROOT/assets/images/blob-attachments/060-download.png    | Bin
 .../assets/images/blob-attachments/070-edit-clear-940.png   | Bin
 .../ROOT/assets/images/blob-attachments/070-edit-clear.png  | Bin
 .../ROOT/assets/images/bookmarked-pages/panel-940.png       | Bin
 .../assets/images/bookmarked-pages/panel-estatio-940.png    | Bin
 .../ROOT/assets/images/bookmarked-pages/panel-estatio.png   | Bin
 .../modules/ROOT/assets/images/bookmarked-pages/panel.png   | Bin
 .../ROOT/assets/images/brand-logo/brand-logo-signin.png     | Bin
 .../modules/ROOT/assets/images/brand-logo/brand-logo.png    | Bin
 .../assets/images/copy-link/010-copy-link-button-940.png    | Bin
 .../ROOT/assets/images/copy-link/010-copy-link-button.png   | Bin
 .../assets/images/copy-link/020-copy-link-dialog-940.png    | Bin
 .../ROOT/assets/images/copy-link/020-copy-link-dialog.png   | Bin
 .../modules/ROOT/assets/images/copy-link/030-hints-940.png  | Bin
 .../modules/ROOT/assets/images/copy-link/030-hints.png      | Bin
 .../images/copy-link/040-copy-link-with-hints-940.png       | Bin
 .../assets/images/copy-link/040-copy-link-with-hints.png    | Bin
 .../ROOT/assets/images/copy-link/050-title-url-940.png      | Bin
 .../modules/ROOT/assets/images/copy-link/050-title-url.png  | Bin
 .../_adoc}/modules/ROOT/assets/images/dialog-mode/modal.png | Bin
 .../modules/ROOT/assets/images/dialog-mode/sidebar.png      | Bin
 .../modules/ROOT/assets/images/embedded-view/no-footer.png  | Bin
 .../assets/images/embedded-view/no-header-no-footer.png     | Bin
 .../modules/ROOT/assets/images/embedded-view/no-header.png  | Bin
 .../modules/ROOT/assets/images/embedded-view/regular.png    | Bin
 .../assets/images/features/recent-pages/recent-pages.png    | Bin
 .../ui-hints/object-titles-and-icons/cust-order-product.png | Bin
 .../assets/images/layout-dynamic-xml/ToDoAppDashboard.png   | Bin
 .../ROOT/assets/images/layout-dynamic-xml/ToDoItem.png      | Bin
 .../modules/ROOT/assets/images/layouts/customer-order.png   | Bin
 .../modules/ROOT/assets/images/layouts/estatio-Invoice.png  | Bin
 .../modules/ROOT/assets/images/layouts/estatio-Lease.png    | Bin
 .../ROOT/assets/images/layouts/estatio-LeaseItem.png        | Bin
 .../modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png | Bin
 .../modules/ROOT/assets/images/menubars/010-download.png    | Bin
 .../modules/ROOT/assets/images/menubars/020-download.png    | Bin
 .../modules/ROOT/assets/images/reference-layout/4-0-8-0.png | Bin
 .../ROOT/assets/images/reference-layout/4-4-4-12.png        | Bin
 .../ROOT/assets/images/reference-layout/6-6-0-12.png        | Bin
 .../images/reference-layout/isis-layout-show-facets.css     |   0
 .../ROOT/assets/images/reference-layout/isis-layout.css     |   0
 .../ROOT/assets/images/reference-layout/layout-4-0-8-0.html |   0
 .../assets/images/reference-layout/layout-4-4-4-12.html     |   0
 .../assets/images/reference-layout/layout-6-6-0-12.html     |   0
 .../images/suppress-password-reset}/login-page-default.png  | Bin
 .../login-page-suppress-password-reset.png                  | Bin
 .../images/suppress-remember-me}/login-page-default.png     | Bin
 .../login-page-suppress-remember-me.png                     | Bin
 .../assets/images/suppress-sign-up}/login-page-default.png  | Bin
 .../images/suppress-sign-up/login-page-suppress-sign-up.png | Bin
 .../modules/ROOT/assets/images/theme-chooser/example-1.png  | Bin
 .../modules/ROOT/assets/images/theme-chooser/example-2.png  | Bin
 .../assets/images/user-registration}/login-page-default.png | Bin
 .../images/user-registration/sign-up-after-registration.png | Bin
 .../sign-up-email-with-verification-link.png                | Bin
 .../user-registration/sign-up-login-page-after-sign-up.png  | Bin
 .../ROOT/assets/images/user-registration/sign-up-page.png   | Bin
 .../images/user-registration/sign-up-registration-page.png  | Bin
 .../modules/ROOT/assets/images/where-am-i/hello_grey_bg.png | Bin
 .../viewer-wicket/_adoc/modules/ROOT/examples}/.gitkeep     |   0
 .../viewer-wicket/_adoc}/modules/ROOT/nav.adoc              |   0
 .../_adoc}/modules/ROOT/pages/_attributes.adoc              |   0
 .../_adoc/modules/ROOT/pages/_partials}/_attributes.adoc    |   0
 .../viewer-wicket/_adoc}/modules/ROOT/pages/about.adoc      |   0
 .../_adoc}/modules/ROOT/pages/configuration-properties.adoc |   0
 .../_adoc}/modules/ROOT/pages/customisation.adoc            |   0
 .../modules/ROOT/pages/customisation}/_attributes.adoc      |   0
 .../_adoc}/modules/ROOT/pages/customisation/about-page.adoc |   0
 .../modules/ROOT/pages/customisation/auto-refresh.adoc      |   0
 .../_adoc}/modules/ROOT/pages/customisation/brand-logo.adoc |   0
 .../ROOT/pages/customisation/cheap-n-cheerful-theme.adoc    |   0
 .../modules/ROOT/pages/customisation/custom-javascript.adoc |   0
 .../ROOT/pages/customisation/request-parameters.adoc        |   0
 .../ROOT/pages/customisation/top-level-index-page.adoc      |   0
 .../ROOT/pages/customisation/tweaking-css-classes.adoc      |   0
 .../ROOT/pages/customisation/using-different-css-file.adoc  |   0
 .../modules/ROOT/pages/customisation/welcome-page.adoc      |   0
 .../viewer-wicket/_adoc}/modules/ROOT/pages/extending.adoc  |   0
 .../_adoc/modules/ROOT/pages/extending}/_attributes.adoc    |   0
 .../ROOT/pages/extending/custom-bootstrap-theme.adoc        |   0
 .../_adoc}/modules/ROOT/pages/extending/custom-pages.adoc   |   0
 .../pages/extending/login-via-query-args-prototyping.adoc   |   0
 .../ROOT/pages/extending/replacing-page-elements.adoc       |   0
 .../viewer-wicket/_adoc}/modules/ROOT/pages/features.adoc   |   0
 .../_adoc}/modules/ROOT/pages/features/_attributes.adoc     |   0
 .../modules/ROOT/pages/features/blob-attachments.adoc       |   0
 .../modules/ROOT/pages/features/bookmarked-pages.adoc       |   0
 .../modules/ROOT/pages/features/hints-and-copy-url.adoc     |   0
 .../_adoc}/modules/ROOT/pages/features/recent-pages.adoc    |   0
 .../ROOT/pages/features/sidebar-vs-modal-dialogs.adoc       |   0
 .../modules/ROOT/pages/features/titles-in-tables.adoc       |   0
 .../modules/ROOT/pages/features/user-registration.adoc      |   0
 .../_adoc}/modules/ROOT/pages/features/where-am-i.adoc      |   0
 .../_adoc}/modules/ROOT/pages/hints-and-tips.adoc           |   0
 .../modules/ROOT/pages/hints-and-tips}/_attributes.adoc     |   0
 .../ROOT/pages/hints-and-tips/highlight-current-row.adoc    |   0
 .../pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc   |   0
 .../modules/ROOT/pages/hints-and-tips/per-user-themes.adoc  |   0
 .../modules/ROOT/pages/hints-and-tips/svg-support.adoc      |   0
 .../_adoc}/modules/ROOT/pages/incode-platform.adoc          |   0
 .../viewer-wicket/_adoc}/modules/ROOT/pages/layout.adoc     |   0
 .../_adoc/modules/ROOT/pages/layout}/_attributes.adoc       |   0
 .../_adoc}/modules/ROOT/pages/layout/annotation-based.adoc  |   0
 .../_adoc}/modules/ROOT/pages/layout/file-based.adoc        |   0
 .../_adoc}/modules/ROOT/pages/layout/table-columns.adoc     |   0
 .../_adoc}/modules/ROOT/pages/menubars-layout.adoc          |   0
 .../modules/ROOT/pages/menubars-layout}/_attributes.adoc    |   0
 .../ROOT/pages/menubars-layout/annotation-based.adoc        |   0
 .../modules/ROOT/pages/menubars-layout/file-based.adoc      |   0
 .../ug-vw => core/viewer-wicket/_adoc}/sync_examples.sh     |   0
 site.yml                                                    |   2 +-
 158 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
index fdc6762..a6d626a 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
@@ -11,7 +11,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:support:dg:hints-and-tips.adoc[Developers'] guide
 
-* the xref:ug-vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide
+* the xref:vw:ROOT::hints-and-tips.adoc[Wicket viewer] guide
 
 * the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
 
diff --git a/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc b/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
index 463bb04..8778e79 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 
-By and large the security mechanisms within Isis are transparent to the rest of the framework (the xref:ug-vw:ROOT:about.adoc[Wicket Viewer] and xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], and the overall xref:rg:cfg:about[core runtime]).
+By and large the security mechanisms within Isis are transparent to the rest of the framework (the xref:vw:ROOT::about.adoc[Wicket Viewer] and xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], and the overall xref:rg:cfg:about[core runtime]).
 
 That said, it is the responsibility of the viewers to ensure that for each request there is a valid user session present.  The sections below explain how this works.
 
@@ -13,7 +13,7 @@ That said, it is the responsibility of the viewers to ensure that for each reque
 
 == Wicket Viewer
 
-The xref:ug-vw:ROOT:about.adoc[Wicket viewer] defines a relatively small number of pages (by which we mean subclasses of `org.apache.wicket.markup.html.WebPage`):
+The xref:vw:ROOT::about.adoc[Wicket viewer] defines a relatively small number of pages (by which we mean subclasses of `org.apache.wicket.markup.html.WebPage`):
 
 * about page
 * entity page
@@ -34,7 +34,7 @@ which means that they can only be accessed by a user with an authenticated sessi
 
 [TIP]
 ====
-The sign-in page to render is pluggable; see xref:ug-vw:ROOT:extending/custom-pages.adoc[extensions chapter] for details.
+The sign-in page to render is pluggable; see xref:vw:ROOT::extending/custom-pages.adoc[extensions chapter] for details.
 ====
 
 In the sign-in page the viewer calls to the Isis Authenticator API, and obtains back a user/role.  It also adds in its special reserved role (per the annotation above) and then continues on to whichever page the user was attempting to access (usually the home page).
@@ -52,7 +52,7 @@ These pages all "reach inside" Apache Isis framework using a mechanism similar t
 
 [TIP]
 ====
-The sign-in verification page to render is pluggable; see xref:ug-vw:ROOT:extending/custom-pages.adoc[extensions chapter] for details.
+The sign-in verification page to render is pluggable; see xref:vw:ROOT::extending/custom-pages.adoc[extensions chapter] for details.
 ====
 
 User registration is only available if the xref:rg:svc:persistence-layer-spi/UserRegistrationService.adoc[`UserRegistrationService`] is configured; this is used by the framework to actually create new instances of the user as accessed by the corresponding (Shiro) realm.
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/antora/components/ug/modules/ROOT/pages/about.adoc
index 64d3ad4..229ab71 100644
--- a/antora/components/ug/modules/ROOT/pages/about.adoc
+++ b/antora/components/ug/modules/ROOT/pages/about.adoc
@@ -6,7 +6,7 @@ Apache Isis documentation is broken out into a number of user, reference and "su
 The user guides available are:
 
 * xref:ug:fun:about.adoc[Fundamentals]
-* xref:ug-vw:ROOT:about.adoc[Wicket viewer]
+* xref:vw:ROOT::about.adoc[Wicket viewer]
 * xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
 * xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
 * xref:ug-sec:ROOT:about.adoc[Security]
diff --git a/antora/components/ug/modules/btb/pages/headless-access.adoc b/antora/components/ug/modules/btb/pages/headless-access.adoc
index e08746a..b4890f9 100644
--- a/antora/components/ug/modules/btb/pages/headless-access.adoc
+++ b/antora/components/ug/modules/btb/pages/headless-access.adoc
@@ -2,7 +2,7 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 include::_attributes.adoc[]
 
-This section tackles the topic of enabling access to an Apache Isis application directly, or at least, not through either the xref:ug-vw:ROOT:about.adoc[Wicket] or xref:ug-vro:ROOT:about.adoc[Restful] viewers.
+This section tackles the topic of enabling access to an Apache Isis application directly, or at least, not through either the xref:vw:ROOT::about.adoc[Wicket] or xref:ug-vro:ROOT:about.adoc[Restful] viewers.
 
 There are several main use-cases:
 
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
index a1b453e..1a0f303 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
@@ -10,7 +10,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:support:dg:hints-and-tips.adoc[Developers'] guide
 
-* the xref:ug-vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide
+* the xref:vw:ROOT::hints-and-tips.adoc[Wicket viewer] guide
 
 * the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
 
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
index b2f0b43..b84f2b9 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
@@ -40,7 +40,7 @@ image::hints-and-tips/are-you-sure.png[link="{imagesdir}/hints-and-tips/are-you-
 
 [NOTE]
 ====
-Note that these screenshots shows an earlier version of the xref:ug-vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that these screenshots shows an earlier version of the xref:vw:ROOT::about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 If the user checks the box:
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
index 4c3c1d2..a095da7 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
@@ -39,7 +39,7 @@ You get the idea.
 == Raise message in the UI
 
 The framework provides the xref:rg:svc:application-layer-api/MessageService.adoc[`MessageService`] as a means to return an out-of-band
-message to the end-user.  In the xref:ug-vw:ROOT:about.adoc[Wicket viewer] these are shown as "toast" pop-ups; the
+message to the end-user.  In the xref:vw:ROOT::about.adoc[Wicket viewer] these are shown as "toast" pop-ups; the
 xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] returns an HTTP header.
 
 The `UserService` provides three APIs, for different:
@@ -56,7 +56,7 @@ None of these messages/errors has any influence on the transaction; any changes
 == Aborting transactions
 
 If you want to abort Apache Isis' transaction, this can be done by throwing an exception.  The exception message
-is displayed to the user on the error page (if xref:ug-vw:ROOT:about.adoc[Wicket viewer]) or a 500 status error code (if the
+is displayed to the user on the error page (if xref:vw:ROOT::about.adoc[Wicket viewer]) or a 500 status error code (if the
 xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer).
 
 If the exception thrown is because of an unexpected error (eg a `NullPointerException` in the domain app itself), then
diff --git a/antora/components/ug/modules/btb/pages/i18n.adoc b/antora/components/ug/modules/btb/pages/i18n.adoc
index 8512614..d62fc4f 100644
--- a/antora/components/ug/modules/btb/pages/i18n.adoc
+++ b/antora/components/ug/modules/btb/pages/i18n.adoc
@@ -7,7 +7,7 @@ Apache Isis' support for internationlization (i18n) allows every element of the
 
 It also supports translations of messages raised imperatively, by which we mean as the result of a call to `title()` to obtain an object's title, or messages resulting from any business rule violations (eg xref:rg:cms:methods/prefixes/disable.adoc[`disable...()`] or xref:rg:cms:methods/prefixes/validate.adoc[`validate...()`], and so on.
 
-The xref:ug-vw:ROOT:about.adoc[Wicket viewer] (that is, its labels and messages) is also internationalized using the same mechanism.
+The xref:vw:ROOT::about.adoc[Wicket viewer] (that is, its labels and messages) is also internationalized using the same mechanism.
 If no translations are available, then the Wicket viewer falls back to using Wicket resource bundles.
 
 Isis does not translate the values of your domain objects, though.
@@ -234,7 +234,7 @@ If returns `null`, then the `Exception#getMessage()` is used as a fallback
 
 == Wicket Viewer
 
-The xref:ug-vw:ROOT:about.adoc[Wicket viewer] (its labels and messages) is also internationalized using
+The xref:vw:ROOT::about.adoc[Wicket viewer] (its labels and messages) is also internationalized using
 the `TranslationService`.
 This is done through an Isis-specific implementation of the Wicket framework's `org.apache.wicket.Localizer` class, namely `LocalizerForIsis`.
 
@@ -334,7 +334,7 @@ msgstr "You can only select 1 item"
 === Login/self-sign-up
 
 In addition, there are a reasonably large number of messages that are used for both login and the
- xref:ug-vw:ROOT:features/user-registration.adoc[user registration] (self sign-up) and password reset features.
+ xref:vw:ROOT::features/user-registration.adoc[user registration] (self sign-up) and password reset features.
 
 These are:
 
@@ -550,7 +550,7 @@ msgid "<i>Quantity</i>"
 msgstr "<i>Quantité</i>"
 ----
 
-For this to work, the `namedEscaped()` attribute must be specified using either the xref:ug-vw:ROOT:layout/file-based.adoc[layout file], or using an annotation such as xref:rg:ant:PropertyLayout.adoc[`@PropertyLayout`] or xref:rg:ant:ParameterLayout.adoc[`@ParameterLayout`].
+For this to work, the `namedEscaped()` attribute must be specified using either the xref:vw:ROOT::layout/file-based.adoc[layout file], or using an annotation such as xref:rg:ant:PropertyLayout.adoc[`@PropertyLayout`] or xref:rg:ant:ParameterLayout.adoc[`@ParameterLayout`].
 
 For example:
 
diff --git a/antora/components/ug/modules/btb/pages/web-xml.adoc b/antora/components/ug/modules/btb/pages/web-xml.adoc
index 7905fbf..d239b30 100644
--- a/antora/components/ug/modules/btb/pages/web-xml.adoc
+++ b/antora/components/ug/modules/btb/pages/web-xml.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 // TODO: v2: a lot of this has changed, because we now use `WebModule_Xxx` instead of `web.xml`, ie set this stuff up programmatically.
 
 
-Apache Isis provides two different viewers, the xref:ug-vw:ROOT:about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+Apache Isis provides two different viewers, the xref:vw:ROOT::about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
 You can deploy both of these concurrently, or deploy just the Wicket viewer, or deploy just the Restful Objects viewer.
 The configuration in `web.xml` varies accordingly, both in terms of the servlet context listeners, filters and servlets.
 
diff --git a/antora/components/ug/modules/fun/pages/about.adoc b/antora/components/ug/modules/fun/pages/about.adoc
index 0b1aaee..94e7341 100644
--- a/antora/components/ug/modules/fun/pages/about.adoc
+++ b/antora/components/ug/modules/fun/pages/about.adoc
@@ -3,7 +3,7 @@ include::_attributes.adoc[]
 
 This guide introduces the xref:ug:fun:core-concepts.adoc[core concepts] and the xref:ug:fun:building-blocks.adoc[building blocks] of Apache Isis, and tells you how to xref:helloworld:ROOT:about.adoc[get started] with a Maven archetype.
 
-It describes in some detail the conventions of Apache Isis' xref:ug:fun:programming-model.adoc[programming model]s, describes how to influence the xref:ug-vw:ROOT:layout.adoc[UI layout] of your domain objects , and it catalogues various xref:support:dg:hints-and-tips.adoc.adoc[FAQ]s.
+It describes in some detail the conventions of Apache Isis' xref:ug:fun:programming-model.adoc[programming model]s, describes how to influence the xref:vw:ROOT::layout.adoc[UI layout] of your domain objects , and it catalogues various xref:support:dg:hints-and-tips.adoc.adoc[FAQ]s.
 
 
 
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
index 5fc3d93..8236a8c 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
@@ -29,7 +29,7 @@ When the PDF is scanned by the mail room, the barcode could be read to attach th
 
 * similarly within implementations of xref:rg:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`] to persist published action invocations
 
-* and of course both the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] and xref:ug-vw:ROOT:about.adoc[Wicket viewer] use the oid tuple to look up, render and allow the user to interact with domain objects.
+* and of course both the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] and xref:vw:ROOT::about.adoc[Wicket viewer] use the oid tuple to look up, render and allow the user to interact with domain objects.
 
 Although the exact content of an OID should be considered opaque by domain objects, it is possible for domain objects to obtain OIDs.
 These are represented as ``Bookmark``s, obtained from the xref:rg:svc:integration-api/BookmarkService.adoc[``BookmarkService``].
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
index f70d570..0a7574d 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
@@ -22,7 +22,7 @@ For example, a shipped `Order` might have a slightly different icon to a yet-to-
 == CSS Class
 
 In addition to the title and icon, it is also possible for a domain object to provide a CSS class hint.
-In conjunction with xref:ug-vw:ROOT:customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
+In conjunction with xref:vw:ROOT::customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
 
 
 [TIP]
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc b/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
index 5e1d316..94a8370 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
@@ -18,7 +18,7 @@ This is an ORM that implements the JDO and JPA APIs, and which can map domain ob
 Apache Isis recognizes a number of the JDO annotations such as `@javax.jdo.annotations.Column(allowsNull=...)`.
 
 In addition, the framework builds up the metamodel for each domain object using
-xref:ug-vw:ROOT:layout.adoc[layout hints], such as `Customer.layout.xml`.
+xref:vw:ROOT::layout.adoc[layout hints], such as `Customer.layout.xml`.
 These provide metadata such as grouping elements of the UI together, using multi-column layouts, and so on.
 The layout file can be modified while the application is still running, and are picked up automatically; a useful way to speed up feedback.
 
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
index adf5d8f..7ecefff 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
@@ -15,7 +15,7 @@ Similarly, entities might also have a corresponding factory service: a `Customer
 On the other hand, from an end-users' perspective the act of finding an existing object vs creating a new one are quite closely related.
 For this reason, in Apache Isis it's therefore quite common to have a single domain service that acts as both a factory and a repository (and is usually called just a "repository").
 
-The behaviour of these services is rendered in various ways, though the most obvious is as the menu actions on the top-level menu bars in the xref:ug-vw:ROOT:about.adoc[Wicket viewer]'s UI.
+The behaviour of these services is rendered in various ways, though the most obvious is as the menu actions on the top-level menu bars in the xref:vw:ROOT::about.adoc[Wicket viewer]'s UI.
 
 Domain services can also be used for a number of other purposes:
 
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
index 1d03853..df8a64f 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
@@ -8,7 +8,7 @@ End users interact with view models in the same way as a domain entity, indeed t
 
 However, whereas domain entities are mapped to a datastore, view models are not.
 Instead they are recreated dynamically by serializing their state, ultimately into the URL itself (meaning their state it is in effect implicitly managed by the client browser).
-You will notice that the URL for view models (as shown in xref:ug-vw:ROOT:about.adoc[Wicket viewer] or xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) tends to be quite long.
+You will notice that the URL for view models (as shown in xref:vw:ROOT::about.adoc[Wicket viewer] or xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) tends to be quite long.
 
 This capability opens up a number of more advanced use cases:
 
@@ -110,7 +110,7 @@ To support this use case, a view model can be defined such that it can act as a
 This is done by annotating the class using JAXB annotations; this allows the consumer to obtain the DTO in XML format along with a corresponding XSD schema describing the structure of that XML.
 A discussion of how that might be done using an ESB such as link:http://camel.apache.org[Apache Camel(TM)] follows xref:ug:fun:building-blocks/types-of-domain-objects/view-models.adoc#dtos_consumers[below].
 
-In case it's not obvious, these DTOs are still usable as "regular" view models; they will render in the xref:ug-vw:ROOT:about.adoc[Wicket viewer] just like any other.
+In case it's not obvious, these DTOs are still usable as "regular" view models; they will render in the xref:vw:ROOT::about.adoc[Wicket viewer] just like any other.
 In fact (as the xref:ug:fun:programming-model/view-models/jaxb.adoc[programming model] section below makes clear), these JAXB-annotated view models are in many regards the most powerful of all the alternative ways of writing view models.
 
 It's also worth noting that it is also possible to download the XML (or XSD) straight from the UI, useful during development.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
index 297c1ca..b961e66 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
@@ -42,6 +42,6 @@ In CQRS the commands correspond to the business logic that mutates the system.
 Whether this logic is part of the command class (`PlaceOrderCommand`) or whether that command delegates to methods on the domain object is an implementation detail; but it certainly is common for the business logic to be wholly within the command object and for the domain object to be merely a data holder of the data within the command/write datastore.
 
 In Apache Isis this same separation of business logic from the underlying data can be accomplished most straightforwardly using xref:ug:fun:building-blocks/types-of-domain-objects/mixins.adoc[mixins].
-In the UI (surfaced by the xref:ug-vw:ROOT:about.adoc[Wicket viewer]) or in the REST API (surfaced by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
+In the UI (surfaced by the xref:vw:ROOT::about.adoc[Wicket viewer]) or in the REST API (surfaced by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
 
 
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index ccef8fd..ab210de 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -12,7 +12,7 @@ The views provided out of the box by these frameworks tend to be simple  _CRUD_-
 More sophisticated behavior is accomplished by customizing the generated controllers.
 
 The most obvious difference when developing an Apache Isis application is its deliberate lack of an explicit controller layer; non- _CRUD_ behavior is automatically made available in its generic object-oriented  __UI__s.
-More sophisticated UIs can be built either by xref:ug-vw:ROOT:extending.adoc[extending Apache Isis' Wicket viewer] or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by Apache Isis' xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer.
+More sophisticated UIs can be built either by xref:vw:ROOT::extending.adoc[extending Apache Isis' Wicket viewer] or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by Apache Isis' xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer.
 Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.
 
 Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent link:http://platform.incode.org[Incode Platform^] modules (non-ASF) tend to work at a higher-level of abstraction.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc b/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
index a37baa9..92e572d 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 Apache Isis is primarily aimed at custom-built "enterprise" applications.
-The UI provided by the xref:ug-vw:ROOT:about.adoc[Wicket viewer] is intended to be usable by domain experts, typically end-users within the organization.
+The UI provided by the xref:vw:ROOT::about.adoc[Wicket viewer] is intended to be usable by domain experts, typically end-users within the organization.
 The REST API exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] allows custom apps to be developed -- eg using Angular or similar -- for use by those requiring more guidance; typically end-users outside of the organization.
 This section describes some of the core principles and values that the framework aims to honour and support.
 
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc b/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
index 6fd6f83..37bf646 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
@@ -21,7 +21,7 @@ The diagram below illustrates this:
 .decoupled applications
 image::core-concepts/philosophy/decoupled-applications.png[width="800px",link="{imagesdir}/core-concepts/philosophy/decoupled-applications.png"]
 
-Here, the presentation layer (xref:ug-vw:ROOT:about.adoc[Wicket UI] or xref:ug-vro:ROOT:about.adoc[REST API]) is handled by the framework, while the developer focusses on just the domain layer.
+Here, the presentation layer (xref:vw:ROOT::about.adoc[Wicket UI] or xref:ug-vro:ROOT:about.adoc[REST API]) is handled by the framework, while the developer focusses on just the domain layer.
 The framework encourages splitting this functionality into modules; each such module has its counterpart (typically tables within a given RDBMS database schema) within the persistence layer.
 
 This architecture means that it's impossible for business logic to leach out into the adjacent presentation layer because the developer doesn't (can't) write any code for presentation layer.
diff --git a/antora/components/ug/modules/fun/pages/programming-model.adoc b/antora/components/ug/modules/fun/pages/programming-model.adoc
index 7a52ac5..fe856bf 100644
--- a/antora/components/ug/modules/fun/pages/programming-model.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model.adoc
@@ -58,7 +58,7 @@ If a domain service does hold state (eg the `Scratchpad` service noted above) th
 
 The framework also defines supplementary annotations, `@DomainObjectLayout` and `@DomainServiceLayout`.
 These provide hints relating to the layout of the domain object in the user interface.
-(Alternatively, these UI hints can be defined in a supplementary xref:ug-vw:ROOT:layout.adoc[`.layout.xml`] file.
+(Alternatively, these UI hints can be defined in a supplementary xref:vw:ROOT::layout.adoc[`.layout.xml`] file.
 
 
 
diff --git a/antora/components/ug/modules/fun/pages/programming-model/collections.adoc b/antora/components/ug/modules/fun/pages/programming-model/collections.adoc
index 6443e85..16b85d7 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/collections.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/collections.adoc
@@ -14,7 +14,7 @@ Most collections (those that are modifiable) will also have a setter and, if per
 And collections properties will also have a number of annotations:
 
 * Apache Isis defines its own `@Collection` annotation for capturing domain semantics.
-It also provides a `@CollectionLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ug-vw:ROOT:layout.adoc[`.layout.xml`] file)
+It also provides a `@CollectionLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:vw:ROOT::layout.adoc[`.layout.xml`] file)
 
 * the collections of domain entities are often annotated with various JDO/DataNucleus annotations, most notably `javax.jdo.annotations.Persistent`.
 This and other annotations can be used to specify if the association is bidirectional, and whether to define a link table or not to hold foreign key columns.
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc b/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
index f676487..3b0ad9e 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 Menu services provide actions to be rendered on the menu.
 
 For the Wicket viewer, each service's actions appear as a collection of menu items of a named menu, and this menu is on one of the three menu bars provided by the Wicket viewer.
-Although these can be organised using annotations, it's usually easier to use a xref:ug-vw:ROOT:menubars-layout/file-based.adoc[`menubars.layout.xml`] file.
+Although these can be organised using annotations, it's usually easier to use a xref:vw:ROOT::menubars-layout/file-based.adoc[`menubars.layout.xml`] file.
 
 For the Restful Objects viewer, all menu services are shown in the services representation.
 
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc b/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
index 8dbf3df..277beaa 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
@@ -8,11 +8,11 @@ In larger applications we have found it worthwhile to ensure that our domain ser
 
 The application provides the `@DomainService(nature=...)` annotation that helps distinguish some of these responsibilities:
 
-* `VIEW` indicates that the actions should appear on the menu of the xref:ug-vw:ROOT:about.adoc[Wicket viewer], and as top-level actions for the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
+* `VIEW` indicates that the actions should appear on the menu of the xref:vw:ROOT::about.adoc[Wicket viewer], and as top-level actions for the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
 
 * `DOMAIN` indicates that the actions are for other domain objects to invoke (either directly or indirectly through the event bus), but in any case should not be rendered at all in the UI
 
-* `VIEW_REST_ONLY` indicates that the actions should appear in the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], but not rendered by the xref:ug-vw:ROOT:about.adoc[Wicket viewer].
+* `VIEW_REST_ONLY` indicates that the actions should appear in the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], but not rendered by the xref:vw:ROOT::about.adoc[Wicket viewer].
 
 If the domain service nature is not specified (or is left to its default, `VIEW`), then the service's actions will appear in the UI.
 
diff --git a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc b/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
index c22bbbb..d4100b0 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
@@ -14,7 +14,7 @@ Most properties (those that are editable/modifiable) will also have a setter and
 And most properties will also have a number of annotations:
 
 * Apache Isis defines its own set own `@Property` annotation for capturing domain semantics.
-It also provides a `@PropertyLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ug-vw:ROOT:layout.adoc[`.layout.xml`] file)
+It also provides a `@PropertyLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:vw:ROOT::layout.adoc[`.layout.xml`] file)
 
 * the properties of domain entities are often annotated with the JDO/DataNucleus `@javax.jdo.annotations.Column` annotation.
 For property references, there may be other annotations to indicate whether the reference is bidirectional.
@@ -123,7 +123,7 @@ If this is omitted then whether editing is enabled or disabled is defined global
 
 == Ignoring Properties
 
-By default Apache Isis will automatically render all properties in the xref:ug-vw:ROOT:about.adoc[Wicket UI] or in the xref:ug-vro:ROOT:about.adoc[REST API].
+By default Apache Isis will automatically render all properties in the xref:vw:ROOT::about.adoc[Wicket UI] or in the xref:ug-vro:ROOT:about.adoc[REST API].
 To get Apache Isis to ignore a property (exclude it from its metamodel), annotate the getter using `@Programmatic`.
 
 Similarly, you can tell JDO/DataNucleus to ignore a property using the `@javax.jdo.annotations.NotPersistent` annotation.
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc b/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
index f48ac3a..6fb5a95 100644
--- a/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
+++ b/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
@@ -24,7 +24,7 @@ public void renew() {
 }
 ----
 
-Alternatively, you can specify these hints dynamically in the xref:ug-vw:ROOT:layout.adoc[`Xxx.layout.xml`] for the entity:
+Alternatively, you can specify these hints dynamically in the xref:vw:ROOT::layout.adoc[`Xxx.layout.xml`] for the entity:
 
 [source,xml]
 ----
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc b/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
index 17590c2..ce7f93b 100644
--- a/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
+++ b/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
@@ -7,6 +7,6 @@ The most significant aspect of the UI is the layout of the object's members: its
 These can be organized into columns, rows and tabs.
 
 This can be accomplished using either annotations or through a separate file-based layout.
-Since this is a large topic, it has its own xref:ug-vw:ROOT:layout.adoc[layout chapter] in the Wicket viewer guide.
+Since this is a large topic, it has its own xref:vw:ROOT::layout.adoc[layout chapter] in the Wicket viewer guide.
 
 
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc b/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
index 22746dc..b77c406 100644
--- a/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
+++ b/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
@@ -10,7 +10,7 @@ The icon is often the same for all instances of a particular class, but it's als
 This could represent the state of that object (eg a shipped order, say, or overdue library book).
 
 It is also possible for an object to provide a CSS class hint.
-In conjunction with xref:ug-vw:ROOT:customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
+In conjunction with xref:vw:ROOT::customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
 
 
 == Object Title
@@ -173,7 +173,7 @@ If there is no requirement to customize the icon (the normal case), then the ico
 For example, the icon for a class `org.mydomain.myapp.Customer` will be `org/mydomain/myapp/Customer.png` (if it exists).
 
 Alternatively, a font-awesome icon can be used.
-This is specified using the xref:rg:ant:DomainObjectLayout/cssClassFa.adoc[`@DomainObjectLayout#cssClassFa()`] attribute or in the xref:ug-vw:ROOT:layout/file-based.adoc[layout.xml] file.
+This is specified using the xref:rg:ant:DomainObjectLayout/cssClassFa.adoc[`@DomainObjectLayout#cssClassFa()`] attribute or in the xref:vw:ROOT::layout/file-based.adoc[layout.xml] file.
 
 For example:
 
@@ -257,14 +257,14 @@ public class OrderSubscriptions extends AbstractSubscriber {
 == Object CSS Styling
 
 It is also possible for an object to return a xref:rg:cms:methods/reserved/cssClass.adoc[CSS class].
-In conjunction with xref:ug-vw:ROOT:customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
+In conjunction with xref:vw:ROOT::customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
 
 
 
 === Declarative style
 
 To render an object with a particular CSS, use
-xref:rg:ant:DomainObjectLayout/cssClass.adoc[`@DomainObjectLayout#cssClass()`] or in the xref:ug-vw:ROOT:layout/file-based.adoc[layout.xml] file.
+xref:rg:ant:DomainObjectLayout/cssClass.adoc[`@DomainObjectLayout#cssClass()`] or in the xref:vw:ROOT::layout/file-based.adoc[layout.xml] file.
 
 When the domain object is rendered on its own page, this CSS class will appear on a top-level `<div>`.
 Or, when the domain object is rendered as a row in a collection, then the CSS class will appear in a `<div>` wrapped by the `<tr>` of the row.
diff --git a/antora/components/ug-vw/antora.yml b/core/viewer-wicket/_adoc/antora.yml
similarity index 59%
rename from antora/components/ug-vw/antora.yml
rename to core/viewer-wicket/_adoc/antora.yml
index 296dc5b..afe732b 100644
--- a/antora/components/ug-vw/antora.yml
+++ b/core/viewer-wicket/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: ug-vw
-title: "User Guides - Wicket Viewer"
+name: vw
+title: "Wicket Viewer"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/ug-vw/examples.csv b/core/viewer-wicket/_adoc/examples.csv
similarity index 100%
rename from antora/components/ug-vw/examples.csv
rename to core/viewer-wicket/_adoc/examples.csv
diff --git a/antora/components/ug-vw/modules/ROOT/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/examples/.gitkeep b/core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/examples/.gitkeep
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/about-page/about-page.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/about-page/about-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/dividers.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/dividers.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.pdn b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.pdn
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/tertiary.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/tertiary.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/modal.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/modal.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/sidebar.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/sidebar.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/regular.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/regular.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/features/recent-pages/recent-pages.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/customer-order.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/customer-order.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Invoice.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Invoice.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Lease.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Lease.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/menubars/010-download.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/menubars/010-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/menubars/020-download.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/menubars/020-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-0-8-0.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-4-4-12.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/6-6-0-12.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout.css b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout.css
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-1.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-1.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-2.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-2.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-page.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/attachments/.gitkeep b/core/viewer-wicket/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/attachments/.gitkeep
rename to core/viewer-wicket/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ug-vw/modules/ROOT/nav.adoc b/core/viewer-wicket/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/nav.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/about.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/about.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/configuration-properties.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/configuration-properties.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/about-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/about-page.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/auto-refresh.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/auto-refresh.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/brand-logo.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/brand-logo.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/brand-logo.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/brand-logo.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/custom-javascript.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/custom-javascript.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/request-parameters.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/request-parameters.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/request-parameters.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/request-parameters.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/top-level-index-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/top-level-index-page.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/tweaking-css-classes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/using-different-css-file.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/using-different-css-file.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/welcome-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/welcome-page.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/custom-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/custom-pages.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/replacing-page-elements.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/replacing-page-elements.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/blob-attachments.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/blob-attachments.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/bookmarked-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/bookmarked-pages.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/hints-and-copy-url.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/hints-and-copy-url.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/recent-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/recent-pages.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/titles-in-tables.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/titles-in-tables.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/user-registration.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/user-registration.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/where-am-i.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/where-am-i.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/svg-support.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/svg-support.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/incode-platform.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/incode-platform.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/annotation-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/annotation-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/file-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/file-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/table-columns.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/table-columns.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/table-columns.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/table-columns.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/_partials/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout/annotation-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout/annotation-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout/file-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout/file-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
diff --git a/antora/components/ug-vw/sync_examples.sh b/core/viewer-wicket/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ug-vw/sync_examples.sh
rename to core/viewer-wicket/_adoc/sync_examples.sh
diff --git a/site.yml b/site.yml
index 37043c1..d8f329a 100644
--- a/site.yml
+++ b/site.yml
@@ -21,7 +21,7 @@ content:
     start_path: antora/components/ug-vro
     branches: HEAD
   - url: .
-    start_path: antora/components/ug-vw
+    start_path: core/viewer-wicket/_adoc
     branches: HEAD
   - url: .
     branches: HEAD


[isis] 07/13: ISIS-2062: moves ug-odn alongside code, and renames to just 'DataNucleus ObjectStore".

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 182353d6e81c095ee05d4abaf4f1da04750c31b5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:18:44 2019 +0200

    ISIS-2062: moves ug-odn alongside code, and renames to just 'DataNucleus ObjectStore".
---
 antora/components/rg/modules/ROOT/pages/about.adoc          |   2 +-
 antora/components/rg/modules/cfg/pages/about.adoc           |   2 +-
 .../components/rg/modules/cfg/pages/configuring-core.adoc   |   2 +-
 .../pages/presentation-layer/ContentNegotiationService.adoc |   2 +-
 antora/components/support/modules/ROOT/pages/about.adoc     |   2 +-
 .../components/support/modules/dg/pages/hints-and-tips.adoc |   2 +-
 antora/components/toc/modules/ROOT/nav.adoc                 |   2 +-
 antora/components/toc/modules/ROOT/pages/about.adoc         |   2 +-
 .../ug-sec/modules/ROOT/pages/hints-and-tips.adoc           |   2 +-
 antora/components/ug/modules/ROOT/pages/about.adoc          |   2 +-
 .../btb/pages/deployment/externalized-configuration.adoc    |   2 +-
 antora/components/ug/modules/btb/pages/hints-and-tips.adoc  |   2 +-
 .../fun/pages/programming-model/domain-entities.adoc        |   2 +-
 .../components/ug-odn => core/plugins/jdo/_adoc}/antora.yml |   4 ++--
 .../ug-odn => core/plugins/jdo/_adoc}/examples.csv          |   0
 .../plugins/jdo/_adoc}/modules/ROOT/_attributes.adoc        |   0
 .../jdo/_adoc/modules/ROOT/assets/attachments}/.gitkeep     |   0
 .../ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png | Bin
 .../party-agreementrole-agreement.png                       | Bin
 .../plugins/jdo/_adoc/modules/ROOT/examples}/.gitkeep       |   0
 .../ug-odn => core/plugins/jdo/_adoc}/modules/ROOT/nav.adoc |   0
 .../plugins/jdo/_adoc}/modules/ROOT/pages/_attributes.adoc  |   0
 .../_adoc/modules/ROOT/pages/_partials}/_attributes.adoc    |   0
 .../plugins/jdo/_adoc}/modules/ROOT/pages/about.adoc        |   0
 .../plugins/jdo/_adoc}/modules/ROOT/pages/configuring.adoc  |   0
 .../_adoc/modules/ROOT/pages/configuring}/_attributes.adoc  |   0
 .../_adoc}/modules/ROOT/pages/configuring/bulk-load.adoc    |   0
 .../configuring/disabling-persistence-by-reachability.adoc  |   0
 .../modules/ROOT/pages/configuring/persistence-xml.adoc     |   0
 .../_adoc}/modules/ROOT/pages/configuring/properties.adoc   |   4 ++--
 .../ROOT/pages/configuring/using-jndi-data-source.adoc      |   0
 .../plugins/jdo/_adoc}/modules/ROOT/pages/db-schemas.adoc   |   2 +-
 .../jdo/_adoc}/modules/ROOT/pages/hints-and-tips.adoc       |   2 +-
 .../modules/ROOT/pages/hints-and-tips}/_attributes.adoc     |   0
 .../ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc      |   2 +-
 .../jdo/_adoc}/modules/ROOT/pages/hints-and-tips/java8.adoc |   0
 .../ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc     |   0
 .../pages/hints-and-tips/overriding-jdo-annotations.adoc    |   0
 .../hints-and-tips/subtype-entity-not-fully-populated.adoc  |   0
 .../hints-and-tips/typesafe-queries-and-fetchgroups.adoc    |   2 +-
 .../plugins/jdo/_adoc}/modules/ROOT/pages/jdo-mappings.adoc |   0
 .../jdo-mappings/1-to-m-bidirectional-relationships.adoc    |   0
 .../_adoc/modules/ROOT/pages/jdo-mappings}/_attributes.adoc |   0
 .../jdo-mappings/mandatory-properties-in-subtypes.adoc      |   0
 .../modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc  |   0
 .../ug-odn => core/plugins/jdo/_adoc}/sync_examples.sh      |   0
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc            |   2 +-
 .../_adoc/modules/ROOT/pages/hints-and-tips.adoc            |   2 +-
 site.yml                                                    |   2 +-
 49 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/antora/components/rg/modules/ROOT/pages/about.adoc b/antora/components/rg/modules/ROOT/pages/about.adoc
index 3e23146..5acbc0e 100644
--- a/antora/components/rg/modules/ROOT/pages/about.adoc
+++ b/antora/components/rg/modules/ROOT/pages/about.adoc
@@ -8,7 +8,7 @@ The user guides available are:
 * xref:ug:fun:about.adoc[Fundamentals]
 * xref:vw:ROOT:about.adoc[Wicket viewer]
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
-* xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
+* xref:odn:ROOT:about.adoc[DataNucleus object store]
 * xref:ug:sec:about.adoc[Security] (this guide)
 * xref:ug:tst:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
diff --git a/antora/components/rg/modules/cfg/pages/about.adoc b/antora/components/rg/modules/cfg/pages/about.adoc
index 0646378..5e2cf9e 100644
--- a/antora/components/rg/modules/cfg/pages/about.adoc
+++ b/antora/components/rg/modules/cfg/pages/about.adoc
@@ -11,7 +11,7 @@ This guide describes how to configure an Apache Isis application.
 This guide covers only the core configuration properties (relating to Apache Isis' metamodel and runtime management).
 Configuration properties for the viewers can be found in the xref:vw:ROOT:about.adoc[Wicket Viewer] guide and the xref:vro:ROOT::about.adoc[RestfulObjects viewer] guide.
 Likewise details of configuring security (Apache Shiro) can be
-found in the xref:ug:sec:about.adoc#[Security] guide, and details for configuring the DataNucleus Object Store can be found in the xref:ug-odn:ROOT:about.adoc#[DataNucleus] guide.
+found in the xref:ug:sec:about.adoc#[Security] guide, and details for configuring the DataNucleus Object Store can be found in the xref:odn:ROOT:about.adoc#[DataNucleus] guide.
 ====
 
 [TIP]
diff --git a/antora/components/rg/modules/cfg/pages/configuring-core.adoc b/antora/components/rg/modules/cfg/pages/configuring-core.adoc
index d6ca95e..ea89b88 100644
--- a/antora/components/rg/modules/cfg/pages/configuring-core.adoc
+++ b/antora/components/rg/modules/cfg/pages/configuring-core.adoc
@@ -6,7 +6,7 @@ This section lists the core/runtime configuration properties recognized by Apach
 
 [NOTE]
 ====
-Configuration properties for the JDO/DataNucleus objectstore can be found in the xref:ug-odn:ROOT:configuring.adoc[Configuring DataNucleus] section later in this chapter, while configuration properties for the viewers can be found in the their respective chapters, xref:vw:ROOT:configuration-properties.adoc[here for Wicket viewer], and xref:vro:ROOT::configuration-properties.adoc[here for the Restful Objects viewer].
+Configuration properties for the JDO/DataNucleus objectstore can be found in the xref:odn:ROOT:configuring.adoc[Configuring DataNucleus] section later in this chapter, while configuration properties for the viewers can be found in the their respective chapters, xref:vw:ROOT:configuration-properties.adoc[here for Wicket viewer], and xref:vro:ROOT::configuration-properties.adoc[here for the Restful Objects viewer].
 ====
 
 
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc b/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
index 1e5ffea..392c5a5 100644
--- a/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
+++ b/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
@@ -16,7 +16,7 @@ Instead you need to create some sort of stable facade over your domain entities,
 +
 If the underlying entities change, then care must be taken to ensure that structure of the view model nevertheless is unchanged.
 
-* a second option is to solve the problem at the persistence layer, but defining a (SQL) view in the database and then xref:ug-odn:ROOT:jdo-mappings/mapping-to-a-view.adoc[mapping this] to a (read-only) entity.  Again this is surfaced by the RO viewer.  +
+* a second option is to solve the problem at the persistence layer, but defining a (SQL) view in the database and then xref:odn:ROOT:jdo-mappings/mapping-to-a-view.adoc[mapping this] to a (read-only) entity.  Again this is surfaced by the RO viewer.  +
 +
 If the underlying tables change (as the result of a change in their corresponding domain entities) then once more the view must be refactored so that it still presents the same structure.
 
diff --git a/antora/components/support/modules/ROOT/pages/about.adoc b/antora/components/support/modules/ROOT/pages/about.adoc
index 8e12c5d..501b66f 100644
--- a/antora/components/support/modules/ROOT/pages/about.adoc
+++ b/antora/components/support/modules/ROOT/pages/about.adoc
@@ -8,7 +8,7 @@ The user guides available are:
 * xref:ug:fun:about.adoc[Fundamentals]
 * xref:vw:ROOT:about.adoc[Wicket viewer]
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
-* xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
+* xref:odn:ROOT:about.adoc[DataNucleus object store]
 * xref:ug:sec:about.adoc[Security]
 * xref:ug:tst:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
diff --git a/antora/components/support/modules/dg/pages/hints-and-tips.adoc b/antora/components/support/modules/dg/pages/hints-and-tips.adoc
index 40c1191..552862d 100644
--- a/antora/components/support/modules/dg/pages/hints-and-tips.adoc
+++ b/antora/components/support/modules/dg/pages/hints-and-tips.adoc
@@ -14,7 +14,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
-* the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
+* the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
 * the xref:ug:sec:hints-and-tips.adoc[Security] guide
 
diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index e14b4d7..058901a 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -22,7 +22,7 @@
 ** *xref:ug:fun:about.adoc[Fundamentals]*
 **  xref:vw:ROOT:about.adoc[Wicket Viewer]
 **  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
-**  xref:ug-odn:ROOT:about.adoc[DataNucleus Object Store]
+**  xref:odn:ROOT:about.adoc[DataNucleus Object Store]
 **  xref:ug:sec:about.adoc[Security]
 ** *xref:ug:tst:about.adoc[Testing]*
 **  xref:ug:btb:about.adoc[Beyond the Basics]
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 9d5699e..61472d4 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -41,7 +41,7 @@ include::_attributes.adoc[]
 * *xref:ug:fun:about.adoc[Fundamentals]*
 *  xref:vw:ROOT:about.adoc[Wicket Viewer]
 *  xref:vro:ROOT::about.adoc[Restful Objects Viewer]
-*  xref:ug-odn:ROOT:about.adoc[DataNucleus Object Store]
+*  xref:odn:ROOT:about.adoc[DataNucleus Object Store]
 *  xref:ug:sec:about.adoc[Security]
 * *xref:ug:tst:about.adoc[Testing]*
 *  xref:ug:btb:about.adoc[Beyond the Basics]
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
index b79b5eb..fed9421 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
@@ -15,7 +15,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
-* the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
+* the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
 * the xref:ug:sec:hints-and-tips.adoc[Security] guide (this chapter)
 
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/antora/components/ug/modules/ROOT/pages/about.adoc
index e2f2199..95cf7f4 100644
--- a/antora/components/ug/modules/ROOT/pages/about.adoc
+++ b/antora/components/ug/modules/ROOT/pages/about.adoc
@@ -8,7 +8,7 @@ The user guides available are:
 * xref:ug:fun:about.adoc[Fundamentals]
 * xref:vw:ROOT::about.adoc[Wicket viewer]
 * xref:vro:ROOT::about.adoc[Restful Objects viewer]
-* xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
+* xref:odn:ROOT:about.adoc[DataNucleus object store]
 * xref:ug-sec:ROOT:about.adoc[Security]
 * xref:ug-tst:ROOT:about.adoc[Testing]
 * xref:ug:btb:about.adoc[Beyond the Basics]
diff --git a/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc b/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
index 46afba4..a06a99e 100644
--- a/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
+++ b/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
@@ -253,4 +253,4 @@ The cost of these proxies can be mitigated using:
 
 == Using a JNDI Datasource
 
-See the guidance in the xref:ug-odn:ROOT:configuring/using-jndi-data-source.adoc[configuring datanucleus] section.
\ No newline at end of file
+See the guidance in the xref:odn:ROOT:configuring/using-jndi-data-source.adoc[configuring datanucleus] section.
\ No newline at end of file
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
index 51d8c19..f1a69a3 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
@@ -14,7 +14,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
-* the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
+* the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
 * the xref:ug-sec:ROOT:hints-and-tips.adoc[Security] guide
 
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc b/antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc
index 61c425c..668032c 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc
@@ -137,6 +137,6 @@ RepositoryService repositoryService;
 
 [TIP]
 ====
-See the xref:ug-odn:ROOT:about.adoc[DataNucleus objectstore guide] for further information on annotating domain entities.
+See the xref:odn:ROOT:about.adoc[DataNucleus objectstore guide] for further information on annotating domain entities.
 ====
 
diff --git a/antora/components/ug-odn/antora.yml b/core/plugins/jdo/_adoc/antora.yml
similarity index 54%
rename from antora/components/ug-odn/antora.yml
rename to core/plugins/jdo/_adoc/antora.yml
index be6fd32..96779d4 100644
--- a/antora/components/ug-odn/antora.yml
+++ b/core/plugins/jdo/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: ug-odn
-title: "User Guides - DataNucleus ObjectStore"
+name: odn
+title: "DataNucleus ObjectStore"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/ug-odn/examples.csv b/core/plugins/jdo/_adoc/examples.csv
similarity index 100%
rename from antora/components/ug-odn/examples.csv
rename to core/plugins/jdo/_adoc/examples.csv
diff --git a/antora/components/ug-odn/modules/ROOT/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/_attributes.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/examples/.gitkeep b/core/plugins/jdo/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/examples/.gitkeep
rename to core/plugins/jdo/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ug-odn/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png b/core/plugins/jdo/_adoc/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png
rename to core/plugins/jdo/_adoc/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png
diff --git a/antora/components/ug-odn/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png b/core/plugins/jdo/_adoc/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
rename to core/plugins/jdo/_adoc/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
diff --git a/antora/components/ug-odn/modules/ROOT/assets/attachments/.gitkeep b/core/plugins/jdo/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/assets/attachments/.gitkeep
rename to core/plugins/jdo/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ug-odn/modules/ROOT/nav.adoc b/core/plugins/jdo/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/nav.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/_attributes.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/_attributes.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/about.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/about.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/configuring.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/configuring.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/_attributes.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/_attributes.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/_attributes.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring/bulk-load.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/bulk-load.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/configuring/bulk-load.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/bulk-load.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring/persistence-xml.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/persistence-xml.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/configuring/persistence-xml.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/persistence-xml.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring/properties.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/properties.adoc
similarity index 94%
rename from antora/components/ug-odn/modules/ROOT/pages/configuring/properties.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/properties.adoc
index e8639df..a62ce90 100644
--- a/antora/components/ug-odn/modules/ROOT/pages/configuring/properties.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/properties.adoc
@@ -23,7 +23,7 @@ These configuration properties are typically stored in `WEB-INF/persistor_datanu
 (`false`)
 |Enables bulk load of standalone collections.
 
-Further xref:ug-odn:ROOT:configuring/bulk-load.adoc[discussion below].
+Further xref:odn:ROOT:configuring/bulk-load.adoc[discussion below].
 
 |`isis.persistor.` +
 `datanucleus.` +
@@ -91,7 +91,7 @@ Only intended for "emergency use" as a workaround while pending fix/patch to Apa
 `datanucleus.persistenceByReachabilityAtCommit`
 |`false`
 |We recommend this setting is disabled.  +
-Further xref:ug-odn:ROOT:configuring/disabling-persistence-by-reachability.adoc[discussion below].
+Further xref:odn:ROOT:configuring/disabling-persistence-by-reachability.adoc[discussion below].
 
 |===
 
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring/using-jndi-data-source.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/db-schemas.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/db-schemas.adoc
similarity index 97%
rename from antora/components/ug-odn/modules/ROOT/pages/db-schemas.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/db-schemas.adoc
index 2c78638..a08c724 100644
--- a/antora/components/ug-odn/modules/ROOT/pages/db-schemas.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/pages/db-schemas.adoc
@@ -50,7 +50,7 @@ CREATE TABLE isisaudit."AuditEntry" (
 [TIP]
 ====
 If for some reason you don't want to use schemas (though we strongly recommend that you do), then note that you can override the `@PersistenceCapable` annotation by providing XML metadata (the `mappings.jdo` file).
-See the section on xref:ug-odn:ROOT:configuring.adoc[configuring DataNucleus Overriding Annotations] for more details.
+See the section on xref:odn:ROOT:configuring.adoc[configuring DataNucleus Overriding Annotations] for more details.
 ====
 
 
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 93%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index 0f4249d..157e479 100644
--- a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -13,7 +13,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
-* the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide (this chapter)
+* the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide (this chapter)
 
 * the xref:ug:sec:hints-and-tips.adoc[Security] guide
 
diff --git a/antora/components/ug-odn/modules/ROOT/pages/configuring/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/configuring/_attributes.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
similarity index 92%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
index 49b41f5..3a6756f 100644
--- a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
@@ -11,4 +11,4 @@ The "Variables" pane will tell you which field(s) are being loaded, and the stac
 
 For example, it may be that an object is being loaded in a table and the initial query did not eagerly load that field.
 In such a case, consider using fetch groups in the initial repository query to bring the required data into memory with just one SQL call.
-See xref:ug-odn:ROOT:hints-and-tips/typesafe-queries-and-fetchgroups.adoc[this hint/tip] for further details.
\ No newline at end of file
+See xref:odn:ROOT:hints-and-tips/typesafe-queries-and-fetchgroups.adoc[this hint/tip] for further details.
\ No newline at end of file
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/java8.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/java8.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/java8.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/java8.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
similarity index 97%
rename from antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
index 419eb1f..a459987 100644
--- a/antora/components/ug-odn/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 
 
 Fetch groups provide a means to hint to DataNucleus that it should perform a SQL join when querying.
-A common use case is to avoid the xref:ug-odn:ROOT:hints-and-tips/diagnosing-n-plus-1.adoc[n+1] issue.
+A common use case is to avoid the xref:odn:ROOT:hints-and-tips/diagnosing-n-plus-1.adoc[n+1] issue.
 
 (So far as I could ascertain) it isn't possible to specify fetch group hints using JDOQL, but it is possible to specify them using the programmatic API or using typesafe queries.
 
diff --git a/antora/components/ug-odn/modules/ROOT/pages/jdo-mappings.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/jdo-mappings.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/_partials/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/_attributes.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/_attributes.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
diff --git a/antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
similarity index 100%
rename from antora/components/ug-odn/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
rename to core/plugins/jdo/_adoc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
diff --git a/antora/components/ug-odn/sync_examples.sh b/core/plugins/jdo/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ug-odn/sync_examples.sh
rename to core/plugins/jdo/_adoc/sync_examples.sh
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index ccd06e2..6ddf853 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -13,7 +13,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide (this chapter)
 
-* the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
+* the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
 * the xref:ug:sec:hints-and-tips.adoc[Security] guide
 
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index 4264380..b3bbc3d 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -14,7 +14,7 @@ See also hints-n-tips chapters in the:
 
 * the xref:vro:ROOT::hints-and-tips.adoc[Restful Objects viewer] guide
 
-* the xref:ug-odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
+* the xref:odn:ROOT:hints-and-tips.adoc[Datanucleus ObjectStore] guide
 
 * the xref:ug:sec:hints-and-tips.adoc[Security] guide
 
diff --git a/site.yml b/site.yml
index b85229b..f910c84 100644
--- a/site.yml
+++ b/site.yml
@@ -9,7 +9,7 @@ content:
     start_path: antora/components/ug
     branches: HEAD
   - url: .
-    start_path: antora/components/ug-odn
+    start_path: core/plugins/jdo/_adoc
     branches: HEAD
   - url: .
     start_path: antora/components/ug-sec


[isis] 09/13: ISIS-2062: moves plugins/security-shiro to core/security/plugins/shiro

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 792eacab05fa4ba20b57edadef99ef34c5440ab8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:23:05 2019 +0200

    ISIS-2062: moves plugins/security-shiro to core/security/plugins/shiro
    
    so can move docs closer.
---
 core/pom.xml                                                            | 2 +-
 core/{plugins/security-shiro => security/plugins/shiro}/NOTICE          | 0
 core/{plugins/security-shiro => security/plugins/shiro}/pom.xml         | 0
 .../plugins/shiro}/src/main/appended-resources/supplemental-models.xml  | 0
 .../main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java | 0
 .../java/org/apache/isis/security/shiro/IsisLdapContextFactory.java     | 0
 .../src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java     | 0
 .../main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java  | 0
 .../src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java    | 0
 .../apache/isis/security/shiro/authentication/ShiroAuthenticator.java   | 0
 .../org/apache/isis/security/shiro/authorization/IsisPermission.java    | 0
 .../isis/security/shiro/authorization/IsisPermissionResolver.java       | 0
 .../org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java   | 0
 .../isis/security/shiro/permrolemapper/PermissionToRoleMapper.java      | 0
 .../security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java    | 0
 .../security/shiro/permrolemapper/PermissionToRoleMapperFromString.java | 0
 .../main/java/org/apache/isis/security/shiro/permrolemapper/Util.java   | 0
 .../org/apache/isis/security/shiro/IsisPermissionTest_setParts.java     | 0
 .../org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java | 0
 .../security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java | 0
 .../shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java    | 0
 .../isis/security/shiro/authorization/IsisPermissionTest_equals.java    | 0
 .../shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java         | 0
 .../shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java      | 0
 .../org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java   | 0
 .../test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini | 0
 .../plugins/shiro}/src/test/resources/shiro.ini                         | 0
 27 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 6efcd02..80cd6f2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2482,7 +2482,7 @@
 		<module>plugins/jaxrs-resteasy-4</module>
 		<module>plugins/jdo/common</module>
 		<module>plugins/jdo/datanucleus-5</module>
-		<module>plugins/security-shiro</module>
+		<module>security/plugins/shiro</module>
 
 		<!-- to break cyclic dependencies some tests needed to be moved to their 
 			own modules -->
diff --git a/core/plugins/security-shiro/NOTICE b/core/security/plugins/shiro/NOTICE
similarity index 100%
rename from core/plugins/security-shiro/NOTICE
rename to core/security/plugins/shiro/NOTICE
diff --git a/core/plugins/security-shiro/pom.xml b/core/security/plugins/shiro/pom.xml
similarity index 100%
rename from core/plugins/security-shiro/pom.xml
rename to core/security/plugins/shiro/pom.xml
diff --git a/core/plugins/security-shiro/src/main/appended-resources/supplemental-models.xml b/core/security/plugins/shiro/src/main/appended-resources/supplemental-models.xml
similarity index 100%
rename from core/plugins/security-shiro/src/main/appended-resources/supplemental-models.xml
rename to core/security/plugins/shiro/src/main/appended-resources/supplemental-models.xml
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
diff --git a/core/plugins/security-shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini b/core/security/plugins/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
similarity index 100%
rename from core/plugins/security-shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
rename to core/security/plugins/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
diff --git a/core/plugins/security-shiro/src/test/resources/shiro.ini b/core/security/plugins/shiro/src/test/resources/shiro.ini
similarity index 100%
rename from core/plugins/security-shiro/src/test/resources/shiro.ini
rename to core/security/plugins/shiro/src/test/resources/shiro.ini


[isis] 08/13: ISIS-2062: moves core/security to core/security/api-and-bypass

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e144172460a5ea6472fd4682c992ca35de17b1f3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:20:37 2019 +0200

    ISIS-2062: moves core/security to core/security/api-and-bypass
---
 core/pom.xml                                                            | 2 +-
 core/security/{ => api-and-bypass}/pom.xml                              | 0
 .../src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java  | 0
 .../org/apache/isis/security/authentication/AuthenticationRequest.java  | 0
 .../isis/security/authentication/AuthenticationRequestAbstract.java     | 0
 .../isis/security/authentication/AuthenticationRequestPassword.java     | 0
 .../org/apache/isis/security/authentication/AuthenticationSession.java  | 0
 .../isis/security/authentication/AuthenticationSessionAbstract.java     | 0
 .../isis/security/authentication/AuthenticationSessionProvider.java     | 0
 .../java/org/apache/isis/security/authentication/MessageBroker.java     | 0
 .../apache/isis/security/authentication/bypass/AuthenticatorBypass.java | 0
 .../authentication/fixtures/AuthenticationRequestLogonFixture.java      | 0
 .../security/authentication/fixtures/LogonFixtureAuthenticator.java     | 0
 .../apache/isis/security/authentication/health/HealthAuthSession.java   | 0
 .../isis/security/authentication/manager/AuthenticationManager.java     | 0
 .../security/authentication/manager/AuthorizationManagerStandard.java   | 0
 .../isis/security/authentication/manager/RegistrationDetails.java       | 0
 .../main/java/org/apache/isis/security/authentication/package-info.java | 0
 .../authentication/singleuser/AuthenticationRequestSingleUser.java      | 0
 .../isis/security/authentication/singleuser/SingleUserSession.java      | 0
 .../security/authentication/standard/AuthenticationManagerStandard.java | 0
 .../org/apache/isis/security/authentication/standard/Authenticator.java | 0
 .../isis/security/authentication/standard/AuthenticatorAbstract.java    | 0
 .../isis/security/authentication/standard/AuthenticatorDefault.java     | 0
 .../isis/security/authentication/standard/NoAuthenticatorException.java | 0
 .../authentication/standard/PasswordRequestAuthenticatorAbstract.java   | 0
 .../isis/security/authentication/standard/RandomCodeGenerator.java      | 0
 .../security/authentication/standard/RandomCodeGenerator10Chars.java    | 0
 .../isis/security/authentication/standard/RandomCodeGeneratorUUID.java  | 0
 .../org/apache/isis/security/authentication/standard/Registrar.java     | 0
 .../security/authentication/standard/RegistrationDetailsPassword.java   | 0
 .../org/apache/isis/security/authentication/standard/SimpleSession.java | 0
 .../org/apache/isis/security/authorization/bypass/AuthorizorBypass.java | 0
 .../isis/security/authorization/manager/AuthorizationManager.java       | 0
 .../isis/security/authorization/standard/AuthorizationConstants.java    | 0
 .../org/apache/isis/security/authorization/standard/Authorizor.java     | 0
 .../test/java/org/apache/isis/security/EncodabilityContractTest.java    | 0
 .../security/authentication/fixture/LogonFixtureAuthenticatorTest.java  | 0
 .../isis/security/authentication/standard/AuthenticatorDefaultTest.java | 0
 .../authentication/standard/SimpleSessionEncodabilityNoRolesTest.java   | 0
 .../authentication/standard/SimpleSessionEncodabilityTestAbstract.java  | 0
 .../authentication/standard/SimpleSessionEncodabilityWithRolesTest.java | 0
 .../standard/StandardAuthenticationManager_AuthenticationTest.java      | 0
 .../standard/StandardAuthenticationManager_AuthenticatorsTest.java      | 0
 44 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 5f394d2..6efcd02 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2465,7 +2465,7 @@
 		<module>runtime-extensions</module>
 		<module>runtime-web</module>
 
-		<module>security</module>
+		<module>security/api-and-bypass</module>
 
 		<module>testsupport/unittestsupport</module>
 		<module>testsupport/integtestsupport</module>
diff --git a/core/security/pom.xml b/core/security/api-and-bypass/pom.xml
similarity index 100%
rename from core/security/pom.xml
rename to core/security/api-and-bypass/pom.xml
diff --git a/core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/MessageBroker.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/package-info.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/package-info.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/package-info.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/package-info.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
diff --git a/core/security/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java b/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
similarity index 100%
rename from core/security/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
rename to core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
diff --git a/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java b/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
similarity index 100%
rename from core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
rename to core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java


[isis] 13/13: ISIS-2062: moves rg alongside code, renamed to _adoc-rg

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f6c94297cf833775f6b5b2cdf19fd7cb59d75d9e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:31:18 2019 +0200

    ISIS-2062: moves rg alongside code, renamed to _adoc-rg
---
 {antora/components/rg => core/_adoc-rg}/antora.yml          |   0
 {antora/components/rg => core/_adoc-rg}/examples.csv        |   0
 .../rg => core/_adoc-rg}/modules/ROOT/_attributes.adoc      |   0
 .../components/rg => core/_adoc-rg}/modules/ROOT/nav.adoc   |   0
 .../_adoc-rg/modules/ROOT}/pages/_attributes.adoc           |   0
 .../_adoc-rg/modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../rg => core/_adoc-rg}/modules/ROOT/pages/about.adoc      |   0
 .../svc => core/_adoc-rg/modules/ant}/_attributes.adoc      |   0
 .../_adoc-rg/modules/ant/assets/attachments}/.gitkeep       |   0
 .../_adoc-rg/modules/ant/assets/images}/.gitkeep            |   0
 .../reference-annotations/ActionLayout}/bookmarking.png     | Bin
 .../reference-annotations/ActionLayout/position-BELOW.png   | Bin
 .../reference-annotations/ActionLayout/position-PANEL.png   | Bin
 .../ActionLayout/position-PANEL_DROPDOWN.png                | Bin
 .../reference-annotations/ActionLayout/position-RIGHT.png   | Bin
 .../CollectionLayout/sortedby-dependencies.png              | Bin
 .../DomainObjectLayout/bookmarking-nested.png               | Bin
 .../DomainObjectLayout}/bookmarking.png                     | Bin
 .../DomainServiceLayout/menuBar-primary.png                 | Bin
 .../DomainServiceLayout/menuBar-secondary.png               | Bin
 .../DomainServiceLayout/menuBar-tertiary.png                | Bin
 .../reference-annotations/DomainServiceLayout/menuOrder.png | Bin
 .../images/reference-annotations/HomePage/HomePage.png      | Bin
 .../PropertyLayout/labelPosition-LEFT.png                   | Bin
 .../PropertyLayout/labelPosition-NONE.png                   | Bin
 .../PropertyLayout/labelPosition-TOP.png                    | Bin
 .../PropertyLayout/labelPosition-boolean-LEFT.png           | Bin
 .../PropertyLayout/labelPosition-boolean-RIGHT.png          | Bin
 .../mvn => core/_adoc-rg/modules/ant}/examples/.gitkeep     |   0
 .../components/rg => core/_adoc-rg}/modules/ant/nav.adoc    |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Action.adoc      |   0
 .../_adoc-rg/modules/ant/pages/Action}/_attributes.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/Action/associateWith.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/Action/command.adoc         |   0
 .../_adoc-rg}/modules/ant/pages/Action/domainEvent.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/Action/hidden.adoc          |   0
 .../_adoc-rg}/modules/ant/pages/Action/invokeOn.adoc        |   0
 .../_adoc-rg}/modules/ant/pages/Action/publishing.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/Action/restrictTo.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/Action/semantics.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/Action/typeOf.adoc          |   0
 .../_adoc-rg}/modules/ant/pages/ActionLayout.adoc           |   0
 .../modules/ant/pages/ActionLayout}/_attributes.adoc        |   0
 .../modules/ant/pages/ActionLayout/bookmarking.adoc         |   0
 .../modules/ant/pages/ActionLayout/contributedAs.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/ActionLayout/cssClass.adoc  |   0
 .../modules/ant/pages/ActionLayout/cssClassFa.adoc          |   0
 .../modules/ant/pages/ActionLayout/describedAs.adoc         |   0
 .../_adoc-rg}/modules/ant/pages/ActionLayout/hidden.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/ActionLayout/named.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/ActionLayout/position.adoc  |   0
 .../modules/ant/pages/ActionLayout/promptStyle.adoc         |   0
 .../_adoc-rg}/modules/ant/pages/ActionLayout/redirect.adoc  |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Collection.adoc  |   0
 .../_adoc-rg/modules/ant/pages/Collection}/_attributes.adoc |   0
 .../_adoc-rg}/modules/ant/pages/Collection/domainEvent.adoc |   0
 .../_adoc-rg}/modules/ant/pages/Collection/editing.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/Collection/hidden.adoc      |   0
 .../modules/ant/pages/Collection/notPersisted.adoc          |   0
 .../_adoc-rg}/modules/ant/pages/Collection/typeOf.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/CollectionLayout.adoc       |   0
 .../modules/ant/pages/CollectionLayout}/_attributes.adoc    |   0
 .../modules/ant/pages/CollectionLayout/cssClass.adoc        |   0
 .../modules/ant/pages/CollectionLayout/defaultView.adoc     |   0
 .../modules/ant/pages/CollectionLayout/describedAs.adoc     |   0
 .../modules/ant/pages/CollectionLayout/hidden.adoc          |   0
 .../_adoc-rg}/modules/ant/pages/CollectionLayout/named.adoc |   0
 .../_adoc-rg}/modules/ant/pages/CollectionLayout/paged.adoc |   0
 .../modules/ant/pages/CollectionLayout/sortedBy.adoc        |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Column.adoc      |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Digits.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/Discriminator.adoc          |   0
 .../_adoc-rg}/modules/ant/pages/DomainObject.adoc           |   0
 .../modules/ant/pages/DomainObject}/_attributes.adoc        |   0
 .../modules/ant/pages/DomainObject/actionDomainEvent.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/DomainObject/auditing.adoc  |   0
 .../ant/pages/DomainObject/autoCompleteRepository.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/DomainObject/bounding.adoc  |   0
 .../ant/pages/DomainObject/collectionDomainEvent.adoc       |   0
 .../ant/pages/DomainObject/createdLifecycleEvent.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/DomainObject/editing.adoc   |   0
 .../ant/pages/DomainObject/loadedLifecycleEvent.adoc        |   0
 .../modules/ant/pages/DomainObject/mixinMethod.adoc         |   0
 .../_adoc-rg}/modules/ant/pages/DomainObject/nature.adoc    |   0
 .../modules/ant/pages/DomainObject/objectType.adoc          |   0
 .../ant/pages/DomainObject/persistedLifecycleEvent.adoc     |   0
 .../ant/pages/DomainObject/persistingLifecycleEvent.adoc    |   0
 .../modules/ant/pages/DomainObject/propertyDomainEvent.adoc |   0
 .../modules/ant/pages/DomainObject/publishing.adoc          |   0
 .../ant/pages/DomainObject/removingLifecycleEvent.adoc      |   0
 .../ant/pages/DomainObject/updatedLifecycleEvent.adoc       |   0
 .../ant/pages/DomainObject/updatingLifecycleEvent.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/DomainObjectLayout.adoc     |   0
 .../modules/ant/pages/DomainObjectLayout}/_attributes.adoc  |   0
 .../modules/ant/pages/DomainObjectLayout/bookmarking.adoc   |   0
 .../modules/ant/pages/DomainObjectLayout/cssClass.adoc      |   0
 .../modules/ant/pages/DomainObjectLayout/cssClassFa.adoc    |   0
 .../ant/pages/DomainObjectLayout/cssClassUiEvent.adoc       |   0
 .../modules/ant/pages/DomainObjectLayout/describedAs.adoc   |   0
 .../modules/ant/pages/DomainObjectLayout/iconUiEvent.adoc   |   0
 .../modules/ant/pages/DomainObjectLayout/layoutUiEvent.adoc |   0
 .../modules/ant/pages/DomainObjectLayout/named.adoc         |   0
 .../modules/ant/pages/DomainObjectLayout/paged.adoc         |   0
 .../modules/ant/pages/DomainObjectLayout/plural.adoc        |   0
 .../modules/ant/pages/DomainObjectLayout/titleUiEvent.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/DomainService.adoc          |   0
 .../modules/ant/pages/DomainService}/_attributes.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/DomainService/nature.adoc   |   0
 .../modules/ant/pages/DomainService/objectType.adoc         |   0
 .../modules/ant/pages/DomainService/repositoryFor.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/DomainServiceLayout.adoc    |   0
 .../modules/ant/pages/DomainServiceLayout}/_attributes.adoc |   0
 .../modules/ant/pages/DomainServiceLayout/menuBar.adoc      |   0
 .../modules/ant/pages/DomainServiceLayout/menuOrder.adoc    |   0
 .../modules/ant/pages/DomainServiceLayout/named.adoc        |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Facets.adoc      |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/HomePage.adoc    |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Inject.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/MemberGroupLayout.adoc      |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/MemberOrder.adoc |   0
 .../modules/ant/pages/MemberOrder}/_attributes.adoc         |   0
 .../_adoc-rg}/modules/ant/pages/MemberOrder/name.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/MemberOrder/sequence.adoc   |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/MinLength.adoc   |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Mixin.adoc       |   0
 .../_adoc-rg/modules/ant/pages/Mixin}/_attributes.adoc      |   0
 .../_adoc-rg}/modules/ant/pages/Mixin/method.adoc           |   0
 .../_adoc-rg}/modules/ant/pages/NotPersistent.adoc          |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Nullable.adoc    |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Parameter.adoc   |   0
 .../_adoc-rg/modules/ant/pages/Parameter}/_attributes.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/Parameter/fileAccept.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/Parameter/maxLength.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/Parameter/mustSatisfy.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/Parameter/optionality.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/Parameter/regexPattern.adoc |   0
 .../_adoc-rg}/modules/ant/pages/ParameterLayout.adoc        |   0
 .../modules/ant/pages/ParameterLayout}/_attributes.adoc     |   0
 .../modules/ant/pages/ParameterLayout/cssClass.adoc         |   0
 .../modules/ant/pages/ParameterLayout/describedAs.adoc      |   0
 .../modules/ant/pages/ParameterLayout/labelPosition.adoc    |   0
 .../modules/ant/pages/ParameterLayout/multiLine.adoc        |   0
 .../_adoc-rg}/modules/ant/pages/ParameterLayout/named.adoc  |   0
 .../ant/pages/ParameterLayout/renderedAsDayBefore.adoc      |   0
 .../modules/ant/pages/ParameterLayout/typicalLength.adoc    |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Pattern.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/PersistenceCapable.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/PostConstruct.adoc          |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/PreDestroy.adoc  |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/PrimaryKey.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/Programmatic.adoc           |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Property.adoc    |   0
 .../_adoc-rg/modules/ant/pages/Property}/_attributes.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/Property/command.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/Property/domainEvent.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/Property/editing.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/Property/fileAccept.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/Property/hidden.adoc        |   0
 .../_adoc-rg}/modules/ant/pages/Property/maxLength.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/Property/mustSatisfy.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/Property/notPersisted.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/Property/optionality.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/Property/projecting.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/Property/publishing.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/Property/regexPattern.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/PropertyLayout.adoc         |   0
 .../modules/ant/pages/PropertyLayout}/_attributes.adoc      |   0
 .../modules/ant/pages/PropertyLayout/cssClass.adoc          |   0
 .../modules/ant/pages/PropertyLayout/describedAs.adoc       |   0
 .../_adoc-rg}/modules/ant/pages/PropertyLayout/hidden.adoc  |   0
 .../modules/ant/pages/PropertyLayout/labelPosition.adoc     |   0
 .../modules/ant/pages/PropertyLayout/multiLine.adoc         |   0
 .../_adoc-rg}/modules/ant/pages/PropertyLayout/named.adoc   |   0
 .../modules/ant/pages/PropertyLayout/navigable.adoc         |   0
 .../modules/ant/pages/PropertyLayout/promptStyle.adoc       |   0
 .../ant/pages/PropertyLayout/renderedAsDayBefore.adoc       |   0
 .../modules/ant/pages/PropertyLayout/typicalLength.adoc     |   0
 .../modules/ant/pages/PropertyLayout/unchanging.adoc        |   0
 .../_adoc-rg}/modules/ant/pages/RequestScoped.adoc          |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/Title.adoc       |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/ViewModel.adoc   |   0
 .../_adoc-rg/modules/ant/pages/ViewModel}/_attributes.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/ViewModel/objectType.adoc   |   0
 .../_adoc-rg}/modules/ant/pages/ViewModelLayout.adoc        |   0
 .../modules/ant/pages/ViewModelLayout}/_attributes.adoc     |   0
 .../modules/ant/pages/ViewModelLayout/bookmarking.adoc      |   0
 .../modules/ant/pages/ViewModelLayout/cssClass.adoc         |   0
 .../modules/ant/pages/ViewModelLayout/cssClassFa.adoc       |   0
 .../modules/ant/pages/ViewModelLayout/cssClassUiEvent.adoc  |   0
 .../modules/ant/pages/ViewModelLayout/describedAs.adoc      |   0
 .../modules/ant/pages/ViewModelLayout/iconUiEvent.adoc      |   0
 .../modules/ant/pages/ViewModelLayout/layoutUiEvent.adoc    |   0
 .../_adoc-rg}/modules/ant/pages/ViewModelLayout/named.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/ViewModelLayout/paged.adoc  |   0
 .../_adoc-rg}/modules/ant/pages/ViewModelLayout/plural.adoc |   0
 .../modules/ant/pages/ViewModelLayout/titleUiEvent.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/XmlJavaTypeAdapter.adoc     |   0
 .../_adoc-rg}/modules/ant/pages/XmlRootElement.adoc         |   0
 .../_adoc-rg/modules/ant}/pages/_attributes.adoc            |   0
 .../_adoc-rg/modules/ant/pages/_partials}/_attributes.adoc  |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/aaa.adoc         |   0
 .../_adoc-rg/modules/ant/pages/aaa}/_attributes.adoc        |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/aaa/jdo.adoc     |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/aaa/jee.adoc     |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/aaa/main.adoc    |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/aaa/other.adoc   |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/aaa/partial.adoc |   0
 .../rg => core/_adoc-rg}/modules/ant/pages/about.adoc       |   0
 .../mvn => core/_adoc-rg/modules/cfg}/_attributes.adoc      |   0
 .../_adoc-rg/modules/cfg}/assets/attachments/.gitkeep       |   0
 .../_adoc-rg/modules/cfg/assets/images}/.gitkeep            |   0
 .../_adoc-rg/modules/cfg/examples}/.gitkeep                 |   0
 .../components/rg => core/_adoc-rg}/modules/cfg/nav.adoc    |   0
 .../_adoc-rg/modules/cfg}/pages/_attributes.adoc            |   0
 .../_adoc-rg/modules/cfg/pages/_partials}/_attributes.adoc  |   0
 .../rg => core/_adoc-rg}/modules/cfg/pages/about.adoc       |   0
 .../_adoc-rg}/modules/cfg/pages/configuration-files.adoc    |   0
 .../_adoc-rg}/modules/cfg/pages/configuring-core.adoc       |   0
 .../_adoc-rg}/modules/cfg/pages/deployment-types.adoc       |   0
 .../_adoc-rg}/modules/cfg/pages/specifying-components.adoc  |   0
 .../fis => core/_adoc-rg/modules/cms}/_attributes.adoc      |   0
 .../_adoc-rg/modules/cms/assets/attachments}/.gitkeep       |   0
 .../images/reference-classes/issue-in-more-detail.png       | Bin
 .../images/reference-methods/prefixes/choices/dependent.png | Bin
 .../reference-methods/reserved/cssClass/strikethrough.png   | Bin
 .../reference-methods/reserved/iconName/differing.pdn       | Bin
 .../reference-methods/reserved/iconName/differing.png       | Bin
 .../reference-methods/reserved/iconName/png-files.png       | Bin
 .../modules/cms/assets/images/value-types/markup.png        | Bin
 .../_adoc-rg/modules/cms/examples}/.gitkeep                 |   0
 .../components/rg => core/_adoc-rg}/modules/cms/nav.adoc    |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/_attributes.adoc |   0
 .../_adoc-rg}/modules/cms/pages/_partials/_attributes.adoc  |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/about.adoc       |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/classes.adoc     |   0
 .../cms/pages/classes/AppManifest-bootstrapping.adoc        |   0
 .../cms/pages/classes/AppManifest2-bootstrapping.adoc       |   0
 .../_adoc-rg/modules/cms/pages/classes}/_attributes.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/classes/contributee.adoc    |   0
 .../cms/pages/classes/contributee/HasTransactionId.adoc     |   0
 .../modules/cms/pages/classes/contributee/HasUserName.adoc  |   0
 .../modules/cms/pages/classes/contributee}/_attributes.adoc |   0
 .../_adoc-rg}/modules/cms/pages/classes/domainevent.adoc    |   0
 .../cms/pages/classes/domainevent/AbstractDomainEvent.adoc  |   0
 .../cms/pages/classes/domainevent/ActionDomainEvent.adoc    |   0
 .../pages/classes/domainevent/CollectionDomainEvent.adoc    |   0
 .../cms/pages/classes/domainevent/PropertyDomainEvent.adoc  |   0
 .../modules/cms/pages/classes/domainevent}/_attributes.adoc |   0
 .../_adoc-rg}/modules/cms/pages/classes/i18n.adoc           |   0
 .../modules/cms/pages/classes/i18n/TranslatableString.adoc  |   0
 .../modules/cms/pages/classes/i18n}/_attributes.adoc        |   0
 .../_adoc-rg}/modules/cms/pages/classes/layout.adoc         |   0
 .../_adoc-rg}/modules/cms/pages/classes/lifecycleevent.adoc |   0
 .../classes/lifecycleevent/AbstractLifecycleEvent.adoc      |   0
 .../pages/classes/lifecycleevent/ObjectCreatedEvent.adoc    |   0
 .../cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc |   0
 .../pages/classes/lifecycleevent/ObjectPersistedEvent.adoc  |   0
 .../pages/classes/lifecycleevent/ObjectPersistingEvent.adoc |   0
 .../pages/classes/lifecycleevent/ObjectRemovingEvent.adoc   |   0
 .../pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc    |   0
 .../pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc   |   0
 .../cms/pages/classes/lifecycleevent}/_attributes.adoc      |   0
 .../_adoc-rg}/modules/cms/pages/classes/menubars.adoc       |   0
 .../_adoc-rg}/modules/cms/pages/classes/mixins.adoc         |   0
 .../_adoc-rg}/modules/cms/pages/classes/mixins/Dto.adoc     |   0
 .../_adoc-rg}/modules/cms/pages/classes/mixins/Object.adoc  |   0
 .../modules/cms/pages/classes/mixins/Persistable.adoc       |   0
 .../modules/cms/pages/classes/mixins}/_attributes.adoc      |   0
 .../_adoc-rg}/modules/cms/pages/classes/roles.adoc          |   0
 .../modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc     |   0
 .../modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc     |   0
 .../modules/cms/pages/classes/roles/Timestampable.adoc      |   0
 .../modules/cms/pages/classes/roles}/_attributes.adoc       |   0
 .../_adoc-rg}/modules/cms/pages/classes/spec.adoc           |   0
 .../_adoc-rg}/modules/cms/pages/classes/super.adoc          |   0
 .../modules/cms/pages/classes/super/AbstractService.adoc    |   0
 .../modules/cms/pages/classes/super/AbstractSubscriber.adoc |   0
 .../modules/cms/pages/classes/super/AbstractViewModel.adoc  |   0
 .../modules/cms/pages/classes/super/FixtureScript.adoc      |   0
 .../modules/cms/pages/classes/super/FixtureScripts.adoc     |   0
 .../modules/cms/pages/classes/super}/_attributes.adoc       |   0
 .../_adoc-rg}/modules/cms/pages/classes/uievent.adoc        |   0
 .../modules/cms/pages/classes/uievent/CssClassUiEvent.adoc  |   0
 .../modules/cms/pages/classes/uievent/IconUiEvent.adoc      |   0
 .../modules/cms/pages/classes/uievent/TitleUiEvent.adoc     |   0
 .../modules/cms/pages/classes/uievent}/_attributes.adoc     |   0
 .../_adoc-rg}/modules/cms/pages/classes/utility.adoc        |   0
 .../_adoc-rg}/modules/cms/pages/classes/utility/Enums.adoc  |   0
 .../modules/cms/pages/classes/utility/ObjectContracts.adoc  |   0
 .../modules/cms/pages/classes/utility/Reasons.adoc          |   0
 .../modules/cms/pages/classes/utility/TitleBuffer.adoc      |   0
 .../modules/cms/pages/classes/utility}/_attributes.adoc     |   0
 .../_adoc-rg}/modules/cms/pages/classes/value-types.adoc    |   0
 .../modules/cms/pages/classes/value-types/Blob.adoc         |   0
 .../modules/cms/pages/classes/value-types/Clob.adoc         |   0
 .../modules/cms/pages/classes/value-types/Color.adoc        |   0
 .../modules/cms/pages/classes/value-types/Markup.adoc       |   0
 .../modules/cms/pages/classes/value-types/Money.adoc        |   0
 .../modules/cms/pages/classes/value-types/Password.adoc     |   0
 .../modules/cms/pages/classes/value-types}/_attributes.adoc |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/methods.adoc     |   0
 .../_adoc-rg/modules/cms/pages/methods}/_attributes.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/methods/lifecycle.adoc      |   0
 .../modules/cms/pages/methods/lifecycle}/_attributes.adoc   |   0
 .../modules/cms/pages/methods/lifecycle/created.adoc        |   0
 .../modules/cms/pages/methods/lifecycle/jdo-api.adoc        |   0
 .../modules/cms/pages/methods/lifecycle/loaded.adoc         |   0
 .../modules/cms/pages/methods/lifecycle/persisted.adoc      |   0
 .../modules/cms/pages/methods/lifecycle/persisting.adoc     |   0
 .../modules/cms/pages/methods/lifecycle/removed.adoc        |   0
 .../modules/cms/pages/methods/lifecycle/removing.adoc       |   0
 .../modules/cms/pages/methods/lifecycle/updated.adoc        |   0
 .../modules/cms/pages/methods/lifecycle/updating.adoc       |   0
 .../_adoc-rg}/modules/cms/pages/methods/prefixes.adoc       |   0
 .../modules/cms/pages/methods/prefixes}/_attributes.adoc    |   0
 .../_adoc-rg}/modules/cms/pages/methods/prefixes/addTo.adoc |   0
 .../modules/cms/pages/methods/prefixes/autoComplete.adoc    |   0
 .../modules/cms/pages/methods/prefixes/choices.adoc         |   0
 .../_adoc-rg}/modules/cms/pages/methods/prefixes/clear.adoc |   0
 .../modules/cms/pages/methods/prefixes/default.adoc         |   0
 .../modules/cms/pages/methods/prefixes/disable.adoc         |   0
 .../_adoc-rg}/modules/cms/pages/methods/prefixes/get.adoc   |   0
 .../_adoc-rg}/modules/cms/pages/methods/prefixes/hide.adoc  |   0
 .../modules/cms/pages/methods/prefixes/modify.adoc          |   0
 .../modules/cms/pages/methods/prefixes/removeFrom.adoc      |   0
 .../_adoc-rg}/modules/cms/pages/methods/prefixes/set.adoc   |   0
 .../modules/cms/pages/methods/prefixes/validate.adoc        |   0
 .../modules/cms/pages/methods/prefixes/validateAddTo.adoc   |   0
 .../cms/pages/methods/prefixes/validateRemoveFrom.adoc      |   0
 .../_adoc-rg}/modules/cms/pages/methods/reserved.adoc       |   0
 .../modules/cms/pages/methods/reserved}/_attributes.adoc    |   0
 .../modules/cms/pages/methods/reserved/cssClass.adoc        |   0
 .../modules/cms/pages/methods/reserved/disable.adoc         |   0
 .../_adoc-rg}/modules/cms/pages/methods/reserved/getId.adoc |   0
 .../_adoc-rg}/modules/cms/pages/methods/reserved/hide.adoc  |   0
 .../modules/cms/pages/methods/reserved/iconName.adoc        |   0
 .../modules/cms/pages/methods/reserved/layout.adoc          |   0
 .../_adoc-rg}/modules/cms/pages/methods/reserved/title.adoc |   0
 .../modules/cms/pages/methods/reserved/validate.adoc        |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/rgcms.adoc       |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/schema.adoc      |   0
 .../_adoc-rg/modules/cms/pages/schema}/_attributes.adoc     |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/schema/aim.adoc  |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/schema/chg.adoc  |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/schema/cmd.adoc  |   0
 .../_adoc-rg}/modules/cms/pages/schema/common.adoc          |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/schema/ixn.adoc  |   0
 .../rg => core/_adoc-rg}/modules/cms/pages/schema/mml.adoc  |   0
 .../cms => core/_adoc-rg/modules/fis}/_attributes.adoc      |   0
 .../_adoc-rg/modules/fis/assets/attachments}/.gitkeep       |   0
 .../assets/images/ContentNegotiationService/accept-json.png | Bin
 .../assets/images/ContentNegotiationService/accept-xml.png  | Bin
 .../images/ContentNegotiationService/facade-choices.png     | Bin
 .../images/ContentNegotiationService/facade-choices.pptx    | Bin
 .../images/RepresentationService/service-collaborations.png | Bin
 .../RepresentationService/service-collaborations.pptx       | Bin
 .../images => core/_adoc-rg/modules/fis/examples}/.gitkeep  |   0
 .../components/rg => core/_adoc-rg}/modules/fis/nav.adoc    |   0
 .../_adoc-rg/modules/fis}/pages/_attributes.adoc            |   0
 .../_adoc-rg/modules/fis/pages/_partials}/_attributes.adoc  |   0
 .../rg => core/_adoc-rg}/modules/fis/pages/about.adoc       |   0
 .../_adoc-rg}/modules/fis/pages/application-layer.adoc      |   0
 .../application-layer/AuthenticationSessionProvider.adoc    |   0
 .../pages/application-layer/CommandDtoServiceInternal.adoc  |   0
 .../application-layer/InteractionDtoServiceInternal.adoc    |   0
 .../modules/fis/pages/application-layer}/_attributes.adoc   |   0
 .../_adoc-rg}/modules/fis/pages/persistence-layer.adoc      |   0
 .../pages/persistence-layer/AuditingServiceInternal.adoc    |   0
 .../persistence-layer/ChangedObjectsServiceInternal.adoc    |   0
 .../PersistenceSessionServiceInternal.adoc                  |   0
 .../pages/persistence-layer/PublishingServiceInternal.adoc  |   0
 .../modules/fis/pages/persistence-layer}/_attributes.adoc   |   0
 .../_adoc-rg}/modules/fis/pages/presentation-layer.adoc     |   0
 .../pages/presentation-layer/ContentNegotiationService.adoc |   0
 .../fis/pages/presentation-layer/RepresentationService.adoc |   0
 .../modules/fis/pages/presentation-layer}/_attributes.adoc  |   0
 .../cfg => core/_adoc-rg/modules/mvn}/_attributes.adoc      |   0
 .../_adoc-rg/modules/mvn}/assets/attachments/.gitkeep       |   0
 .../modules/mvn/assets/images/maven-plugin/xsd-goal.png     | Bin
 .../modules/mvn/assets/images/maven-plugin/xsd-goal.pptx    | Bin
 .../ant => core/_adoc-rg/modules/mvn}/examples/.gitkeep     |   0
 .../components/rg => core/_adoc-rg}/modules/mvn/nav.adoc    |   0
 .../_adoc-rg/modules/mvn}/pages/_attributes.adoc            |   0
 .../_adoc-rg/modules/mvn/pages/_partials}/_attributes.adoc  |   0
 .../rg => core/_adoc-rg}/modules/mvn/pages/about.adoc       |   0
 .../rg => core/_adoc-rg}/modules/mvn/pages/intro.adoc       |   0
 .../rg => core/_adoc-rg}/modules/mvn/pages/swagger.adoc     |   0
 .../rg => core/_adoc-rg}/modules/mvn/pages/validate.adoc    |   0
 .../rg => core/_adoc-rg}/modules/mvn/pages/xsd.adoc         |   0
 .../ant => core/_adoc-rg/modules/svc}/_attributes.adoc      |   0
 .../_adoc-rg/modules/svc/assets/attachments}/.gitkeep       |   0
 .../images/reference-services-api/acceptheaderservice.png   | Bin
 .../images/reference-services-api/acceptheaderservice.pptx  | Bin
 .../ErrorReportingService/kitchensink-example.png           | Bin
 .../action-invocation-published-to-stderr.png               | Bin
 .../EventSerializer/changed-object-published-to-stderr.png  | Bin
 .../PublishingService/yuml.me-23db58a4.png                  | Bin
 .../reference-services-spi/UserProfileService/todoapp.png   | Bin
 .../svc/assets/images/reference-services/categories.png     | Bin
 .../svc/assets/images/reference-services/categories.pptx    | Bin
 .../images/reference-services/commands-and-events.png       | Bin
 .../images/reference-services/commands-and-events.pptx      | Bin
 .../_adoc-rg/modules/svc/examples}/.gitkeep                 |   0
 .../components/rg => core/_adoc-rg}/modules/svc/nav.adoc    |   0
 .../_adoc-rg/modules/svc}/pages/_attributes.adoc            |   0
 .../_adoc-rg/modules/svc/pages/_partials}/_attributes.adoc  |   0
 .../rg => core/_adoc-rg}/modules/svc/pages/about.adoc       |   0
 .../_adoc-rg}/modules/svc/pages/application-layer-api.adoc  |   0
 .../application-layer-api/ActionInvocationContext.adoc      |   0
 .../svc/pages/application-layer-api/BackgroundService.adoc  |   0
 .../BackgroundService/BackgroundCommandExecution.adoc       |   0
 .../application-layer-api/BackgroundService/Quartz.adoc     |   0
 .../BackgroundService}/_attributes.adoc                     |   0
 .../svc/pages/application-layer-api/CommandContext.adoc     |   0
 .../pages/application-layer-api/CommandExecutorService.adoc |   0
 .../svc/pages/application-layer-api/DtoMappingHelper.adoc   |   0
 .../svc/pages/application-layer-api/InteractionContext.adoc |   0
 .../svc/pages/application-layer-api/MessageService.adoc     |   0
 .../application-layer-api/SessionManagementService.adoc     |   0
 .../svc/pages/application-layer-api/TitleService.adoc       |   0
 .../svc/pages/application-layer-api/TransactionService.adoc |   0
 .../svc/pages/application-layer-api/WrapperFactory.adoc     |   0
 .../svc/pages/application-layer-api}/_attributes.adoc       |   0
 .../_adoc-rg}/modules/svc/pages/application-layer-spi.adoc  |   0
 .../application-layer-spi/BackgroundCommandService.adoc     |   0
 .../svc/pages/application-layer-spi/CommandService.adoc     |   0
 .../svc/pages/application-layer-spi/HealthCheckService.adoc |   0
 .../application-layer-spi/HomePageProviderService.adoc      |   0
 .../svc/pages/application-layer-spi}/_attributes.adoc       |   0
 .../_adoc-rg}/modules/svc/pages/bootstrapping-spi.adoc      |   0
 .../svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc  |   0
 .../modules/svc/pages/bootstrapping-spi}/_attributes.adoc   |   0
 .../_adoc-rg}/modules/svc/pages/core-domain-api.adoc        |   0
 .../modules/svc/pages/core-domain-api/ClockService.adoc     |   0
 .../svc/pages/core-domain-api/ConfigurationService.adoc     |   0
 .../modules/svc/pages/core-domain-api/EventBusService.adoc  |   0
 .../modules/svc/pages/core-domain-api/FactoryService.adoc   |   0
 .../modules/svc/pages/core-domain-api/Scratchpad.adoc       |   0
 .../modules/svc/pages/core-domain-api/UserService.adoc      |   0
 .../modules/svc/pages/core-domain-api}/_attributes.adoc     |   0
 .../_adoc-rg}/modules/svc/pages/integration-api.adoc        |   0
 .../modules/svc/pages/integration-api/BookmarkService.adoc  |   0
 .../modules/svc/pages/integration-api/EmailService.adoc     |   0
 .../modules/svc/pages/integration-api/JaxbService.adoc      |   0
 .../modules/svc/pages/integration-api/MementoService.adoc   |   0
 .../svc/pages/integration-api/XmlSnapshotService.adoc       |   0
 .../modules/svc/pages/integration-api}/_attributes.adoc     |   0
 .../rg => core/_adoc-rg}/modules/svc/pages/intro.adoc       |   0
 .../_adoc-rg}/modules/svc/pages/metadata-api.adoc           |   0
 .../pages/metadata-api/ApplicationFeatureRepository.adoc    |   0
 .../modules/svc/pages/metadata-api/LayoutService.adoc       |   0
 .../modules/svc/pages/metadata-api/MetamodelService.adoc    |   0
 .../modules/svc/pages/metadata-api/ServiceRegistry.adoc     |   0
 .../modules/svc/pages/metadata-api/SwaggerService.adoc      |   0
 .../modules/svc/pages/metadata-api}/_attributes.adoc        |   0
 .../_adoc-rg}/modules/svc/pages/persistence-layer-api.adoc  |   0
 .../svc/pages/persistence-layer-api/H2ManagerMenu.adoc      |   0
 .../svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc  |   0
 .../svc/pages/persistence-layer-api/IsisJdoSupport.adoc     |   0
 .../svc/pages/persistence-layer-api/MetricsService.adoc     |   0
 .../svc/pages/persistence-layer-api/QueryResultsCache.adoc  |   0
 .../svc/pages/persistence-layer-api/RepositoryService.adoc  |   0
 .../svc/pages/persistence-layer-api}/_attributes.adoc       |   0
 .../_adoc-rg}/modules/svc/pages/persistence-layer-spi.adoc  |   0
 .../svc/pages/persistence-layer-spi/AuditerService.adoc     |   0
 .../svc/pages/persistence-layer-spi/PublisherService.adoc   |   0
 .../persistence-layer-spi/UserRegistrationService.adoc      |   0
 .../svc/pages/persistence-layer-spi}/_attributes.adoc       |   0
 .../_adoc-rg}/modules/svc/pages/presentation-layer-api.adoc |   0
 .../pages/presentation-layer-api/AcceptHeaderService.adoc   |   0
 .../svc/pages/presentation-layer-api/BookmarkUiService.adoc |   0
 .../presentation-layer-api/ConfigurationViewService.adoc    |   0
 .../svc/pages/presentation-layer-api/DeepLinkService.adoc   |   0
 .../svc/pages/presentation-layer-api/GuiceBeanProvider.adoc |   0
 .../svc/pages/presentation-layer-api}/_attributes.adoc      |   0
 .../_adoc-rg}/modules/svc/pages/presentation-layer-spi.adoc |   0
 .../pages/presentation-layer-spi/ContentMappingService.adoc |   0
 .../presentation-layer-spi/EmailNotificationService.adoc    |   0
 .../pages/presentation-layer-spi/ErrorReportingService.adoc |   0
 .../pages/presentation-layer-spi/ExceptionRecognizer.adoc   |   0
 .../svc/pages/presentation-layer-spi/GridLoaderService.adoc |   0
 .../svc/pages/presentation-layer-spi/GridService.adoc       |   0
 .../svc/pages/presentation-layer-spi/GridSystemService.adoc |   0
 .../modules/svc/pages/presentation-layer-spi/HintStore.adoc |   0
 .../svc/pages/presentation-layer-spi/LocaleProvider.adoc    |   0
 .../pages/presentation-layer-spi/MenuBarsLoaderService.adoc |   0
 .../svc/pages/presentation-layer-spi/MenuBarsService.adoc   |   0
 .../svc/pages/presentation-layer-spi/RoutingService.adoc    |   0
 .../pages/presentation-layer-spi/SessionLoggingService.adoc |   0
 .../presentation-layer-spi/TableColumnOrderService.adoc     |   0
 .../pages/presentation-layer-spi/TranslationService.adoc    |   0
 .../pages/presentation-layer-spi/TranslationsResolver.adoc  |   0
 .../pages/presentation-layer-spi/UrlEncodingService.adoc    |   0
 .../pages/presentation-layer-spi/UserProfileService.adoc    |   0
 .../svc/pages/presentation-layer-spi}/_attributes.adoc      |   0
 .../rg => core/_adoc-rg}/modules/svc/pages/testing.adoc     |   0
 .../svc/pages/testing/ExecutionParametersService.adoc       |   0
 .../_adoc-rg}/modules/svc/pages/testing/FixtureScripts.adoc |   0
 .../pages/testing/FixtureScriptsSpecificationProvider.adoc  |   0
 .../_adoc-rg}/modules/svc/pages/testing/SudoService.adoc    |   0
 .../modules/svc/pages/testing/SwitchUserService.adoc        |   0
 .../_adoc-rg/modules/svc/pages/testing}/_attributes.adoc    |   0
 {antora/components/rg => core/_adoc-rg}/sync_examples.sh    |   0
 site.yml                                                    |   2 +-
 504 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/antora/components/rg/antora.yml b/core/_adoc-rg/antora.yml
similarity index 100%
rename from antora/components/rg/antora.yml
rename to core/_adoc-rg/antora.yml
diff --git a/antora/components/rg/examples.csv b/core/_adoc-rg/examples.csv
similarity index 100%
rename from antora/components/rg/examples.csv
rename to core/_adoc-rg/examples.csv
diff --git a/antora/components/rg/modules/ROOT/_attributes.adoc b/core/_adoc-rg/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ROOT/_attributes.adoc
rename to core/_adoc-rg/modules/ROOT/_attributes.adoc
diff --git a/antora/components/rg/modules/ROOT/nav.adoc b/core/_adoc-rg/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/rg/modules/ROOT/nav.adoc
rename to core/_adoc-rg/modules/ROOT/nav.adoc
diff --git a/antora/components/rg/modules/svc/pages/_attributes.adoc b/core/_adoc-rg/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/_attributes.adoc
rename to core/_adoc-rg/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/testing/_attributes.adoc b/core/_adoc-rg/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/testing/_attributes.adoc
rename to core/_adoc-rg/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/rg/modules/ROOT/pages/about.adoc b/core/_adoc-rg/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/rg/modules/ROOT/pages/about.adoc
rename to core/_adoc-rg/modules/ROOT/pages/about.adoc
diff --git a/antora/components/rg/modules/svc/_attributes.adoc b/core/_adoc-rg/modules/ant/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/_attributes.adoc
rename to core/_adoc-rg/modules/ant/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/examples/.gitkeep b/core/_adoc-rg/modules/ant/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/svc/examples/.gitkeep
rename to core/_adoc-rg/modules/ant/assets/attachments/.gitkeep
diff --git a/antora/components/rg/modules/svc/assets/attachments/.gitkeep b/core/_adoc-rg/modules/ant/assets/images/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/svc/assets/attachments/.gitkeep
rename to core/_adoc-rg/modules/ant/assets/images/.gitkeep
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
diff --git a/antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png b/core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
rename to core/_adoc-rg/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
diff --git a/antora/components/rg/modules/mvn/examples/.gitkeep b/core/_adoc-rg/modules/ant/examples/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/mvn/examples/.gitkeep
rename to core/_adoc-rg/modules/ant/examples/.gitkeep
diff --git a/antora/components/rg/modules/ant/nav.adoc b/core/_adoc-rg/modules/ant/nav.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/nav.adoc
rename to core/_adoc-rg/modules/ant/nav.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action.adoc b/core/_adoc-rg/modules/ant/pages/Action.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action.adoc
rename to core/_adoc-rg/modules/ant/pages/Action.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/Action/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/associateWith.adoc b/core/_adoc-rg/modules/ant/pages/Action/associateWith.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/associateWith.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/associateWith.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/command.adoc b/core/_adoc-rg/modules/ant/pages/Action/command.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/command.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/command.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/domainEvent.adoc b/core/_adoc-rg/modules/ant/pages/Action/domainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/domainEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/domainEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/hidden.adoc b/core/_adoc-rg/modules/ant/pages/Action/hidden.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/hidden.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/hidden.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/invokeOn.adoc b/core/_adoc-rg/modules/ant/pages/Action/invokeOn.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/invokeOn.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/invokeOn.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/publishing.adoc b/core/_adoc-rg/modules/ant/pages/Action/publishing.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/publishing.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/publishing.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/restrictTo.adoc b/core/_adoc-rg/modules/ant/pages/Action/restrictTo.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/restrictTo.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/restrictTo.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/semantics.adoc b/core/_adoc-rg/modules/ant/pages/Action/semantics.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/semantics.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/semantics.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/typeOf.adoc b/core/_adoc-rg/modules/ant/pages/Action/typeOf.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/typeOf.adoc
rename to core/_adoc-rg/modules/ant/pages/Action/typeOf.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-api/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/bookmarking.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/bookmarking.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/bookmarking.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/bookmarking.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/contributedAs.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/contributedAs.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/contributedAs.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/contributedAs.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/cssClass.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/cssClass.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/cssClass.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/cssClassFa.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/cssClassFa.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/describedAs.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/describedAs.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/describedAs.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/describedAs.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/hidden.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/hidden.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/hidden.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/hidden.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/named.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/named.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/named.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/named.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/position.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/position.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/position.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/position.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/promptStyle.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/promptStyle.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/promptStyle.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/promptStyle.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/redirect.adoc b/core/_adoc-rg/modules/ant/pages/ActionLayout/redirect.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/redirect.adoc
rename to core/_adoc-rg/modules/ant/pages/ActionLayout/redirect.adoc
diff --git a/antora/components/rg/modules/ant/pages/Collection.adoc b/core/_adoc-rg/modules/ant/pages/Collection.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Collection.adoc
rename to core/_adoc-rg/modules/ant/pages/Collection.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-spi/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/Collection/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-spi/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/Collection/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/Collection/domainEvent.adoc b/core/_adoc-rg/modules/ant/pages/Collection/domainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Collection/domainEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/Collection/domainEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/Collection/editing.adoc b/core/_adoc-rg/modules/ant/pages/Collection/editing.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Collection/editing.adoc
rename to core/_adoc-rg/modules/ant/pages/Collection/editing.adoc
diff --git a/antora/components/rg/modules/ant/pages/Collection/hidden.adoc b/core/_adoc-rg/modules/ant/pages/Collection/hidden.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Collection/hidden.adoc
rename to core/_adoc-rg/modules/ant/pages/Collection/hidden.adoc
diff --git a/antora/components/rg/modules/ant/pages/Collection/notPersisted.adoc b/core/_adoc-rg/modules/ant/pages/Collection/notPersisted.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Collection/notPersisted.adoc
rename to core/_adoc-rg/modules/ant/pages/Collection/notPersisted.adoc
diff --git a/antora/components/rg/modules/ant/pages/Collection/typeOf.adoc b/core/_adoc-rg/modules/ant/pages/Collection/typeOf.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Collection/typeOf.adoc
rename to core/_adoc-rg/modules/ant/pages/Collection/typeOf.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/cssClass.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/cssClass.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/cssClass.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/defaultView.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/defaultView.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/defaultView.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/defaultView.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/describedAs.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/describedAs.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/describedAs.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/describedAs.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/hidden.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/hidden.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/hidden.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/hidden.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/named.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/named.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/named.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/named.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/paged.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/paged.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/paged.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/paged.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/sortedBy.adoc b/core/_adoc-rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
rename to core/_adoc-rg/modules/ant/pages/CollectionLayout/sortedBy.adoc
diff --git a/antora/components/rg/modules/ant/pages/Column.adoc b/core/_adoc-rg/modules/ant/pages/Column.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Column.adoc
rename to core/_adoc-rg/modules/ant/pages/Column.adoc
diff --git a/antora/components/rg/modules/ant/pages/Digits.adoc b/core/_adoc-rg/modules/ant/pages/Digits.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Digits.adoc
rename to core/_adoc-rg/modules/ant/pages/Digits.adoc
diff --git a/antora/components/rg/modules/ant/pages/Discriminator.adoc b/core/_adoc-rg/modules/ant/pages/Discriminator.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Discriminator.adoc
rename to core/_adoc-rg/modules/ant/pages/Discriminator.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject.adoc
diff --git a/antora/components/rg/modules/svc/pages/metadata-api/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/metadata-api/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/actionDomainEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/actionDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/actionDomainEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/actionDomainEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/auditing.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/auditing.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/auditing.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/auditing.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/autoCompleteRepository.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/autoCompleteRepository.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/autoCompleteRepository.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/autoCompleteRepository.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/bounding.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/bounding.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/bounding.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/bounding.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/collectionDomainEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/collectionDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/collectionDomainEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/collectionDomainEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/createdLifecycleEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/createdLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/createdLifecycleEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/createdLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/editing.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/editing.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/editing.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/editing.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/loadedLifecycleEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/loadedLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/loadedLifecycleEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/loadedLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/mixinMethod.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/mixinMethod.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/mixinMethod.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/mixinMethod.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/nature.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/nature.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/nature.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/nature.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/objectType.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/objectType.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/objectType.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/objectType.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/persistedLifecycleEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/persistedLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/persistedLifecycleEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/persistedLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/persistingLifecycleEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/persistingLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/persistingLifecycleEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/persistingLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/propertyDomainEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/propertyDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/propertyDomainEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/propertyDomainEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/publishing.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/publishing.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/publishing.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/publishing.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/removingLifecycleEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/removingLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/removingLifecycleEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/removingLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/updatedLifecycleEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/updatedLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/updatedLifecycleEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/updatedLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/updatingLifecycleEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObject/updatingLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/updatingLifecycleEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObject/updatingLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout.adoc
diff --git a/antora/components/rg/modules/svc/pages/integration-api/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/integration-api/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/bookmarking.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/cssClass.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/cssClass.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/cssClass.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/cssClassFa.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/cssClassFa.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/cssClassFa.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/cssClassFa.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/cssClassUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/describedAs.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/iconUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/iconUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/iconUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/iconUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/layoutUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/layoutUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/layoutUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/layoutUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/named.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/named.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/named.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/named.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/paged.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/paged.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/paged.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/paged.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/plural.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/plural.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/plural.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/plural.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/titleUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/DomainObjectLayout/titleUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/titleUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainObjectLayout/titleUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainService.adoc b/core/_adoc-rg/modules/ant/pages/DomainService.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainService.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainService.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/DomainService/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainService/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainService/nature.adoc b/core/_adoc-rg/modules/ant/pages/DomainService/nature.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainService/nature.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainService/nature.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainService/objectType.adoc b/core/_adoc-rg/modules/ant/pages/DomainService/objectType.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainService/objectType.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainService/objectType.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainService/repositoryFor.adoc b/core/_adoc-rg/modules/ant/pages/DomainService/repositoryFor.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainService/repositoryFor.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainService/repositoryFor.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout.adoc b/core/_adoc-rg/modules/ant/pages/DomainServiceLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainServiceLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainServiceLayout.adoc
diff --git a/antora/components/rg/modules/svc/pages/bootstrapping-spi/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/DomainServiceLayout/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/bootstrapping-spi/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainServiceLayout/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc b/core/_adoc-rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainServiceLayout/menuBar.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc b/core/_adoc-rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainServiceLayout/menuOrder.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout/named.adoc b/core/_adoc-rg/modules/ant/pages/DomainServiceLayout/named.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainServiceLayout/named.adoc
rename to core/_adoc-rg/modules/ant/pages/DomainServiceLayout/named.adoc
diff --git a/antora/components/rg/modules/ant/pages/Facets.adoc b/core/_adoc-rg/modules/ant/pages/Facets.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Facets.adoc
rename to core/_adoc-rg/modules/ant/pages/Facets.adoc
diff --git a/antora/components/rg/modules/ant/pages/HomePage.adoc b/core/_adoc-rg/modules/ant/pages/HomePage.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/HomePage.adoc
rename to core/_adoc-rg/modules/ant/pages/HomePage.adoc
diff --git a/antora/components/rg/modules/ant/pages/Inject.adoc b/core/_adoc-rg/modules/ant/pages/Inject.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Inject.adoc
rename to core/_adoc-rg/modules/ant/pages/Inject.adoc
diff --git a/antora/components/rg/modules/ant/pages/MemberGroupLayout.adoc b/core/_adoc-rg/modules/ant/pages/MemberGroupLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/MemberGroupLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/MemberGroupLayout.adoc
diff --git a/antora/components/rg/modules/ant/pages/MemberOrder.adoc b/core/_adoc-rg/modules/ant/pages/MemberOrder.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/MemberOrder.adoc
rename to core/_adoc-rg/modules/ant/pages/MemberOrder.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-spi/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/MemberOrder/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-spi/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/MemberOrder/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/MemberOrder/name.adoc b/core/_adoc-rg/modules/ant/pages/MemberOrder/name.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/MemberOrder/name.adoc
rename to core/_adoc-rg/modules/ant/pages/MemberOrder/name.adoc
diff --git a/antora/components/rg/modules/ant/pages/MemberOrder/sequence.adoc b/core/_adoc-rg/modules/ant/pages/MemberOrder/sequence.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/MemberOrder/sequence.adoc
rename to core/_adoc-rg/modules/ant/pages/MemberOrder/sequence.adoc
diff --git a/antora/components/rg/modules/ant/pages/MinLength.adoc b/core/_adoc-rg/modules/ant/pages/MinLength.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/MinLength.adoc
rename to core/_adoc-rg/modules/ant/pages/MinLength.adoc
diff --git a/antora/components/rg/modules/ant/pages/Mixin.adoc b/core/_adoc-rg/modules/ant/pages/Mixin.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Mixin.adoc
rename to core/_adoc-rg/modules/ant/pages/Mixin.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/Mixin/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/Mixin/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/Mixin/method.adoc b/core/_adoc-rg/modules/ant/pages/Mixin/method.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Mixin/method.adoc
rename to core/_adoc-rg/modules/ant/pages/Mixin/method.adoc
diff --git a/antora/components/rg/modules/ant/pages/NotPersistent.adoc b/core/_adoc-rg/modules/ant/pages/NotPersistent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/NotPersistent.adoc
rename to core/_adoc-rg/modules/ant/pages/NotPersistent.adoc
diff --git a/antora/components/rg/modules/ant/pages/Nullable.adoc b/core/_adoc-rg/modules/ant/pages/Nullable.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Nullable.adoc
rename to core/_adoc-rg/modules/ant/pages/Nullable.adoc
diff --git a/antora/components/rg/modules/ant/pages/Parameter.adoc b/core/_adoc-rg/modules/ant/pages/Parameter.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Parameter.adoc
rename to core/_adoc-rg/modules/ant/pages/Parameter.adoc
diff --git a/antora/components/rg/modules/svc/pages/_partials/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/Parameter/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/_partials/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/Parameter/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/Parameter/fileAccept.adoc b/core/_adoc-rg/modules/ant/pages/Parameter/fileAccept.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Parameter/fileAccept.adoc
rename to core/_adoc-rg/modules/ant/pages/Parameter/fileAccept.adoc
diff --git a/antora/components/rg/modules/ant/pages/Parameter/maxLength.adoc b/core/_adoc-rg/modules/ant/pages/Parameter/maxLength.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Parameter/maxLength.adoc
rename to core/_adoc-rg/modules/ant/pages/Parameter/maxLength.adoc
diff --git a/antora/components/rg/modules/ant/pages/Parameter/mustSatisfy.adoc b/core/_adoc-rg/modules/ant/pages/Parameter/mustSatisfy.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Parameter/mustSatisfy.adoc
rename to core/_adoc-rg/modules/ant/pages/Parameter/mustSatisfy.adoc
diff --git a/antora/components/rg/modules/ant/pages/Parameter/optionality.adoc b/core/_adoc-rg/modules/ant/pages/Parameter/optionality.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Parameter/optionality.adoc
rename to core/_adoc-rg/modules/ant/pages/Parameter/optionality.adoc
diff --git a/antora/components/rg/modules/ant/pages/Parameter/regexPattern.adoc b/core/_adoc-rg/modules/ant/pages/Parameter/regexPattern.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Parameter/regexPattern.adoc
rename to core/_adoc-rg/modules/ant/pages/Parameter/regexPattern.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout.adoc
diff --git a/antora/components/rg/modules/mvn/pages/_partials/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/pages/_partials/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/cssClass.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/cssClass.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/cssClass.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/describedAs.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/describedAs.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/describedAs.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/describedAs.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/labelPosition.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/labelPosition.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/multiLine.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/multiLine.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/multiLine.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/multiLine.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/named.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/named.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/named.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/named.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/renderedAsDayBefore.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/renderedAsDayBefore.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/renderedAsDayBefore.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/renderedAsDayBefore.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/typicalLength.adoc b/core/_adoc-rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
rename to core/_adoc-rg/modules/ant/pages/ParameterLayout/typicalLength.adoc
diff --git a/antora/components/rg/modules/ant/pages/Pattern.adoc b/core/_adoc-rg/modules/ant/pages/Pattern.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Pattern.adoc
rename to core/_adoc-rg/modules/ant/pages/Pattern.adoc
diff --git a/antora/components/rg/modules/ant/pages/PersistenceCapable.adoc b/core/_adoc-rg/modules/ant/pages/PersistenceCapable.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PersistenceCapable.adoc
rename to core/_adoc-rg/modules/ant/pages/PersistenceCapable.adoc
diff --git a/antora/components/rg/modules/ant/pages/PostConstruct.adoc b/core/_adoc-rg/modules/ant/pages/PostConstruct.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PostConstruct.adoc
rename to core/_adoc-rg/modules/ant/pages/PostConstruct.adoc
diff --git a/antora/components/rg/modules/ant/pages/PreDestroy.adoc b/core/_adoc-rg/modules/ant/pages/PreDestroy.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PreDestroy.adoc
rename to core/_adoc-rg/modules/ant/pages/PreDestroy.adoc
diff --git a/antora/components/rg/modules/ant/pages/PrimaryKey.adoc b/core/_adoc-rg/modules/ant/pages/PrimaryKey.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PrimaryKey.adoc
rename to core/_adoc-rg/modules/ant/pages/PrimaryKey.adoc
diff --git a/antora/components/rg/modules/ant/pages/Programmatic.adoc b/core/_adoc-rg/modules/ant/pages/Programmatic.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Programmatic.adoc
rename to core/_adoc-rg/modules/ant/pages/Programmatic.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property.adoc b/core/_adoc-rg/modules/ant/pages/Property.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property.adoc
rename to core/_adoc-rg/modules/ant/pages/Property.adoc
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/Property/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/presentation-layer/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/command.adoc b/core/_adoc-rg/modules/ant/pages/Property/command.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/command.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/command.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/domainEvent.adoc b/core/_adoc-rg/modules/ant/pages/Property/domainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/domainEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/domainEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/editing.adoc b/core/_adoc-rg/modules/ant/pages/Property/editing.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/editing.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/editing.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/fileAccept.adoc b/core/_adoc-rg/modules/ant/pages/Property/fileAccept.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/fileAccept.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/fileAccept.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/hidden.adoc b/core/_adoc-rg/modules/ant/pages/Property/hidden.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/hidden.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/hidden.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/maxLength.adoc b/core/_adoc-rg/modules/ant/pages/Property/maxLength.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/maxLength.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/maxLength.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/mustSatisfy.adoc b/core/_adoc-rg/modules/ant/pages/Property/mustSatisfy.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/mustSatisfy.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/mustSatisfy.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/notPersisted.adoc b/core/_adoc-rg/modules/ant/pages/Property/notPersisted.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/notPersisted.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/notPersisted.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/optionality.adoc b/core/_adoc-rg/modules/ant/pages/Property/optionality.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/optionality.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/optionality.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/projecting.adoc b/core/_adoc-rg/modules/ant/pages/Property/projecting.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/projecting.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/projecting.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/publishing.adoc b/core/_adoc-rg/modules/ant/pages/Property/publishing.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/publishing.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/publishing.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/regexPattern.adoc b/core/_adoc-rg/modules/ant/pages/Property/regexPattern.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/regexPattern.adoc
rename to core/_adoc-rg/modules/ant/pages/Property/regexPattern.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout.adoc
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/persistence-layer/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/cssClass.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/cssClass.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/cssClass.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/describedAs.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/describedAs.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/describedAs.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/describedAs.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/hidden.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/hidden.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/hidden.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/hidden.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/labelPosition.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/labelPosition.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/multiLine.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/multiLine.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/multiLine.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/multiLine.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/named.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/named.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/named.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/named.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/navigable.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/navigable.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/navigable.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/navigable.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/promptStyle.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/promptStyle.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/renderedAsDayBefore.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/typicalLength.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/typicalLength.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/unchanging.adoc b/core/_adoc-rg/modules/ant/pages/PropertyLayout/unchanging.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/unchanging.adoc
rename to core/_adoc-rg/modules/ant/pages/PropertyLayout/unchanging.adoc
diff --git a/antora/components/rg/modules/ant/pages/RequestScoped.adoc b/core/_adoc-rg/modules/ant/pages/RequestScoped.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/RequestScoped.adoc
rename to core/_adoc-rg/modules/ant/pages/RequestScoped.adoc
diff --git a/antora/components/rg/modules/ant/pages/Title.adoc b/core/_adoc-rg/modules/ant/pages/Title.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Title.adoc
rename to core/_adoc-rg/modules/ant/pages/Title.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModel.adoc b/core/_adoc-rg/modules/ant/pages/ViewModel.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModel.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModel.adoc
diff --git a/antora/components/rg/modules/fis/pages/application-layer/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/ViewModel/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/application-layer/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModel/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModel/objectType.adoc b/core/_adoc-rg/modules/ant/pages/ViewModel/objectType.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModel/objectType.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModel/objectType.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout.adoc
diff --git a/antora/components/rg/modules/fis/pages/_partials/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/_partials/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/bookmarking.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/bookmarking.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/bookmarking.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/bookmarking.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/cssClass.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/cssClass.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/cssClass.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/cssClassFa.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/cssClassFa.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/cssClassFa.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/cssClassFa.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/cssClassUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/cssClassUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/cssClassUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/cssClassUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/describedAs.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/describedAs.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/iconUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/iconUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/iconUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/iconUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/layoutUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/layoutUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/layoutUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/layoutUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/named.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/named.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/named.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/named.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/paged.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/paged.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/paged.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/paged.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/plural.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/plural.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/plural.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/plural.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/titleUiEvent.adoc b/core/_adoc-rg/modules/ant/pages/ViewModelLayout/titleUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/titleUiEvent.adoc
rename to core/_adoc-rg/modules/ant/pages/ViewModelLayout/titleUiEvent.adoc
diff --git a/antora/components/rg/modules/ant/pages/XmlJavaTypeAdapter.adoc b/core/_adoc-rg/modules/ant/pages/XmlJavaTypeAdapter.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/XmlJavaTypeAdapter.adoc
rename to core/_adoc-rg/modules/ant/pages/XmlJavaTypeAdapter.adoc
diff --git a/antora/components/rg/modules/ant/pages/XmlRootElement.adoc b/core/_adoc-rg/modules/ant/pages/XmlRootElement.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/XmlRootElement.adoc
rename to core/_adoc-rg/modules/ant/pages/XmlRootElement.adoc
diff --git a/antora/components/rg/modules/mvn/pages/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/pages/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/_partials/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/aaa.adoc b/core/_adoc-rg/modules/ant/pages/aaa.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/aaa.adoc
rename to core/_adoc-rg/modules/ant/pages/aaa.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/_attributes.adoc b/core/_adoc-rg/modules/ant/pages/aaa/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/_attributes.adoc
rename to core/_adoc-rg/modules/ant/pages/aaa/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/aaa/jdo.adoc b/core/_adoc-rg/modules/ant/pages/aaa/jdo.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/aaa/jdo.adoc
rename to core/_adoc-rg/modules/ant/pages/aaa/jdo.adoc
diff --git a/antora/components/rg/modules/ant/pages/aaa/jee.adoc b/core/_adoc-rg/modules/ant/pages/aaa/jee.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/aaa/jee.adoc
rename to core/_adoc-rg/modules/ant/pages/aaa/jee.adoc
diff --git a/antora/components/rg/modules/ant/pages/aaa/main.adoc b/core/_adoc-rg/modules/ant/pages/aaa/main.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/aaa/main.adoc
rename to core/_adoc-rg/modules/ant/pages/aaa/main.adoc
diff --git a/antora/components/rg/modules/ant/pages/aaa/other.adoc b/core/_adoc-rg/modules/ant/pages/aaa/other.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/aaa/other.adoc
rename to core/_adoc-rg/modules/ant/pages/aaa/other.adoc
diff --git a/antora/components/rg/modules/ant/pages/aaa/partial.adoc b/core/_adoc-rg/modules/ant/pages/aaa/partial.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/aaa/partial.adoc
rename to core/_adoc-rg/modules/ant/pages/aaa/partial.adoc
diff --git a/antora/components/rg/modules/ant/pages/about.adoc b/core/_adoc-rg/modules/ant/pages/about.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/about.adoc
rename to core/_adoc-rg/modules/ant/pages/about.adoc
diff --git a/antora/components/rg/modules/mvn/_attributes.adoc b/core/_adoc-rg/modules/cfg/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/_attributes.adoc
rename to core/_adoc-rg/modules/cfg/_attributes.adoc
diff --git a/antora/components/rg/modules/mvn/assets/attachments/.gitkeep b/core/_adoc-rg/modules/cfg/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/mvn/assets/attachments/.gitkeep
rename to core/_adoc-rg/modules/cfg/assets/attachments/.gitkeep
diff --git a/antora/components/rg/modules/fis/examples/.gitkeep b/core/_adoc-rg/modules/cfg/assets/images/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/fis/examples/.gitkeep
rename to core/_adoc-rg/modules/cfg/assets/images/.gitkeep
diff --git a/antora/components/rg/modules/fis/assets/attachments/.gitkeep b/core/_adoc-rg/modules/cfg/examples/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/fis/assets/attachments/.gitkeep
rename to core/_adoc-rg/modules/cfg/examples/.gitkeep
diff --git a/antora/components/rg/modules/cfg/nav.adoc b/core/_adoc-rg/modules/cfg/nav.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/nav.adoc
rename to core/_adoc-rg/modules/cfg/nav.adoc
diff --git a/antora/components/rg/modules/fis/pages/_attributes.adoc b/core/_adoc-rg/modules/cfg/pages/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/_attributes.adoc
rename to core/_adoc-rg/modules/cfg/pages/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/_attributes.adoc b/core/_adoc-rg/modules/cfg/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/_attributes.adoc
rename to core/_adoc-rg/modules/cfg/pages/_partials/_attributes.adoc
diff --git a/antora/components/rg/modules/cfg/pages/about.adoc b/core/_adoc-rg/modules/cfg/pages/about.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/pages/about.adoc
rename to core/_adoc-rg/modules/cfg/pages/about.adoc
diff --git a/antora/components/rg/modules/cfg/pages/configuration-files.adoc b/core/_adoc-rg/modules/cfg/pages/configuration-files.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/pages/configuration-files.adoc
rename to core/_adoc-rg/modules/cfg/pages/configuration-files.adoc
diff --git a/antora/components/rg/modules/cfg/pages/configuring-core.adoc b/core/_adoc-rg/modules/cfg/pages/configuring-core.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/pages/configuring-core.adoc
rename to core/_adoc-rg/modules/cfg/pages/configuring-core.adoc
diff --git a/antora/components/rg/modules/cfg/pages/deployment-types.adoc b/core/_adoc-rg/modules/cfg/pages/deployment-types.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/pages/deployment-types.adoc
rename to core/_adoc-rg/modules/cfg/pages/deployment-types.adoc
diff --git a/antora/components/rg/modules/cfg/pages/specifying-components.adoc b/core/_adoc-rg/modules/cfg/pages/specifying-components.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/pages/specifying-components.adoc
rename to core/_adoc-rg/modules/cfg/pages/specifying-components.adoc
diff --git a/antora/components/rg/modules/fis/_attributes.adoc b/core/_adoc-rg/modules/cms/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/_attributes.adoc
rename to core/_adoc-rg/modules/cms/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/examples/.gitkeep b/core/_adoc-rg/modules/cms/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/cms/examples/.gitkeep
rename to core/_adoc-rg/modules/cms/assets/attachments/.gitkeep
diff --git a/antora/components/rg/modules/cms/assets/images/reference-classes/issue-in-more-detail.png b/core/_adoc-rg/modules/cms/assets/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from antora/components/rg/modules/cms/assets/images/reference-classes/issue-in-more-detail.png
rename to core/_adoc-rg/modules/cms/assets/images/reference-classes/issue-in-more-detail.png
diff --git a/antora/components/rg/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png b/core/_adoc-rg/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from antora/components/rg/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png
rename to core/_adoc-rg/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png
diff --git a/antora/components/rg/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png b/core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from antora/components/rg/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png
rename to core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/antora/components/rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn b/core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from antora/components/rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn
rename to core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/antora/components/rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png b/core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from antora/components/rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png
rename to core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png
diff --git a/antora/components/rg/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png b/core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from antora/components/rg/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png
rename to core/_adoc-rg/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png
diff --git a/antora/components/rg/modules/cms/assets/images/value-types/markup.png b/core/_adoc-rg/modules/cms/assets/images/value-types/markup.png
similarity index 100%
rename from antora/components/rg/modules/cms/assets/images/value-types/markup.png
rename to core/_adoc-rg/modules/cms/assets/images/value-types/markup.png
diff --git a/antora/components/rg/modules/cms/assets/attachments/.gitkeep b/core/_adoc-rg/modules/cms/examples/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/cms/assets/attachments/.gitkeep
rename to core/_adoc-rg/modules/cms/examples/.gitkeep
diff --git a/antora/components/rg/modules/cms/nav.adoc b/core/_adoc-rg/modules/cms/nav.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/nav.adoc
rename to core/_adoc-rg/modules/cms/nav.adoc
diff --git a/antora/components/rg/modules/cms/pages/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/_partials/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/about.adoc b/core/_adoc-rg/modules/cms/pages/about.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/about.adoc
rename to core/_adoc-rg/modules/cms/pages/about.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes.adoc b/core/_adoc-rg/modules/cms/pages/classes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc b/core/_adoc-rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc b/core/_adoc-rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
diff --git a/antora/components/rg/modules/cfg/pages/_partials/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/pages/_partials/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/contributee.adoc b/core/_adoc-rg/modules/cms/pages/classes/contributee.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/contributee.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/contributee.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/contributee/HasTransactionId.adoc b/core/_adoc-rg/modules/cms/pages/classes/contributee/HasTransactionId.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/contributee/HasTransactionId.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/contributee/HasTransactionId.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/contributee/HasUserName.adoc b/core/_adoc-rg/modules/cms/pages/classes/contributee/HasUserName.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/contributee/HasUserName.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/contributee/HasUserName.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/contributee/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/contributee/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/domainevent.adoc b/core/_adoc-rg/modules/cms/pages/classes/domainevent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/domainevent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/domainevent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/domainevent/AbstractDomainEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/domainevent/AbstractDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/domainevent/AbstractDomainEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/domainevent/AbstractDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/domainevent/ActionDomainEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/domainevent/ActionDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/domainevent/ActionDomainEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/domainevent/ActionDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/domainevent/CollectionDomainEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/domainevent/CollectionDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/domainevent/CollectionDomainEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/domainevent/CollectionDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/domainevent/PropertyDomainEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/domainevent/PropertyDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/domainevent/PropertyDomainEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/domainevent/PropertyDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/domainevent/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/domainevent/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/i18n.adoc b/core/_adoc-rg/modules/cms/pages/classes/i18n.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/i18n.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/i18n.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/i18n/TranslatableString.adoc b/core/_adoc-rg/modules/cms/pages/classes/i18n/TranslatableString.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/i18n/TranslatableString.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/i18n/TranslatableString.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/i18n/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/i18n/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/layout.adoc b/core/_adoc-rg/modules/cms/pages/classes/layout.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/layout.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/layout.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/lifecycleevent/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/menubars.adoc b/core/_adoc-rg/modules/cms/pages/classes/menubars.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/menubars.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/menubars.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/mixins.adoc b/core/_adoc-rg/modules/cms/pages/classes/mixins.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/mixins.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/mixins.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/mixins/Dto.adoc b/core/_adoc-rg/modules/cms/pages/classes/mixins/Dto.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/mixins/Dto.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/mixins/Dto.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc b/core/_adoc-rg/modules/cms/pages/classes/mixins/Object.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/mixins/Object.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/mixins/Persistable.adoc b/core/_adoc-rg/modules/cms/pages/classes/mixins/Persistable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/mixins/Persistable.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/mixins/Persistable.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/mixins/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/mixins/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/roles.adoc b/core/_adoc-rg/modules/cms/pages/classes/roles.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/roles.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/roles.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc b/core/_adoc-rg/modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc b/core/_adoc-rg/modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/roles/Timestampable.adoc b/core/_adoc-rg/modules/cms/pages/classes/roles/Timestampable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/roles/Timestampable.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/roles/Timestampable.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/utility/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/roles/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/utility/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/roles/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/spec.adoc b/core/_adoc-rg/modules/cms/pages/classes/spec.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/spec.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/spec.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/super.adoc b/core/_adoc-rg/modules/cms/pages/classes/super.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/super.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/super.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/super/AbstractService.adoc b/core/_adoc-rg/modules/cms/pages/classes/super/AbstractService.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/super/AbstractService.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/super/AbstractService.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/super/AbstractSubscriber.adoc b/core/_adoc-rg/modules/cms/pages/classes/super/AbstractSubscriber.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/super/AbstractSubscriber.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/super/AbstractSubscriber.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/super/AbstractViewModel.adoc b/core/_adoc-rg/modules/cms/pages/classes/super/AbstractViewModel.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/super/AbstractViewModel.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/super/AbstractViewModel.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc b/core/_adoc-rg/modules/cms/pages/classes/super/FixtureScript.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/super/FixtureScript.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc b/core/_adoc-rg/modules/cms/pages/classes/super/FixtureScripts.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/super/FixtureScripts.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/uievent/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/super/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/uievent/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/super/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/uievent.adoc b/core/_adoc-rg/modules/cms/pages/classes/uievent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/uievent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/uievent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/uievent/CssClassUiEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/uievent/CssClassUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/uievent/CssClassUiEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/uievent/CssClassUiEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/uievent/IconUiEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/uievent/IconUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/uievent/IconUiEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/uievent/IconUiEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/uievent/TitleUiEvent.adoc b/core/_adoc-rg/modules/cms/pages/classes/uievent/TitleUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/uievent/TitleUiEvent.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/uievent/TitleUiEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/super/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/uievent/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/super/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/uievent/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/utility.adoc b/core/_adoc-rg/modules/cms/pages/classes/utility.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/utility.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/utility.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/utility/Enums.adoc b/core/_adoc-rg/modules/cms/pages/classes/utility/Enums.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/utility/Enums.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/utility/Enums.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/utility/ObjectContracts.adoc b/core/_adoc-rg/modules/cms/pages/classes/utility/ObjectContracts.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/utility/ObjectContracts.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/utility/ObjectContracts.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/utility/Reasons.adoc b/core/_adoc-rg/modules/cms/pages/classes/utility/Reasons.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/utility/Reasons.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/utility/Reasons.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/utility/TitleBuffer.adoc b/core/_adoc-rg/modules/cms/pages/classes/utility/TitleBuffer.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/utility/TitleBuffer.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/utility/TitleBuffer.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/roles/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/utility/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/roles/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/utility/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types/Blob.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types/Blob.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types/Blob.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types/Blob.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types/Clob.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types/Clob.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types/Clob.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types/Clob.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types/Color.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types/Color.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types/Color.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types/Color.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types/Markup.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types/Markup.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types/Markup.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types/Markup.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types/Money.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types/Money.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types/Money.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types/Money.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/value-types/Password.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types/Password.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/value-types/Password.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types/Password.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/mixins/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/classes/value-types/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/mixins/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/classes/value-types/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods.adoc b/core/_adoc-rg/modules/cms/pages/methods.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods.adoc
rename to core/_adoc-rg/modules/cms/pages/methods.adoc
diff --git a/antora/components/rg/modules/ant/pages/aaa/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/methods/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/aaa/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/lifecycleevent/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/lifecycleevent/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/created.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/created.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/created.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/created.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/jdo-api.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/jdo-api.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/jdo-api.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/jdo-api.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/loaded.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/loaded.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/loaded.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/loaded.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/persisted.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/persisted.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/persisted.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/persisted.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/persisting.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/persisting.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/persisting.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/persisting.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/removed.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/removed.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/removed.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/removed.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/removing.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/removing.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/removing.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/removing.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/updated.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/updated.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/updated.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/updated.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/updating.adoc b/core/_adoc-rg/modules/cms/pages/methods/lifecycle/updating.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/lifecycle/updating.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/lifecycle/updating.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/i18n/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/i18n/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/addTo.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/addTo.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/autoComplete.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/autoComplete.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/autoComplete.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/autoComplete.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/choices.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/choices.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/choices.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/choices.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/clear.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/clear.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/clear.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/clear.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/default.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/default.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/default.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/default.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/disable.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/disable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/disable.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/disable.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/get.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/get.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/get.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/get.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/hide.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/hide.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/hide.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/hide.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/modify.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/modify.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/modify.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/modify.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/set.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/set.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/set.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/set.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/validate.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/validate.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/validate.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/validate.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc b/core/_adoc-rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/domainevent/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/domainevent/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/cssClass.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/disable.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/disable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/disable.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/disable.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/getId.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/getId.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/hide.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/hide.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/hide.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/hide.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/iconName.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/iconName.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/layout.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/layout.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/title.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/title.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/title.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/title.adoc
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/validate.adoc b/core/_adoc-rg/modules/cms/pages/methods/reserved/validate.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/methods/reserved/validate.adoc
rename to core/_adoc-rg/modules/cms/pages/methods/reserved/validate.adoc
diff --git a/antora/components/rg/modules/cms/pages/rgcms.adoc b/core/_adoc-rg/modules/cms/pages/rgcms.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/rgcms.adoc
rename to core/_adoc-rg/modules/cms/pages/rgcms.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema.adoc b/core/_adoc-rg/modules/cms/pages/schema.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema.adoc
rename to core/_adoc-rg/modules/cms/pages/schema.adoc
diff --git a/antora/components/rg/modules/ant/pages/_partials/_attributes.adoc b/core/_adoc-rg/modules/cms/pages/schema/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/_partials/_attributes.adoc
rename to core/_adoc-rg/modules/cms/pages/schema/_attributes.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema/aim.adoc b/core/_adoc-rg/modules/cms/pages/schema/aim.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema/aim.adoc
rename to core/_adoc-rg/modules/cms/pages/schema/aim.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema/chg.adoc b/core/_adoc-rg/modules/cms/pages/schema/chg.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema/chg.adoc
rename to core/_adoc-rg/modules/cms/pages/schema/chg.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema/cmd.adoc b/core/_adoc-rg/modules/cms/pages/schema/cmd.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema/cmd.adoc
rename to core/_adoc-rg/modules/cms/pages/schema/cmd.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema/common.adoc b/core/_adoc-rg/modules/cms/pages/schema/common.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema/common.adoc
rename to core/_adoc-rg/modules/cms/pages/schema/common.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema/ixn.adoc b/core/_adoc-rg/modules/cms/pages/schema/ixn.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema/ixn.adoc
rename to core/_adoc-rg/modules/cms/pages/schema/ixn.adoc
diff --git a/antora/components/rg/modules/cms/pages/schema/mml.adoc b/core/_adoc-rg/modules/cms/pages/schema/mml.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/schema/mml.adoc
rename to core/_adoc-rg/modules/cms/pages/schema/mml.adoc
diff --git a/antora/components/rg/modules/cms/_attributes.adoc b/core/_adoc-rg/modules/fis/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/_attributes.adoc
rename to core/_adoc-rg/modules/fis/_attributes.adoc
diff --git a/antora/components/rg/modules/cfg/examples/.gitkeep b/core/_adoc-rg/modules/fis/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/cfg/examples/.gitkeep
rename to core/_adoc-rg/modules/fis/assets/attachments/.gitkeep
diff --git a/antora/components/rg/modules/fis/assets/images/ContentNegotiationService/accept-json.png b/core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/accept-json.png
similarity index 100%
rename from antora/components/rg/modules/fis/assets/images/ContentNegotiationService/accept-json.png
rename to core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/accept-json.png
diff --git a/antora/components/rg/modules/fis/assets/images/ContentNegotiationService/accept-xml.png b/core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/accept-xml.png
similarity index 100%
rename from antora/components/rg/modules/fis/assets/images/ContentNegotiationService/accept-xml.png
rename to core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/accept-xml.png
diff --git a/antora/components/rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.png b/core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.png
similarity index 100%
rename from antora/components/rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.png
rename to core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.png
diff --git a/antora/components/rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.pptx b/core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.pptx
similarity index 100%
rename from antora/components/rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.pptx
rename to core/_adoc-rg/modules/fis/assets/images/ContentNegotiationService/facade-choices.pptx
diff --git a/antora/components/rg/modules/fis/assets/images/RepresentationService/service-collaborations.png b/core/_adoc-rg/modules/fis/assets/images/RepresentationService/service-collaborations.png
similarity index 100%
rename from antora/components/rg/modules/fis/assets/images/RepresentationService/service-collaborations.png
rename to core/_adoc-rg/modules/fis/assets/images/RepresentationService/service-collaborations.png
diff --git a/antora/components/rg/modules/fis/assets/images/RepresentationService/service-collaborations.pptx b/core/_adoc-rg/modules/fis/assets/images/RepresentationService/service-collaborations.pptx
similarity index 100%
rename from antora/components/rg/modules/fis/assets/images/RepresentationService/service-collaborations.pptx
rename to core/_adoc-rg/modules/fis/assets/images/RepresentationService/service-collaborations.pptx
diff --git a/antora/components/rg/modules/cfg/assets/images/.gitkeep b/core/_adoc-rg/modules/fis/examples/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/cfg/assets/images/.gitkeep
rename to core/_adoc-rg/modules/fis/examples/.gitkeep
diff --git a/antora/components/rg/modules/fis/nav.adoc b/core/_adoc-rg/modules/fis/nav.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/nav.adoc
rename to core/_adoc-rg/modules/fis/nav.adoc
diff --git a/antora/components/rg/modules/cfg/pages/_attributes.adoc b/core/_adoc-rg/modules/fis/pages/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/pages/_attributes.adoc
rename to core/_adoc-rg/modules/fis/pages/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModelLayout/_attributes.adoc b/core/_adoc-rg/modules/fis/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModelLayout/_attributes.adoc
rename to core/_adoc-rg/modules/fis/pages/_partials/_attributes.adoc
diff --git a/antora/components/rg/modules/fis/pages/about.adoc b/core/_adoc-rg/modules/fis/pages/about.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/about.adoc
rename to core/_adoc-rg/modules/fis/pages/about.adoc
diff --git a/antora/components/rg/modules/fis/pages/application-layer.adoc b/core/_adoc-rg/modules/fis/pages/application-layer.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/application-layer.adoc
rename to core/_adoc-rg/modules/fis/pages/application-layer.adoc
diff --git a/antora/components/rg/modules/fis/pages/application-layer/AuthenticationSessionProvider.adoc b/core/_adoc-rg/modules/fis/pages/application-layer/AuthenticationSessionProvider.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/application-layer/AuthenticationSessionProvider.adoc
rename to core/_adoc-rg/modules/fis/pages/application-layer/AuthenticationSessionProvider.adoc
diff --git a/antora/components/rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc b/core/_adoc-rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc
rename to core/_adoc-rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc
diff --git a/antora/components/rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc b/core/_adoc-rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc
rename to core/_adoc-rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc
diff --git a/antora/components/rg/modules/ant/pages/ViewModel/_attributes.adoc b/core/_adoc-rg/modules/fis/pages/application-layer/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ViewModel/_attributes.adoc
rename to core/_adoc-rg/modules/fis/pages/application-layer/_attributes.adoc
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer.adoc b/core/_adoc-rg/modules/fis/pages/persistence-layer.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/persistence-layer.adoc
rename to core/_adoc-rg/modules/fis/pages/persistence-layer.adoc
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc b/core/_adoc-rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc
rename to core/_adoc-rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc b/core/_adoc-rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
rename to core/_adoc-rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/PersistenceSessionServiceInternal.adoc b/core/_adoc-rg/modules/fis/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
rename to core/_adoc-rg/modules/fis/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc b/core/_adoc-rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc
rename to core/_adoc-rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc
diff --git a/antora/components/rg/modules/ant/pages/PropertyLayout/_attributes.adoc b/core/_adoc-rg/modules/fis/pages/persistence-layer/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/PropertyLayout/_attributes.adoc
rename to core/_adoc-rg/modules/fis/pages/persistence-layer/_attributes.adoc
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer.adoc b/core/_adoc-rg/modules/fis/pages/presentation-layer.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/presentation-layer.adoc
rename to core/_adoc-rg/modules/fis/pages/presentation-layer.adoc
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc b/core/_adoc-rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
rename to core/_adoc-rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc b/core/_adoc-rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
similarity index 100%
rename from antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
rename to core/_adoc-rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
diff --git a/antora/components/rg/modules/ant/pages/Property/_attributes.adoc b/core/_adoc-rg/modules/fis/pages/presentation-layer/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Property/_attributes.adoc
rename to core/_adoc-rg/modules/fis/pages/presentation-layer/_attributes.adoc
diff --git a/antora/components/rg/modules/cfg/_attributes.adoc b/core/_adoc-rg/modules/mvn/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cfg/_attributes.adoc
rename to core/_adoc-rg/modules/mvn/_attributes.adoc
diff --git a/antora/components/rg/modules/cfg/assets/attachments/.gitkeep b/core/_adoc-rg/modules/mvn/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/cfg/assets/attachments/.gitkeep
rename to core/_adoc-rg/modules/mvn/assets/attachments/.gitkeep
diff --git a/antora/components/rg/modules/mvn/assets/images/maven-plugin/xsd-goal.png b/core/_adoc-rg/modules/mvn/assets/images/maven-plugin/xsd-goal.png
similarity index 100%
rename from antora/components/rg/modules/mvn/assets/images/maven-plugin/xsd-goal.png
rename to core/_adoc-rg/modules/mvn/assets/images/maven-plugin/xsd-goal.png
diff --git a/antora/components/rg/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx b/core/_adoc-rg/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx
similarity index 100%
rename from antora/components/rg/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx
rename to core/_adoc-rg/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx
diff --git a/antora/components/rg/modules/ant/examples/.gitkeep b/core/_adoc-rg/modules/mvn/examples/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/ant/examples/.gitkeep
rename to core/_adoc-rg/modules/mvn/examples/.gitkeep
diff --git a/antora/components/rg/modules/mvn/nav.adoc b/core/_adoc-rg/modules/mvn/nav.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/nav.adoc
rename to core/_adoc-rg/modules/mvn/nav.adoc
diff --git a/antora/components/rg/modules/ant/pages/_attributes.adoc b/core/_adoc-rg/modules/mvn/pages/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/_attributes.adoc
rename to core/_adoc-rg/modules/mvn/pages/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/ParameterLayout/_attributes.adoc b/core/_adoc-rg/modules/mvn/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ParameterLayout/_attributes.adoc
rename to core/_adoc-rg/modules/mvn/pages/_partials/_attributes.adoc
diff --git a/antora/components/rg/modules/mvn/pages/about.adoc b/core/_adoc-rg/modules/mvn/pages/about.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/pages/about.adoc
rename to core/_adoc-rg/modules/mvn/pages/about.adoc
diff --git a/antora/components/rg/modules/mvn/pages/intro.adoc b/core/_adoc-rg/modules/mvn/pages/intro.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/pages/intro.adoc
rename to core/_adoc-rg/modules/mvn/pages/intro.adoc
diff --git a/antora/components/rg/modules/mvn/pages/swagger.adoc b/core/_adoc-rg/modules/mvn/pages/swagger.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/pages/swagger.adoc
rename to core/_adoc-rg/modules/mvn/pages/swagger.adoc
diff --git a/antora/components/rg/modules/mvn/pages/validate.adoc b/core/_adoc-rg/modules/mvn/pages/validate.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/pages/validate.adoc
rename to core/_adoc-rg/modules/mvn/pages/validate.adoc
diff --git a/antora/components/rg/modules/mvn/pages/xsd.adoc b/core/_adoc-rg/modules/mvn/pages/xsd.adoc
similarity index 100%
rename from antora/components/rg/modules/mvn/pages/xsd.adoc
rename to core/_adoc-rg/modules/mvn/pages/xsd.adoc
diff --git a/antora/components/rg/modules/ant/_attributes.adoc b/core/_adoc-rg/modules/svc/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/_attributes.adoc
rename to core/_adoc-rg/modules/svc/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/assets/images/.gitkeep b/core/_adoc-rg/modules/svc/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/ant/assets/images/.gitkeep
rename to core/_adoc-rg/modules/svc/assets/attachments/.gitkeep
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.png b/core/_adoc-rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx b/core/_adoc-rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx
rename to core/_adoc-rg/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png b/core/_adoc-rg/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png b/core/_adoc-rg/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png b/core/_adoc-rg/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png b/core/_adoc-rg/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png b/core/_adoc-rg/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services/categories.png b/core/_adoc-rg/modules/svc/assets/images/reference-services/categories.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services/categories.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services/categories.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services/categories.pptx b/core/_adoc-rg/modules/svc/assets/images/reference-services/categories.pptx
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services/categories.pptx
rename to core/_adoc-rg/modules/svc/assets/images/reference-services/categories.pptx
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services/commands-and-events.png b/core/_adoc-rg/modules/svc/assets/images/reference-services/commands-and-events.png
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services/commands-and-events.png
rename to core/_adoc-rg/modules/svc/assets/images/reference-services/commands-and-events.png
diff --git a/antora/components/rg/modules/svc/assets/images/reference-services/commands-and-events.pptx b/core/_adoc-rg/modules/svc/assets/images/reference-services/commands-and-events.pptx
similarity index 100%
rename from antora/components/rg/modules/svc/assets/images/reference-services/commands-and-events.pptx
rename to core/_adoc-rg/modules/svc/assets/images/reference-services/commands-and-events.pptx
diff --git a/antora/components/rg/modules/ant/assets/attachments/.gitkeep b/core/_adoc-rg/modules/svc/examples/.gitkeep
similarity index 100%
rename from antora/components/rg/modules/ant/assets/attachments/.gitkeep
rename to core/_adoc-rg/modules/svc/examples/.gitkeep
diff --git a/antora/components/rg/modules/svc/nav.adoc b/core/_adoc-rg/modules/svc/nav.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/nav.adoc
rename to core/_adoc-rg/modules/svc/nav.adoc
diff --git a/antora/components/rg/modules/ROOT/pages/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ROOT/pages/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/_attributes.adoc
diff --git a/antora/components/rg/modules/ant/pages/Parameter/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Parameter/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/_partials/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/about.adoc b/core/_adoc-rg/modules/svc/pages/about.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/about.adoc
rename to core/_adoc-rg/modules/svc/pages/about.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/ActionInvocationContext.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService/Quartz.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService/Quartz.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService/Quartz.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService/Quartz.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/contributee/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/classes/contributee/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/BackgroundService/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/CommandContext.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/CommandContext.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/CommandContext.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/CommandContext.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/CommandExecutorService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/CommandExecutorService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/CommandExecutorService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/CommandExecutorService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/DtoMappingHelper.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/DtoMappingHelper.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/DtoMappingHelper.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/DtoMappingHelper.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/InteractionContext.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/InteractionContext.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/InteractionContext.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/InteractionContext.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/MessageService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/MessageService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/MessageService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/MessageService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/SessionManagementService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/SessionManagementService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/SessionManagementService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/SessionManagementService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/TitleService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/TitleService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/TitleService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/TitleService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/TransactionService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/TransactionService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/TransactionService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/TransactionService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
diff --git a/antora/components/rg/modules/ant/pages/Mixin/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Mixin/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-api/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-spi.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-spi.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-spi.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-spi.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-spi/BackgroundCommandService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-spi/BackgroundCommandService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-spi/BackgroundCommandService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-spi/BackgroundCommandService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-spi/CommandService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-spi/CommandService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-spi/CommandService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-spi/CommandService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-spi/HealthCheckService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-spi/HealthCheckService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-spi/HealthCheckService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-spi/HealthCheckService.adoc
diff --git a/antora/components/rg/modules/svc/pages/application-layer-spi/HomePageProviderService.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-spi/HomePageProviderService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/application-layer-spi/HomePageProviderService.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-spi/HomePageProviderService.adoc
diff --git a/antora/components/rg/modules/ant/pages/MemberOrder/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-spi/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/MemberOrder/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/application-layer-spi/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/bootstrapping-spi.adoc b/core/_adoc-rg/modules/svc/pages/bootstrapping-spi.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/bootstrapping-spi.adoc
rename to core/_adoc-rg/modules/svc/pages/bootstrapping-spi.adoc
diff --git a/antora/components/rg/modules/svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc b/core/_adoc-rg/modules/svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
rename to core/_adoc-rg/modules/svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainServiceLayout/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/bootstrapping-spi/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainServiceLayout/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/bootstrapping-spi/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/ClockService.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api/ClockService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api/ClockService.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api/ClockService.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/ConfigurationService.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api/ConfigurationService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api/ConfigurationService.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api/ConfigurationService.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/EventBusService.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api/EventBusService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api/EventBusService.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api/EventBusService.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/FactoryService.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api/FactoryService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api/FactoryService.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api/FactoryService.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/Scratchpad.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api/Scratchpad.adoc
diff --git a/antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api/UserService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/core-domain-api/UserService.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api/UserService.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainService/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/core-domain-api/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainService/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/core-domain-api/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/integration-api.adoc b/core/_adoc-rg/modules/svc/pages/integration-api.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/integration-api.adoc
rename to core/_adoc-rg/modules/svc/pages/integration-api.adoc
diff --git a/antora/components/rg/modules/svc/pages/integration-api/BookmarkService.adoc b/core/_adoc-rg/modules/svc/pages/integration-api/BookmarkService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/integration-api/BookmarkService.adoc
rename to core/_adoc-rg/modules/svc/pages/integration-api/BookmarkService.adoc
diff --git a/antora/components/rg/modules/svc/pages/integration-api/EmailService.adoc b/core/_adoc-rg/modules/svc/pages/integration-api/EmailService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/integration-api/EmailService.adoc
rename to core/_adoc-rg/modules/svc/pages/integration-api/EmailService.adoc
diff --git a/antora/components/rg/modules/svc/pages/integration-api/JaxbService.adoc b/core/_adoc-rg/modules/svc/pages/integration-api/JaxbService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/integration-api/JaxbService.adoc
rename to core/_adoc-rg/modules/svc/pages/integration-api/JaxbService.adoc
diff --git a/antora/components/rg/modules/svc/pages/integration-api/MementoService.adoc b/core/_adoc-rg/modules/svc/pages/integration-api/MementoService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/integration-api/MementoService.adoc
rename to core/_adoc-rg/modules/svc/pages/integration-api/MementoService.adoc
diff --git a/antora/components/rg/modules/svc/pages/integration-api/XmlSnapshotService.adoc b/core/_adoc-rg/modules/svc/pages/integration-api/XmlSnapshotService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/integration-api/XmlSnapshotService.adoc
rename to core/_adoc-rg/modules/svc/pages/integration-api/XmlSnapshotService.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObjectLayout/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/integration-api/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObjectLayout/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/integration-api/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/intro.adoc b/core/_adoc-rg/modules/svc/pages/intro.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/intro.adoc
rename to core/_adoc-rg/modules/svc/pages/intro.adoc
diff --git a/antora/components/rg/modules/svc/pages/metadata-api.adoc b/core/_adoc-rg/modules/svc/pages/metadata-api.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/metadata-api.adoc
rename to core/_adoc-rg/modules/svc/pages/metadata-api.adoc
diff --git a/antora/components/rg/modules/svc/pages/metadata-api/ApplicationFeatureRepository.adoc b/core/_adoc-rg/modules/svc/pages/metadata-api/ApplicationFeatureRepository.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/metadata-api/ApplicationFeatureRepository.adoc
rename to core/_adoc-rg/modules/svc/pages/metadata-api/ApplicationFeatureRepository.adoc
diff --git a/antora/components/rg/modules/svc/pages/metadata-api/LayoutService.adoc b/core/_adoc-rg/modules/svc/pages/metadata-api/LayoutService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/metadata-api/LayoutService.adoc
rename to core/_adoc-rg/modules/svc/pages/metadata-api/LayoutService.adoc
diff --git a/antora/components/rg/modules/svc/pages/metadata-api/MetamodelService.adoc b/core/_adoc-rg/modules/svc/pages/metadata-api/MetamodelService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/metadata-api/MetamodelService.adoc
rename to core/_adoc-rg/modules/svc/pages/metadata-api/MetamodelService.adoc
diff --git a/antora/components/rg/modules/svc/pages/metadata-api/ServiceRegistry.adoc b/core/_adoc-rg/modules/svc/pages/metadata-api/ServiceRegistry.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/metadata-api/ServiceRegistry.adoc
rename to core/_adoc-rg/modules/svc/pages/metadata-api/ServiceRegistry.adoc
diff --git a/antora/components/rg/modules/svc/pages/metadata-api/SwaggerService.adoc b/core/_adoc-rg/modules/svc/pages/metadata-api/SwaggerService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/metadata-api/SwaggerService.adoc
rename to core/_adoc-rg/modules/svc/pages/metadata-api/SwaggerService.adoc
diff --git a/antora/components/rg/modules/ant/pages/DomainObject/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/metadata-api/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/DomainObject/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/metadata-api/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/H2ManagerMenu.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api/H2ManagerMenu.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api/H2ManagerMenu.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api/H2ManagerMenu.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/QueryResultsCache.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api/QueryResultsCache.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api/QueryResultsCache.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api/QueryResultsCache.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/RepositoryService.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api/RepositoryService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-api/RepositoryService.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api/RepositoryService.adoc
diff --git a/antora/components/rg/modules/ant/pages/CollectionLayout/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-api/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/CollectionLayout/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-api/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-spi.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-spi.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-spi.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-spi.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-spi/AuditerService.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-spi/AuditerService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-spi/AuditerService.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-spi/AuditerService.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-spi/UserRegistrationService.adoc
diff --git a/antora/components/rg/modules/ant/pages/Collection/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/persistence-layer-spi/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Collection/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/persistence-layer-spi/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-api.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-api.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-api.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-api/BookmarkUiService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/ConfigurationViewService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-api/ConfigurationViewService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-api/ConfigurationViewService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-api/ConfigurationViewService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-api/DeepLinkService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
diff --git a/antora/components/rg/modules/ant/pages/ActionLayout/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-api/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/ActionLayout/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-api/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/EmailNotificationService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ErrorReportingService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ErrorReportingService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/ErrorReportingService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ErrorReportingService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/GridLoaderService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/GridLoaderService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/GridLoaderService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/GridLoaderService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/GridService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/GridService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/GridService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/GridService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/GridSystemService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/HintStore.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/LocaleProvider.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/MenuBarsService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/RoutingService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/SessionLoggingService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/SessionLoggingService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/SessionLoggingService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/SessionLoggingService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/TableColumnOrderService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/TranslationService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/TranslationService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/TranslationsResolver.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/UrlEncodingService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/UrlEncodingService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/UrlEncodingService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/UrlEncodingService.adoc
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/UserProfileService.adoc
diff --git a/antora/components/rg/modules/ant/pages/Action/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/presentation-layer-spi/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ant/pages/Action/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/presentation-layer-spi/_attributes.adoc
diff --git a/antora/components/rg/modules/svc/pages/testing.adoc b/core/_adoc-rg/modules/svc/pages/testing.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/testing.adoc
rename to core/_adoc-rg/modules/svc/pages/testing.adoc
diff --git a/antora/components/rg/modules/svc/pages/testing/ExecutionParametersService.adoc b/core/_adoc-rg/modules/svc/pages/testing/ExecutionParametersService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/testing/ExecutionParametersService.adoc
rename to core/_adoc-rg/modules/svc/pages/testing/ExecutionParametersService.adoc
diff --git a/antora/components/rg/modules/svc/pages/testing/FixtureScripts.adoc b/core/_adoc-rg/modules/svc/pages/testing/FixtureScripts.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/testing/FixtureScripts.adoc
rename to core/_adoc-rg/modules/svc/pages/testing/FixtureScripts.adoc
diff --git a/antora/components/rg/modules/svc/pages/testing/FixtureScriptsSpecificationProvider.adoc b/core/_adoc-rg/modules/svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
rename to core/_adoc-rg/modules/svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
diff --git a/antora/components/rg/modules/svc/pages/testing/SudoService.adoc b/core/_adoc-rg/modules/svc/pages/testing/SudoService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/testing/SudoService.adoc
rename to core/_adoc-rg/modules/svc/pages/testing/SudoService.adoc
diff --git a/antora/components/rg/modules/svc/pages/testing/SwitchUserService.adoc b/core/_adoc-rg/modules/svc/pages/testing/SwitchUserService.adoc
similarity index 100%
rename from antora/components/rg/modules/svc/pages/testing/SwitchUserService.adoc
rename to core/_adoc-rg/modules/svc/pages/testing/SwitchUserService.adoc
diff --git a/antora/components/rg/modules/ROOT/pages/_partials/_attributes.adoc b/core/_adoc-rg/modules/svc/pages/testing/_attributes.adoc
similarity index 100%
rename from antora/components/rg/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/_adoc-rg/modules/svc/pages/testing/_attributes.adoc
diff --git a/antora/components/rg/sync_examples.sh b/core/_adoc-rg/sync_examples.sh
similarity index 100%
rename from antora/components/rg/sync_examples.sh
rename to core/_adoc-rg/sync_examples.sh
diff --git a/site.yml b/site.yml
index 71a6bc5..4cebdfc 100644
--- a/site.yml
+++ b/site.yml
@@ -25,7 +25,7 @@ content:
     branches: HEAD
   - url: .
     branches: HEAD
-    start_path: antora/components/rg
+    start_path: core/_adoc-rg
   - url: .
     start_path: examples/apps/helloworld/_adoc
     branches: HEAD


[isis] 12/13: ISIS-2062: moves ug alongside code, renamed to _adoc-ug

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9c52630acad985027d18c6d8dbb936bdfee5dfce
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:30:28 2019 +0200

    ISIS-2062: moves ug alongside code, renamed to _adoc-ug
---
 {antora/components/ug => core/_adoc-ug}/antora.yml          |   2 +-
 {antora/components/ug => core/_adoc-ug}/examples.csv        |   0
 .../fun => core/_adoc-ug/modules/ROOT}/_attributes.adoc     |   0
 .../components/ug => core/_adoc-ug}/modules/ROOT/nav.adoc   |   0
 .../_adoc-ug/modules/ROOT}/pages/_attributes.adoc           |   0
 .../_adoc-ug/modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../ug => core/_adoc-ug}/modules/ROOT/pages/about.adoc      |   0
 .../ug => core/_adoc-ug}/modules/btb/_attributes.adoc       |   0
 .../_adoc-ug/modules/btb/assets/attachments}/.gitkeep       |   0
 .../images/headless-access/BackgroundCommandExecution.png   | Bin
 ...roundCommandExecutionFromBackgroundCommandServiceJdo.png | Bin
 .../images/hints-and-tips/action-semantics-are-you-sure.png | Bin
 .../images/hints-and-tips/are-you-sure-happy-case.png       | Bin
 .../assets/images/hints-and-tips/are-you-sure-sad-case.png  | Bin
 .../btb/assets/images/hints-and-tips/are-you-sure.png       | Bin
 .../btb/assets/images/hints-and-tips/view-model-fail.png    | Bin
 .../btb/assets/images/hints-and-tips/view-model-success.png | Bin
 .../modules/btb/assets/images/runtime/web-xml/key.png       | Bin
 .../modules/btb/assets/images/runtime/web-xml/parts.pptx    | Bin
 .../modules/btb/assets/images/runtime/web-xml/ro-only.png   | Bin
 .../btb/assets/images/runtime/web-xml/wicket-and-ro.png     | Bin
 .../btb/assets/images/runtime/web-xml/wicket-only.png       | Bin
 .../ug => core/_adoc-ug}/modules/btb/examples/.gitkeep      |   0
 .../components/ug => core/_adoc-ug}/modules/btb/nav.adoc    |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/_attributes.adoc |   0
 .../_adoc-ug/modules/btb/pages/_partials}/_attributes.adoc  |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/about.adoc       |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/deployment.adoc  |   0
 .../_adoc-ug/modules/btb/pages/deployment}/_attributes.adoc |   0
 .../_adoc-ug}/modules/btb/pages/deployment/cmd-line.adoc    |   0
 .../_adoc-ug}/modules/btb/pages/deployment/docker.adoc      |   0
 .../btb/pages/deployment/externalized-configuration.adoc    |   0
 .../_adoc-ug}/modules/btb/pages/deployment/gae.adoc         |   0
 .../_adoc-ug}/modules/btb/pages/deployment/jvm-flags.adoc   |   0
 .../_adoc-ug}/modules/btb/pages/deployment/neo4j.adoc       |   0
 .../_adoc-ug}/modules/btb/pages/deployment/tomcat.adoc      |   0
 .../_adoc-ug}/modules/btb/pages/headless-access.adoc        |   0
 .../pages/headless-access/AbstractIsisSessionTemplate.adoc  |   0
 .../pages/headless-access/BackgroundCommandExecution.adoc   |   0
 .../modules/btb/pages/headless-access}/_attributes.adoc     |   0
 .../_adoc-ug}/modules/btb/pages/hints-and-tips.adoc         |   0
 .../modules/btb/pages/hints-and-tips}/_attributes.adoc      |   0
 .../modules/btb/pages/hints-and-tips/are-you-sure.adoc      |   0
 .../hints-and-tips/how-to-handle-void-and-null-results.adoc |   0
 .../hints-and-tips/how-to-implement-a-spellchecker.adoc     |   0
 .../modules/btb/pages/hints-and-tips/multi-tenancy.adoc     |   0
 .../modules/btb/pages/hints-and-tips/persisted-title.adoc   |   0
 .../modules/btb/pages/hints-and-tips/pushing-changes.adoc   |   0
 .../replacing-default-service-implementations.adoc          |   0
 .../hints-and-tips/simulating-collections-of-values.adoc    |   0
 .../pages/hints-and-tips/subclass-properties-in-tables.adoc |   0
 .../btb/pages/hints-and-tips/transactions-and-errors.adoc   |   0
 .../btb/pages/hints-and-tips/vetoing-visibility.adoc        |   0
 .../btb/pages/hints-and-tips/view-model-instantiation.adoc  |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/i18n.adoc        |   0
 .../_adoc-ug}/modules/btb/pages/other-techniques.adoc       |   0
 .../_adoc-ug}/modules/btb/pages/programming-model.adoc      |   0
 .../modules/btb/pages/programming-model}/_attributes.adoc   |   0
 .../btb/pages/programming-model/custom-validator.adoc       |   0
 .../modules/btb/pages/programming-model/finetuning.adoc     |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/web-xml.adoc     |   0
 .../ROOT => core/_adoc-ug/modules/fun}/_attributes.adoc     |   0
 .../core-concepts/Pawson-Naked-Objects-thesis.pdf           | Bin
 .../assets/images/core-concepts/philosophy/build-vs-buy.png | Bin
 .../images/core-concepts/philosophy/build-vs-buy.pptx       | Bin
 .../core-concepts/philosophy/decoupled-applications.png     | Bin
 .../core-concepts/philosophy/decoupled-applications.pptx    | Bin
 .../philosophy/hexagonal-architecture-addons.png            | Bin
 .../core-concepts/philosophy/hexagonal-architecture.png     | Bin
 .../core-concepts/philosophy/hexagonal-architecture.pptx    | Bin
 .../assets/images/programming-model/todoapp-Dashboard.png   | Bin
 .../_adoc-ug/modules/fun/examples}/.gitkeep                 |   0
 .../components/ug => core/_adoc-ug}/modules/fun/nav.adoc    |   0
 .../_adoc-ug/modules/fun}/pages/_attributes.adoc            |   0
 .../_adoc-ug/modules/fun/pages/_partials}/_attributes.adoc  |   0
 .../ug => core/_adoc-ug}/modules/fun/pages/about.adoc       |   0
 .../modules/fun/pages/available-domain-services.adoc        |   0
 .../fun/pages/available-domain-services}/_attributes.adoc   |   0
 .../pages/available-domain-services/framework-provided.adoc |   0
 .../pages/available-domain-services/incode-platform.adoc    |   0
 .../_adoc-ug}/modules/fun/pages/building-blocks.adoc        |   0
 .../modules/fun/pages/building-blocks}/_attributes.adoc     |   0
 .../_adoc-ug}/modules/fun/pages/building-blocks/events.adoc |   0
 .../fun/pages/building-blocks/events}/_attributes.adoc      |   0
 .../fun/pages/building-blocks/events/domain-events.adoc     |   0
 .../fun/pages/building-blocks/events/lifecycle-events.adoc  |   0
 .../modules/fun/pages/building-blocks/events/ui-events.adoc |   0
 .../modules/fun/pages/building-blocks/identifiers.adoc      |   0
 .../fun/pages/building-blocks/identifiers}/_attributes.adoc |   0
 .../modules/fun/pages/building-blocks/identifiers/oid.adoc  |   0
 .../identifiers/title-and-icon-and-css-class.adoc           |   0
 .../modules/fun/pages/building-blocks/metamodel.adoc        |   0
 .../modules/fun/pages/building-blocks/modules.adoc          |   0
 .../modules/fun/pages/building-blocks/object-members.adoc   |   0
 .../fun/pages/building-blocks/types-of-domain-objects.adoc  |   0
 .../types-of-domain-objects}/_attributes.adoc               |   0
 .../types-of-domain-objects/domain-entities.adoc            |   0
 .../types-of-domain-objects/domain-services.adoc            |   0
 .../building-blocks/types-of-domain-objects/mixins.adoc     |   0
 .../types-of-domain-objects/view-models.adoc                |   0
 .../_adoc-ug}/modules/fun/pages/business-rules.adoc         |   0
 .../modules/fun/pages/business-rules}/_attributes.adoc      |   0
 .../_adoc-ug}/modules/fun/pages/business-rules/actions.adoc |   0
 .../modules/fun/pages/business-rules/side-effects.adoc      |   0
 .../modules/fun/pages/business-rules/usability.adoc         |   0
 .../modules/fun/pages/business-rules/validity.adoc          |   0
 .../modules/fun/pages/business-rules/visibility.adoc        |   0
 .../_adoc-ug}/modules/fun/pages/core-concepts.adoc          |   0
 .../modules/fun/pages/core-concepts}/_attributes.adoc       |   0
 .../modules/fun/pages/core-concepts/apache-isis-vs.adoc     |   0
 .../pages/core-concepts/apache-isis-vs}/_attributes.adoc    |   0
 .../fun/pages/core-concepts/apache-isis-vs/cqrs.adoc        |   0
 .../pages/core-concepts/apache-isis-vs/event-sourcing.adoc  |   0
 .../pages/core-concepts/apache-isis-vs/mvc-server-side.adoc |   0
 .../modules/fun/pages/core-concepts/deployment-options.adoc |   0
 .../modules/fun/pages/core-concepts/philosophy.adoc         |   0
 .../fun/pages/core-concepts/philosophy/_attributes.adoc     |   0
 .../modules/fun/pages/core-concepts/philosophy/aop.adoc     |   0
 .../modules/fun/pages/core-concepts/philosophy/dci.adoc     |   0
 .../core-concepts/philosophy/domain-driven-design.adoc      |   0
 .../core-concepts/philosophy/hexagonal-architecture.adoc    |   0
 .../fun/pages/core-concepts/philosophy/how-eases-ddd.adoc   |   0
 .../core-concepts/philosophy/naked-objects-pattern.adoc     |   0
 .../modules/fun/pages/core-concepts/principles.adoc         |   0
 .../fun/pages/core-concepts/principles}/_attributes.adoc    |   0
 .../fun/pages/core-concepts/principles/build-not-buy.adoc   |   0
 .../pages/core-concepts/principles/for-the-long-term.adoc   |   0
 .../fun/pages/core-concepts/principles/isis-itself.adoc     |   0
 .../core-concepts/principles/isis-itself}/_attributes.adoc  |   0
 .../principles/isis-itself/focuses-on-its-usp.adoc          |   0
 .../principles/isis-itself/full-stack-but-extensible.adoc   |   0
 .../fun/pages/core-concepts/principles/lego-blocks.adoc     |   0
 .../fun/pages/core-concepts/principles/testable.adoc        |   0
 .../ug => core/_adoc-ug}/modules/fun/pages/crud.adoc        |   0
 .../_adoc-ug/modules/fun/pages/crud}/_attributes.adoc       |   0
 .../_adoc-ug}/modules/fun/pages/crud/deleting.adoc          |   0
 .../_adoc-ug}/modules/fun/pages/crud/finding.adoc           |   0
 .../_adoc-ug}/modules/fun/pages/crud/instantiating.adoc     |   0
 .../_adoc-ug}/modules/fun/pages/crud/persisting.adoc        |   0
 .../_adoc-ug}/modules/fun/pages/crud/updating.adoc          |   0
 .../modules/fun/pages/drop-downs-and-defaults.adoc          |   0
 .../_adoc-ug}/modules/fun/pages/programming-model.adoc      |   0
 .../modules/fun/pages/programming-model}/_attributes.adoc   |   0
 .../modules/fun/pages/programming-model/actions.adoc        |   0
 .../modules/fun/pages/programming-model/collections.adoc    |   0
 .../fun/pages/programming-model/domain-entities.adoc        |   0
 .../fun/pages/programming-model/domain-services.adoc        |   0
 .../programming-model/domain-services}/_attributes.adoc     |   0
 .../domain-services/event-subscribers.adoc                  |   0
 .../programming-model/domain-services/initialization.adoc   |   0
 .../fun/pages/programming-model/domain-services/menu.adoc   |   0
 .../domain-services/organizing-services.adoc                |   0
 .../programming-model/domain-services/registering.adoc      |   0
 .../domain-services/repository-and-factory.adoc             |   0
 .../programming-model/domain-services/scoped-services.adoc  |   0
 .../fun/pages/programming-model/inject-services.adoc        |   0
 .../modules/fun/pages/programming-model/mixins.adoc         |   0
 .../fun/pages/programming-model/mixins}/_attributes.adoc    |   0
 .../pages/programming-model/mixins/contributed-action.adoc  |   0
 .../programming-model/mixins/contributed-collection.adoc    |   0
 .../programming-model/mixins/contributed-property.adoc      |   0
 .../fun/pages/programming-model/mixins/inferred-name.adoc   |   0
 .../programming-model/mixins/nested-static-classes.adoc     |   0
 .../pages/programming-model/mixins/programmatic-usage.adoc  |   0
 .../pages/programming-model/properties-vs-parameters.adoc   |   0
 .../modules/fun/pages/programming-model/properties.adoc     |   0
 .../modules/fun/pages/programming-model/view-models.adoc    |   0
 .../pages/programming-model/view-models}/_attributes.adoc   |   0
 .../fun/pages/programming-model/view-models/dto.adoc        |   0
 .../programming-model/view-models/dto/_attributes.adoc      |   0
 .../programming-model/view-models/dto/dto-consumers.adoc    |   0
 .../programming-model/view-models/dto/generating-xsds.adoc  |   0
 .../pages/programming-model/view-models/dto/versioning.adoc |   0
 .../fun/pages/programming-model/view-models/jaxb.adoc       |   0
 .../programming-model/view-models/jaxb}/_attributes.adoc    |   0
 .../programming-model/view-models/jaxb/joda-datatypes.adoc  |   0
 .../view-models/jaxb/referencing-domain-entities.adoc       |   0
 .../fun/pages/programming-model/view-models/non-jaxb.adoc   |   0
 .../ug => core/_adoc-ug}/modules/fun/pages/ui-hints.adoc    |   0
 .../_adoc-ug/modules/fun/pages/ui-hints}/_attributes.adoc   |   0
 .../modules/fun/pages/ui-hints/action-icons-and-css.adoc    |   0
 .../modules/fun/pages/ui-hints/eager-rendering.adoc         |   0
 .../_adoc-ug}/modules/fun/pages/ui-hints/layout.adoc        |   0
 .../modules/fun/pages/ui-hints/names-and-descriptions.adoc  |   0
 .../modules/fun/pages/ui-hints/object-titles-and-icons.adoc |   0
 {antora/components/ug => core/_adoc-ug}/sync_examples.sh    |   0
 site.yml                                                    |   2 +-
 187 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/antora/components/ug/antora.yml b/core/_adoc-ug/antora.yml
similarity index 81%
rename from antora/components/ug/antora.yml
rename to core/_adoc-ug/antora.yml
index 50f35cf..efb09af 100644
--- a/antora/components/ug/antora.yml
+++ b/core/_adoc-ug/antora.yml
@@ -1,5 +1,5 @@
 name: ug
-title: "Guides - User Guides"
+title: "User Guide"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/ug/examples.csv b/core/_adoc-ug/examples.csv
similarity index 100%
rename from antora/components/ug/examples.csv
rename to core/_adoc-ug/examples.csv
diff --git a/antora/components/ug/modules/fun/_attributes.adoc b/core/_adoc-ug/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/_attributes.adoc
rename to core/_adoc-ug/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug/modules/ROOT/nav.adoc b/core/_adoc-ug/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/nav.adoc
rename to core/_adoc-ug/modules/ROOT/nav.adoc
diff --git a/antora/components/ug/modules/fun/pages/_attributes.adoc b/core/_adoc-ug/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/_attributes.adoc
rename to core/_adoc-ug/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/_attributes.adoc b/core/_adoc-ug/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/_attributes.adoc
rename to core/_adoc-ug/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/core/_adoc-ug/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/pages/about.adoc
rename to core/_adoc-ug/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug/modules/btb/_attributes.adoc b/core/_adoc-ug/modules/btb/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/_attributes.adoc
rename to core/_adoc-ug/modules/btb/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/examples/.gitkeep b/core/_adoc-ug/modules/btb/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug/modules/fun/examples/.gitkeep
rename to core/_adoc-ug/modules/btb/assets/attachments/.gitkeep
diff --git a/antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png b/core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
rename to core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
diff --git a/antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png b/core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
rename to core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-success.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-success.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-success.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-success.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/key.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/key.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/key.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/key.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/parts.pptx b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/parts.pptx
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/parts.pptx
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/parts.pptx
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/ro-only.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/ro-only.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/ro-only.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/ro-only.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png
diff --git a/antora/components/ug/modules/btb/examples/.gitkeep b/core/_adoc-ug/modules/btb/examples/.gitkeep
similarity index 100%
rename from antora/components/ug/modules/btb/examples/.gitkeep
rename to core/_adoc-ug/modules/btb/examples/.gitkeep
diff --git a/antora/components/ug/modules/btb/nav.adoc b/core/_adoc-ug/modules/btb/nav.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/nav.adoc
rename to core/_adoc-ug/modules/btb/nav.adoc
diff --git a/antora/components/ug/modules/btb/pages/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/about.adoc b/core/_adoc-ug/modules/btb/pages/about.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/about.adoc
rename to core/_adoc-ug/modules/btb/pages/about.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment.adoc b/core/_adoc-ug/modules/btb/pages/deployment.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/deployment/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/cmd-line.adoc b/core/_adoc-ug/modules/btb/pages/deployment/cmd-line.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/cmd-line.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/cmd-line.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/docker.adoc b/core/_adoc-ug/modules/btb/pages/deployment/docker.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/docker.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/docker.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc b/core/_adoc-ug/modules/btb/pages/deployment/externalized-configuration.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/externalized-configuration.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/gae.adoc b/core/_adoc-ug/modules/btb/pages/deployment/gae.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/gae.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/gae.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc b/core/_adoc-ug/modules/btb/pages/deployment/jvm-flags.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/jvm-flags.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/neo4j.adoc b/core/_adoc-ug/modules/btb/pages/deployment/neo4j.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/neo4j.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/neo4j.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/tomcat.adoc b/core/_adoc-ug/modules/btb/pages/deployment/tomcat.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/tomcat.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/tomcat.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access.adoc b/core/_adoc-ug/modules/btb/pages/headless-access.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc b/core/_adoc-ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc b/core/_adoc-ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/headless-access/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/persisted-title.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/persisted-title.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/persisted-title.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/persisted-title.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
diff --git a/antora/components/ug/modules/btb/pages/i18n.adoc b/core/_adoc-ug/modules/btb/pages/i18n.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/i18n.adoc
rename to core/_adoc-ug/modules/btb/pages/i18n.adoc
diff --git a/antora/components/ug/modules/btb/pages/other-techniques.adoc b/core/_adoc-ug/modules/btb/pages/other-techniques.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/other-techniques.adoc
rename to core/_adoc-ug/modules/btb/pages/other-techniques.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model.adoc b/core/_adoc-ug/modules/btb/pages/programming-model.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/programming-model/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model/custom-validator.adoc b/core/_adoc-ug/modules/btb/pages/programming-model/custom-validator.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model/custom-validator.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model/custom-validator.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model/finetuning.adoc b/core/_adoc-ug/modules/btb/pages/programming-model/finetuning.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model/finetuning.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model/finetuning.adoc
diff --git a/antora/components/ug/modules/btb/pages/web-xml.adoc b/core/_adoc-ug/modules/btb/pages/web-xml.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/web-xml.adoc
rename to core/_adoc-ug/modules/btb/pages/web-xml.adoc
diff --git a/antora/components/ug/modules/ROOT/_attributes.adoc b/core/_adoc-ug/modules/fun/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/_attributes.adoc
rename to core/_adoc-ug/modules/fun/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf b/core/_adoc-ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from antora/components/ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
rename to core/_adoc-ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
diff --git a/antora/components/ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png b/core/_adoc-ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
rename to core/_adoc-ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
diff --git a/antora/components/ug/modules/btb/assets/attachments/.gitkeep b/core/_adoc-ug/modules/fun/examples/.gitkeep
similarity index 100%
rename from antora/components/ug/modules/btb/assets/attachments/.gitkeep
rename to core/_adoc-ug/modules/fun/examples/.gitkeep
diff --git a/antora/components/ug/modules/fun/nav.adoc b/core/_adoc-ug/modules/fun/nav.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/nav.adoc
rename to core/_adoc-ug/modules/fun/nav.adoc
diff --git a/antora/components/ug/modules/ROOT/pages/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/pages/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/about.adoc b/core/_adoc-ug/modules/fun/pages/about.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/about.adoc
rename to core/_adoc-ug/modules/fun/pages/about.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/_partials/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/_partials/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services/framework-provided.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services/framework-provided.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services/framework-provided.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services/framework-provided.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services/incode-platform.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services/incode-platform.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services/incode-platform.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services/incode-platform.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/domain-events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/domain-events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/domain-events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/domain-events.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/ui-events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/ui-events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/ui-events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/ui-events.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/metamodel.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/metamodel.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/modules.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/modules.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/modules.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/modules.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/object-members.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/object-members.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/object-members.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/object-members.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules.adoc b/core/_adoc-ug/modules/fun/pages/business-rules.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/actions.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/actions.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/actions.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/actions.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/side-effects.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/side-effects.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/side-effects.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/side-effects.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/usability.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/usability.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/usability.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/usability.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/validity.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/validity.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/validity.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/validity.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/visibility.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/visibility.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/visibility.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/visibility.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/deployment-options.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/deployment-options.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/aop.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/aop.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/aop.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/aop.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/dci.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/dci.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/dci.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/dci.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/testable.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/testable.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/testable.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/testable.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud.adoc b/core/_adoc-ug/modules/fun/pages/crud.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud.adoc
rename to core/_adoc-ug/modules/fun/pages/crud.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/crud/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/deleting.adoc b/core/_adoc-ug/modules/fun/pages/crud/deleting.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/deleting.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/deleting.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/finding.adoc b/core/_adoc-ug/modules/fun/pages/crud/finding.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/finding.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/finding.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/instantiating.adoc b/core/_adoc-ug/modules/fun/pages/crud/instantiating.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/instantiating.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/instantiating.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/persisting.adoc b/core/_adoc-ug/modules/fun/pages/crud/persisting.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/persisting.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/persisting.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/updating.adoc b/core/_adoc-ug/modules/fun/pages/crud/updating.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/updating.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/updating.adoc
diff --git a/antora/components/ug/modules/fun/pages/drop-downs-and-defaults.adoc b/core/_adoc-ug/modules/fun/pages/drop-downs-and-defaults.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/drop-downs-and-defaults.adoc
rename to core/_adoc-ug/modules/fun/pages/drop-downs-and-defaults.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model.adoc b/core/_adoc-ug/modules/fun/pages/programming-model.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model.adoc
diff --git a/antora/components/ug/modules/btb/pages/_partials/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/_partials/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/actions.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/actions.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/actions.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/actions.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/collections.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/collections.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/collections.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/collections.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-entities.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-entities.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/initialization.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/initialization.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/initialization.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/initialization.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/menu.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/menu.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/registering.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/registering.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/registering.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/registering.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/inject-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/inject-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/inject-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/inject-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/properties.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/properties.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/properties.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints.adoc
diff --git a/antora/components/ug/modules/ROOT/pages/_partials/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/eager-rendering.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/eager-rendering.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/eager-rendering.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/eager-rendering.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/layout.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/layout.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
diff --git a/antora/components/ug/sync_examples.sh b/core/_adoc-ug/sync_examples.sh
similarity index 100%
rename from antora/components/ug/sync_examples.sh
rename to core/_adoc-ug/sync_examples.sh
diff --git a/site.yml b/site.yml
index c713813..71a6bc5 100644
--- a/site.yml
+++ b/site.yml
@@ -6,7 +6,7 @@ site:
 content:
   sources:
   - url: .
-    start_path: antora/components/ug
+    start_path: core/_adoc-ug
     branches: HEAD
   - url: .
     start_path: core/plugins/jdo/_adoc