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/11/12 05:05:25 UTC
[isis] branch master updated: ISIS-2062: reorganises extensions
directories, doc improvements
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 10ac4b9 ISIS-2062: reorganises extensions directories, doc improvements
10ac4b9 is described below
commit 10ac4b99a85ded111b8ec4ca98e60c458a7314b9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Nov 11 23:44:40 2019 +0100
ISIS-2062: reorganises extensions directories, doc improvements
---
antora/components/core/antora.yml | 2 +-
antora/components/extensions/antora.yml | 2 +-
antora/components/mignotes/antora.yml | 2 +-
antora/components/refguide/antora.yml | 2 +-
antora/components/relnotes/antora.yml | 2 +-
antora/components/security/antora.yml | 2 +-
antora/components/testing/antora.yml | 2 +-
antora/components/toc/antora.yml | 2 +-
.../toc/modules/ROOT/pages/components.adoc | 2 +-
antora/components/userguide/antora.yml | 2 +-
.../jaxrs-resteasy-4/partials/module-nav.adoc | 2 +-
.../doc/modules/ROOT/partials/component-nav.adoc | 6 +-
.../main/doc/modules/ROOT/partials/module-nav.adoc | 30 ++++----
.../doc/modules/ROOT/partials/component-nav.adoc | 9 ++-
.../main/doc/modules/ROOT/partials/module-nav.adoc | 81 ++++++++++-----------
examples/apps/demo/pom.xml | 2 +-
extensions/asciidoc/src/main/doc/antora.yml | 3 -
extensions/{ => core}/incubator/pom.xml | 0
.../incubator}/src/main/doc/antora.yml | 0
.../main/doc/modules/incubator}/_attributes.adoc | 0
.../doc/modules/incubator/attachments}/.gitkeep | 0
.../main/doc/modules/incubator}/examples/.gitkeep | 0
.../main/doc/modules/incubator/images}/.gitkeep | 0
.../src/main/doc/modules/incubator}/nav.adoc | 0
.../doc/modules/incubator/pages}/_attributes.adoc | 0
.../main/doc/modules/incubator/pages/about.adoc | 0
.../modules/incubator/partials}/_attributes.adoc | 0
.../doc/modules/incubator/partials/module-nav.adoc | 0
.../org/apache/isis/applib/annotation/Model.java | 0
.../incubator/IncubatorMetaModelPlugin.java | 0
.../extensions/incubator/IsisBootIncubator.java | 0
.../SupportingMethodValidatorRefinerFactory.java | 0
extensions/{ => core}/legacy/.gitignore | 0
extensions/{ => core}/legacy/pom.xml | 0
.../{ => core}/legacy/src/main/doc/antora.yml | 0
.../src/main/doc/modules/legacy}/_attributes.adoc | 0
.../main/doc/modules/legacy/attachments}/.gitkeep | 0
.../src/main/doc/modules/legacy}/examples/.gitkeep | 0
.../src/main/doc/modules/legacy/images}/.gitkeep | 0
.../legacy/src/main/doc/modules/legacy}/nav.adoc | 0
.../doc/modules/legacy/pages}/_attributes.adoc | 0
.../src/main/doc/modules/legacy/pages/about.adoc | 0
.../doc/modules/legacy/partials}/_attributes.adoc | 0
.../doc/modules/legacy/partials/module-nav.adoc | 0
.../java/org/apache/isis/applib/AppManifest.java | 0
.../apache/isis/applib/DomainObjectContainer.java | 0
.../java/org/apache/isis/applib/filter/Filter.java | 0
.../org/apache/isis/applib/filter/Filters.java | 0
.../background/BackgroundCommandService2.java | 0
.../services/background/BackgroundService.java | 0
.../services/background/BackgroundService2.java | 0
.../services/eventbus/ActionDomainEvent.java | 0
.../services/eventbus/CollectionDomainEvent.java | 0
.../services/eventbus/PropertyDomainEvent.java | 0
.../FutureWithIndexIntoFutureOfList.java | 0
.../threadpool/ThreadPoolExecutionMode.java | 0
.../internal/threadpool/ThreadPoolSizeAdvisor.java | 0
.../internal/threadpool/ThreadPoolSupport.java | 0
.../isis/core/runtime/snapshot/DomSerializer.java | 0
.../core/runtime/snapshot/DomSerializerJaxp.java | 0
.../isis/core/runtime/sysout/SystemPrinter.java | 0
.../system/persistence/LoggingLocation.java | 0
.../runtime/system/persistence/ObjectFactory.java | 0
.../system/persistence/SuspendableListener.java | 0
.../apache/isis/runtime/viewer/package-info.java | 0
.../viewer/web/AbstractServletOrFilterMapping.java | 0
.../runtime/viewer/web/FilterSpecification.java | 0
.../runtime/viewer/web/ServletSpecification.java | 0
.../runtime/viewer/web/WebAppSpecification.java | 0
.../internal/threadpool/ThreadPoolSupportTest.java | 0
extensions/{ => core}/spring/pom.xml | 0
.../spring}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/spring/_attributes.adoc | 0
.../main/doc/modules/spring/attachments}/.gitkeep | 0
.../src/main/doc/modules/spring/examples/.gitkeep | 0
.../src/main/doc/modules/spring/images}/.gitkeep | 0
.../spring/src/main/doc/modules/spring/nav.adoc | 0
.../doc/modules/spring/pages}/_attributes.adoc | 0
.../src/main/doc/modules/spring/pages/about.adoc | 0
.../doc/modules/spring/partials}/_attributes.adoc | 0
.../doc/modules/spring/partials/module-nav.adoc | 0
.../isis/extensions/spring/ExtSpringModule.java | 0
.../extensions/spring/service/BeanDescriptor.java | 0
.../extensions/spring/service/ContextBeans.java | 0
.../spring/service/SpringBeansService.java | 0
extensions/markdown/src/main/doc/antora.yml | 3 -
extensions/pom.xml | 23 +++---
.../secman/api/src/main/doc/modules/api/nav.adoc | 1 -
.../main/doc/modules/encryption-jbcrypt/nav.adoc | 1 -
.../model/src/main/doc/modules/model/nav.adoc | 1 -
.../src/main/doc/modules/persistence-jdo/nav.adoc | 1 -
.../src/main/doc/modules/realm-shiro/nav.adoc | 1 -
extensions/{ => security}/secman/api/pom.xml | 0
.../secman/api}/src/main/doc/antora.yml | 0
.../api/src/main/doc/modules/api}/_attributes.adoc | 0
.../src/main/doc/modules/api/attachments}/.gitkeep | 0
.../src/main/doc/modules/api}/examples/.gitkeep | 0
.../api/src/main/doc/modules/api/images}/.gitkeep | 0
.../secman/api/src/main/doc/modules/api}/nav.adoc | 0
.../main/doc/modules/api/pages}/_attributes.adoc | 0
.../api/src/main/doc/modules/api/pages/about.adoc | 0
.../doc/modules/api/partials}/_attributes.adoc | 0
.../main/doc/modules/api/partials/module-nav.adoc | 0
.../isis/extensions/secman/api/SecurityModule.java | 0
.../secman/api/SecurityModuleConfig.java | 0
.../isis/extensions/secman/api/SecurityRealm.java | 0
.../secman/api/SecurityRealmCharacteristic.java | 0
.../secman/api/SecurityRealmService.java | 0
.../api/encryption/PasswordEncryptionService.java | 0
.../encryption/PasswordEncryptionServiceNone.java | 0
.../api/permission/ApplicationPermission.java | 0
.../api/permission/ApplicationPermissionMode.java | 0
.../ApplicationPermissionRepository.java | 0
.../api/permission/ApplicationPermissionRule.java | 0
.../api/permission/ApplicationPermissionValue.java | 0
.../permission/ApplicationPermissionValueSet.java | 0
.../permission/PermissionsEvaluationService.java | 0
.../PermissionsEvaluationServiceAbstract.java | 0
...PermissionsEvaluationServiceAllowBeatsVeto.java | 0
...PermissionsEvaluationServiceVetoBeatsAllow.java | 0
.../secman/api/role/ApplicationRole.java | 0
.../secman/api/role/ApplicationRoleRepository.java | 0
.../secman/api/tenancy/ApplicationTenancy.java | 0
.../api/tenancy/ApplicationTenancyEvaluator.java | 0
.../api/tenancy/ApplicationTenancyRepository.java | 0
.../extensions/secman/api/tenancy/HasAtPath.java | 0
.../extensions/secman/api/user/AccountType.java | 0
.../secman/api/user/ApplicationUser.java | 0
.../secman/api/user/ApplicationUserRepository.java | 0
.../secman/api/user/ApplicationUserStatus.java | 0
.../secman/encryption-jbcrypt/pom.xml | 0
.../encryption-jbcrypt}/src/main/doc/antora.yml | 0
.../modules/encryption-jbcrypt}/_attributes.adoc | 0
.../encryption-jbcrypt/attachments}/.gitkeep | 0
.../modules/encryption-jbcrypt}/examples/.gitkeep | 0
.../modules/encryption-jbcrypt/images}/.gitkeep | 0
.../main/doc/modules/encryption-jbcrypt}/nav.adoc | 0
.../encryption-jbcrypt/pages}/_attributes.adoc | 0
.../modules/encryption-jbcrypt/pages/about.adoc | 0
.../encryption-jbcrypt/partials}/_attributes.adoc | 0
.../encryption-jbcrypt/partials/module-nav.adoc | 0
.../jbcrypt/IsisBootSecmanEncryptionJbcrypt.java | 0
.../PasswordEncryptionServiceUsingJBcrypt.java | 0
extensions/{ => security}/secman/model/pom.xml | 0
.../secman/model/src/main/doc/antora.yml | 0
.../src/main/doc/modules/model}/_attributes.adoc | 0
.../main/doc/modules/model/attachments}/.gitkeep | 0
.../src/main/doc/modules/model}/examples/.gitkeep | 0
.../src/main/doc/modules/model/images}/.gitkeep | 0
.../model/src/main/doc/modules/model}/nav.adoc | 0
.../main/doc/modules/model/pages}/_attributes.adoc | 0
.../src/main/doc/modules/model/pages/about.adoc | 0
.../doc/modules/model/partials}/_attributes.adoc | 0
.../doc/modules/model/partials/module-nav.adoc | 0
.../secman/model/IsisBootSecmanModel.java | 0
.../secman/model/app/feature/ApplicationClass.java | 0
.../model/app/feature/ApplicationClass.layout.xml | 0
.../model/app/feature/ApplicationClassAction.java | 0
.../app/feature/ApplicationClassAction.layout.xml | 0
.../app/feature/ApplicationClassCollection.java | 0
.../feature/ApplicationClassCollection.layout.xml | 0
.../model/app/feature/ApplicationClassMember.java | 0
.../app/feature/ApplicationClassProperty.java | 0
.../feature/ApplicationClassProperty.layout.xml | 0
.../app/feature/ApplicationFeatureViewModel.java | 0
.../app/feature/ApplicationFeatureViewModels.java | 0
.../model/app/feature/ApplicationPackage.java | 0
.../app/feature/ApplicationPackage.layout.xml | 0
.../app/feature/ApplicationPermission_feature.java | 0
.../user/ApplicationUser_filterPermissions.java | 0
.../app/user/ApplicationUser_permissions.java | 0
.../secman/model/app/user/MeService.java | 0
.../model/app/user/UserPermissionViewModel.java | 0
.../app/user/UserPermissionViewModel.layout.xml | 0
.../dom/permission/ApplicationPermissionMenu.java | 0
.../secman/model/dom/role/ApplicationRoleMenu.java | 0
.../model/dom/tenancy/ApplicationTenancyMenu.java | 0
.../secman/model/dom/user/ApplicationUserMenu.java | 0
.../secman/model/dom/user/HasUsername_open.java | 0
.../model/facets/TenantedAuthorizationFacet.java | 0
.../facets/TenantedAuthorizationFacetDefault.java | 0
.../facets/TenantedAuthorizationFacetFactory.java | 0
.../persistence-jdo/logging-dn-enhance.properties | 0
.../{ => security}/secman/persistence-jdo/pom.xml | 0
.../persistence-jdo}/src/main/doc/antora.yml | 0
.../doc/modules/persistence-jdo/_attributes.adoc | 0
.../modules/persistence-jdo/attachments}/.gitkeep | 0
.../doc/modules/persistence-jdo/examples/.gitkeep | 0
.../doc/modules/persistence-jdo/images}/.gitkeep | 0
.../src/main/doc/modules/persistence-jdo}/nav.adoc | 0
.../persistence-jdo/pages}/_attributes.adoc | 0
.../doc/modules/persistence-jdo/pages/about.adoc | 0
.../persistence-jdo/partials}/_attributes.adoc | 0
.../persistence-jdo/partials/module-nav.adoc | 0
.../secman/jdo/IsisBootSecmanPersistenceJdo.java | 0
.../isis/extensions/secman/jdo/dom/package.jdo | 0
.../jdo/dom/permission/ApplicationPermission.java | 0
.../permission/ApplicationPermission.layout.xml | 0
.../permission/ApplicationPermissionFactory.java | 0
.../ApplicationPermissionRepository.java | 0
.../secman/jdo/dom/role/ApplicationRole.java | 0
.../secman/jdo/dom/role/ApplicationRole.layout.xml | 0
.../jdo/dom/role/ApplicationRoleFactory.java | 0
.../jdo/dom/role/ApplicationRoleRepository.java | 0
.../secman/jdo/dom/tenancy/ApplicationTenancy.java | 0
.../jdo/dom/tenancy/ApplicationTenancy.layout.xml | 0
.../jdo/dom/tenancy/ApplicationTenancyFactory.java | 0
.../dom/tenancy/ApplicationTenancyRepository.java | 0
.../secman/jdo/dom/user/ApplicationUser.java | 0
.../secman/jdo/dom/user/ApplicationUser.layout.xml | 0
.../jdo/dom/user/ApplicationUserFactory.java | 0
.../jdo/dom/user/ApplicationUserRepository.java | 0
.../secman/jdo/seed/SeedSecurityModuleService.java | 0
.../jdo/seed/SeedUsersAndRolesFixtureScript.java | 0
.../AbstractRoleAndPermissionsFixtureScript.java | 0
.../seed/scripts/AbstractTenancyFixtureScript.java | 0
.../scripts/AbstractUserAndRolesFixtureScript.java | 0
.../secman/jdo/seed/scripts/GlobalTenancy.java | 0
...IsisApplibFixtureResultsRoleAndPermissions.java | 0
.../IsisModuleSecurityAdminRoleAndPermissions.java | 0
.../seed/scripts/IsisModuleSecurityAdminUser.java | 0
...sisModuleSecurityFixtureRoleAndPermissions.java | 0
...oduleSecurityRegularUserRoleAndPermissions.java | 0
...tyModuleAppUserRegistrationServiceAbstract.java | 0
.../main/resources/images/ApplicationFeature.png | Bin
.../main/resources/images/ApplicationPassword.png | Bin
.../resources/images/ApplicationPermission.png | Bin
.../src/main/resources/images/ApplicationRole.png | Bin
.../main/resources/images/ApplicationTenancy.png | Bin
.../src/main/resources/images/ApplicationUser.png | Bin
.../src/main/resources/images/UserPermission.png | Bin
.../images/pdn/UserPermissionViewModel.pdn | Bin
.../src/main/resources/images/zip/key_security.zip | Bin
.../src/main/resources/images/zip/outline_star.zip | Bin
.../main/resources/images/zip/question_shield.zip | Bin
.../main/resources/images/zip/theatre_masks.zip | Bin
.../src/main/resources/images/zip/user.zip | Bin
.../resources/images/zip/worldwide_location.zip | Bin
extensions/{ => security}/secman/pom.xml | 0
.../{ => security}/secman/realm-shiro/pom.xml | 0
.../secman/realm-shiro}/src/main/doc/antora.yml | 0
.../main/doc/modules/realm-shiro}/_attributes.adoc | 0
.../doc/modules/realm-shiro/attachments}/.gitkeep | 0
.../doc/modules/realm-shiro}/examples/.gitkeep | 0
.../main/doc/modules/realm-shiro/images}/.gitkeep | 0
...s-security-module-realm-with-delegate-realm.PNG | Bin
...iro-to-use-isisaddons-security-module-realm.PNG | Bin
.../src/main/doc/modules/realm-shiro}/nav.adoc | 0
.../modules/realm-shiro/pages}/_attributes.adoc | 0
.../main/doc/modules/realm-shiro/pages/about.adoc | 0
.../modules/realm-shiro/partials}/_attributes.adoc | 0
.../modules/realm-shiro/partials/module-nav.adoc | 0
.../secman/shiro/AuthInfoForApplicationUser.java | 0
...ticationStrategyForIsisModuleSecurityRealm.java | 0
.../secman/shiro/IsisBootSecmanRealmShiro.java | 0
.../secman/shiro/IsisModuleSecurityRealm.java | 0
.../secman/shiro/PermissionForMember.java | 0
.../PermissionResolverForIsisShiroAuthorizor.java | 0
...lCollectionForApplicationUserOnSingleRealm.java | 0
...inglePrincipalForApplicationUserInAnyRealm.java | 0
.../secman/shiro/PrincipalForApplicationUser.java | 0
.../shiro/SecurityRealmServiceUsingShiro.java | 0
.../isis/extensions/secman/shiro/ShiroUtils.java | 0
.../{ => security}/secman/src/main/doc/antora.yml | 0
.../src/main/doc/modules/ROOT}/_attributes.adoc | 0
.../main/doc/modules/ROOT/attachments}/.gitkeep | 0
.../src/main/doc/modules/ROOT}/examples/.gitkeep | 0
.../src/main/doc/modules/ROOT/images}/.gitkeep | 0
.../secman/src/main/doc/modules/ROOT/nav.adoc | 0
.../main/doc/modules/ROOT/pages}/_attributes.adoc | 0
.../src/main/doc/modules/ROOT/pages/about.adoc | 0
.../doc/modules/ROOT/partials}/_attributes.adoc | 0
.../doc/modules/ROOT/partials/component-nav.adoc | 0
.../main/doc/modules/ROOT/partials/module-nav.adoc | 0
extensions/sse/src/main/doc/antora.yml | 6 --
extensions/sse/src/main/doc/modules/sse/nav.adoc | 2 -
extensions/{ => testing}/fixtures/pom.xml | 0
.../fixtures}/src/main/doc/antora.yml | 0
.../doc/modules/ext-fixtures}/_attributes.adoc | 0
.../doc/modules/ext-fixtures/attachments}/.gitkeep | 0
.../doc/modules/ext-fixtures}/examples/.gitkeep | 0
.../main/doc/modules/ext-fixtures/images}/.gitkeep | 0
.../doc/modules/ext-fixtures/images/composite.png | Bin
.../doc/modules/ext-fixtures/images/flat-1.png | Bin
.../doc/modules/ext-fixtures/images/flat-2.png | Bin
.../images/organizing-fixture-scripts.pptx | Bin
.../images/prompt-specifying-number.png | Bin
.../doc/modules/ext-fixtures/images/prompt.png | Bin
.../ext-fixtures/images/prototyping-menu.png | Bin
.../modules/ext-fixtures/images/result-list.png | Bin
.../src/main/doc/modules/ext-fixtures}/nav.adoc | 0
.../modules/ext-fixtures/pages}/_attributes.adoc | 0
.../main/doc/modules/ext-fixtures/pages/about.adoc | 0
.../pages/fixture-scripts}/_attributes.adoc | 0
.../pages/fixture-scripts/api-and-usage.adoc | 0
.../pages/fixture-scripts/sudo-service.adoc | 0
.../fixture-scripts/ticking-clock-fixture.adoc | 0
.../ext-fixtures/partials}/_attributes.adoc | 0
.../modules/ext-fixtures/partials/module-nav.adoc | 0
.../fixtures/FixturesLifecycleService.java | 0
.../isis/extensions/fixtures/IsisBootFixtures.java | 0
.../IsisIntegrationTestAbstractWithFixtures.java | 0
.../api/FixtureScriptWithExecutionStrategy.java | 0
.../fixtures/api/PersonaWithBuilderScript.java | 0
.../extensions/fixtures/api/PersonaWithFinder.java | 0
.../isis/extensions/fixtures/api/WithPrereqs.java | 0
.../isis/extensions/fixtures/api/package-info.java | 0
.../fixtures/events/FixturesInstalledEvent.java | 0
.../fixtures/events/FixturesInstallingEvent.java | 0
.../fixturescripts/BuilderScriptAbstract.java | 0
.../fixturescripts/BuilderScriptWithResult.java | 0
.../fixturescripts/BuilderScriptWithoutResult.java | 0
.../fixturescripts/DiscoverableFixtureScript.java | 0
.../fixturescripts/ExecutionParameters.java | 0
.../fixturescripts/ExecutionParametersService.java | 0
.../fixtures/fixturescripts/FixtureResult.java | 0
.../fixturescripts/FixtureResult.layout.xml | 0
.../fixtures/fixturescripts/FixtureResultList.java | 0
.../fixtures/fixturescripts/FixtureScript.java | 0
.../fixtures/fixturescripts/FixtureScripts.java | 0
.../fixturescripts/SimpleFixtureScript.java | 0
.../fixturespec/FixtureScriptsDefault.java | 0
.../fixturespec/FixtureScriptsSpecification.java | 0
.../FixtureScriptsSpecificationProvider.java | 0
.../fixtures/fixturespec/package-info.java | 0
.../extensions/fixtures/legacy/FixtureClock.java | 0
.../fixtures/legacy/TickingFixtureClock.java | 0
.../fixtures/legacy/clock/ClockFixture.java | 0
.../fixtures/legacy/clock/TickingClockFixture.java | 0
.../extensions/fixtures/legacy/package-info.java | 0
.../QueryResultsCacheControlInternal.java | 0
.../legacy/setup/PersonaEnumPersistAll.java | 0
.../legacy/teardown/TeardownFixtureAbstract.java | 0
.../legacy/teardown/TeardownFixtureAbstract2.java | 0
.../isis/extensions/fixtures/module/Module.java | 0
.../extensions/fixtures/module/ModuleService.java | 0
.../fixtures/src/main/resources}/prism.css | 0
.../fixtures/src/main/resources}/prism1.14.js | 0
.../fixturescripts/ExecutionContextTest.java | 0
.../ExecutionParameters_AsKeyValueMap_Test.java | 0
.../fixturescripts/ExecutionParameters_Test.java | 0
.../legacy/FixtureClockInstantiationTest.java | 0
extensions/{ => testing}/specsupport/pom.xml | 0
.../specsupport}/src/main/doc/antora.yml | 0
.../doc/modules/ext-specsupport}/_attributes.adoc | 0
.../modules/ext-specsupport/attachments}/.gitkeep | 0
.../doc/modules/ext-specsupport}/examples/.gitkeep | 0
.../doc/modules/ext-specsupport/images}/.gitkeep | 0
.../src/main/doc/modules/ext-specsupport}/nav.adoc | 0
.../ext-specsupport/pages}/_attributes.adoc | 0
.../doc/modules/ext-specsupport/pages/about.adoc | 0
.../pages/bdd-spec-support}/_attributes.adoc | 0
.../pages/bdd-spec-support/how-it-works.adoc | 0
.../bdd-spec-support/maven-configuration.adoc | 0
.../pages/bdd-spec-support/writing-a-bdd-spec.adoc | 0
.../ext-specsupport/partials}/_attributes.adoc | 0
.../ext-specsupport/partials/module-nav.adoc | 0
.../specsupport/ObjectFactoryForIntegration.java | 0
.../java/org/apache/isis/specsupport/specs/V.java | 0
.../viewer-wicket-excel/src/main/doc/antora.yml | 3 -
.../ext-viewer-wicket-excel/pages/about.adoc | 6 --
.../partials/module-nav.adoc | 2 -
extensions/{ => vro}/restclient/pom.xml | 0
.../{ => vro}/restclient/src/main/doc/antora.yml | 1 -
.../main/doc/modules/restclient}/_attributes.adoc | 0
.../doc/modules/restclient/attachments}/.gitkeep | 0
.../main/doc/modules/restclient}/examples/.gitkeep | 0
.../main/doc/modules/restclient/images}/.gitkeep | 0
.../src/main/doc/modules/restclient/nav.adoc | 0
.../doc/modules/restclient/pages}/_attributes.adoc | 0
.../main/doc/modules/restclient/pages/about.adoc | 0
.../modules/restclient/partials}/_attributes.adoc | 0
.../modules/restclient/partials/module-nav.adoc | 0
.../restclient/ActionParameterListBuilder.java | 0
.../isis/extensions/restclient/ResponseDigest.java | 0
.../isis/extensions/restclient/RestfulClient.java | 0
.../extensions/restclient/RestfulClientConfig.java | 0
.../restclient/RestfulClientException.java | 0
.../isis/extensions/restclient/ScalarValueDto.java | 0
.../restclient/auth/BasicAuthFilter.java | 0
.../restclient/log/RestfulLoggingFilter.java | 0
extensions/{ => vw}/asciidoc/pom.xml | 0
.../asciidoc}/src/main/doc/antora.yml | 2 +-
.../main/doc/modules/asciidoc}/_attributes.adoc | 0
.../doc/modules/asciidoc/attachments}/.gitkeep | 0
.../main/doc/modules/asciidoc}/examples/.gitkeep | 0
.../src/main/doc/modules/asciidoc/images}/.gitkeep | 0
.../src/main/doc/modules/asciidoc}/nav.adoc | 0
.../doc/modules/asciidoc/pages}/_attributes.adoc | 0
.../src/main/doc/modules/asciidoc/pages/about.adoc | 0
.../modules/asciidoc/partials}/_attributes.adoc | 0
.../doc/modules/asciidoc/partials/module-nav.adoc | 0
.../apache/isis/extensions/asciidoc/AsciiDoc.java | 0
.../extensions/asciidoc/AsciiDocComponent.java | 0
.../extensions/asciidoc/AsciiDocConverter.java | 0
.../asciidoc/AsciiDocPanelFactoriesForWicket.java | 0
.../apache/isis/extensions/asciidoc/css}/prism.css | 0
.../isis/extensions/asciidoc/js}/prism1.14.js | 0
...g.apache.isis.viewer.wicket.ui.ComponentFactory | 0
.../exceldownload}/pom.xml | 4 +-
.../exceldownload}/src/main/doc/antora.yml | 2 +-
.../doc/modules/exceldownload}/_attributes.adoc | 0
.../modules/exceldownload/attachments}/.gitkeep | 0
.../doc/modules/exceldownload}/examples/.gitkeep | 0
.../doc/modules/exceldownload/images}/.gitkeep | 0
.../src/main/doc/modules/exceldownload}/nav.adoc | 0
.../modules/exceldownload/pages}/_attributes.adoc | 0
.../doc/modules/exceldownload}/pages/about.adoc | 5 +-
.../exceldownload/partials}/_attributes.adoc | 0
.../modules/exceldownload/partials/module-nav.adoc | 2 +
.../wicket/excel/CollectionContentsAsExcel.css | 0
.../wicket/excel/CollectionContentsAsExcel.html | 0
.../wicket/excel/CollectionContentsAsExcel.java | 0
.../excel/CollectionContentsAsExcelFactory.java | 0
.../viewer/wicket/excel/ExcelFileDownloadLink.java | 0
.../viewer/wicket/excel/ExcelFileModel.java | 0
.../viewer/wicket/excel/ExcelUiModule.java | 0
.../viewer/wicket/excel/Util_TimeConversion.java | 0
...g.apache.isis.viewer.wicket.ui.ComponentFactory | 0
extensions/{ => vw}/markdown/pom.xml | 0
.../markdown}/src/main/doc/antora.yml | 2 +-
.../main/doc/modules/markdown}/_attributes.adoc | 0
.../doc/modules/markdown/attachments}/.gitkeep | 0
.../main/doc/modules/markdown}/examples/.gitkeep | 0
.../src/main/doc/modules/markdown/images}/.gitkeep | 0
.../src/main/doc/modules/markdown}/nav.adoc | 0
.../doc/modules/markdown/pages}/_attributes.adoc | 0
.../main/doc/modules/markdown}/pages/about.adoc | 0
.../modules/markdown/partials}/_attributes.adoc | 0
.../doc/modules/markdown/partials/module-nav.adoc | 0
.../apache/isis/extensions/markdown/Markdown.java | 0
.../extensions/markdown/MarkdownComponent.java | 0
.../extensions/markdown/MarkdownConverter.java | 0
.../markdown/MarkdownPanelFactoriesForWicket.java | 0
.../apache/isis/extensions/markdown}/css/prism.css | 0
.../isis/extensions/markdown}/js/prism1.14.js | 0
...g.apache.isis.viewer.wicket.ui.ComponentFactory | 0
extensions/{ => vw}/sse/pom.xml | 0
.../sse}/src/main/doc/antora.yml | 2 +-
.../sse/src/main/doc/modules/sse}/_attributes.adoc | 0
.../src/main/doc/modules/sse/attachments}/.gitkeep | 0
.../src/main/doc/modules/sse}/examples/.gitkeep | 0
.../sse/src/main/doc/modules/sse/images}/.gitkeep | 0
.../sse/src/main/doc/modules/sse}/nav.adoc | 1 +
.../main/doc/modules/sse/pages}/_attributes.adoc | 0
.../sse/src/main/doc/modules/sse}/pages/about.adoc | 0
.../doc/modules/sse/partials}/_attributes.adoc | 0
.../main/doc/modules/sse/partials/module-nav.adoc | 2 +
.../apache/isis/extensions/sse/IsisBootSse.java | 0
.../isis/extensions/sse/SseMetaModelPlugin.java | 0
.../isis/extensions/sse/api/ServerSentEvents.java | 0
.../apache/isis/extensions/sse/api/SseChannel.java | 0
.../apache/isis/extensions/sse/api/SseService.java | 0
.../apache/isis/extensions/sse/api/SseSource.java | 0
.../sse/facets/SseAnnotationFacetFactory.java | 0
.../extensions/sse/facets/SseObserveFacet.java | 0
.../sse/facets/SseObserveFacetAbstract.java | 0
...eObserveFacetForServerSentEventsAnnotation.java | 0
.../extensions/sse/markup/ListeningMarkup.java | 0
.../sse/markup/ListeningMarkupComponent.java | 0
.../markup/ListeningMarkupComponent_observing.java | 0
.../ListeningMarkupPanelFactoriesForWicket.java | 0
.../extensions/sse/markup/js/ObservingComponent.js | 0
.../extensions/sse/services/SseServiceDefault.java | 0
.../sse/webapp/ServerSentEventsServlet.java | 0
.../sse/webapp/WebModuleServerSentEvents.java | 0
...g.apache.isis.viewer.wicket.ui.ComponentFactory | 0
site-scratch.yml | 2 +-
site.yml | 32 ++++----
469 files changed, 117 insertions(+), 143 deletions(-)
diff --git a/antora/components/core/antora.yml b/antora/components/core/antora.yml
index a2e0603..85810b9 100644
--- a/antora/components/core/antora.yml
+++ b/antora/components/core/antora.yml
@@ -1,5 +1,5 @@
name: core
-title: Core
+title: "Internals - Core"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
index 2169a87..63bebe6 100644
--- a/antora/components/extensions/antora.yml
+++ b/antora/components/extensions/antora.yml
@@ -1,5 +1,5 @@
name: extensions
-title: Extensions
+title: "Internals - Extensions"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/mignotes/antora.yml b/antora/components/mignotes/antora.yml
index 8b3e0cd..c6ee739 100644
--- a/antora/components/mignotes/antora.yml
+++ b/antora/components/mignotes/antora.yml
@@ -1,5 +1,5 @@
name: mignotes
-title: Migration Notes
+title: "Releases - Migration Notes"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/refguide/antora.yml b/antora/components/refguide/antora.yml
index 29d2bb6..1b9b964 100644
--- a/antora/components/refguide/antora.yml
+++ b/antora/components/refguide/antora.yml
@@ -1,5 +1,5 @@
name: refguide
-title: "Guides - Reference Guides"
+title: "Reference Guide"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/relnotes/antora.yml b/antora/components/relnotes/antora.yml
index d9e4009..b1f98e5 100644
--- a/antora/components/relnotes/antora.yml
+++ b/antora/components/relnotes/antora.yml
@@ -1,5 +1,5 @@
name: relnotes
-title: Release Notes
+title: "Releases - Release Notes"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/security/antora.yml b/antora/components/security/antora.yml
index da72999..d13a222 100644
--- a/antora/components/security/antora.yml
+++ b/antora/components/security/antora.yml
@@ -1,5 +1,5 @@
name: security
-title: "Security"
+title: "Security Guide"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/testing/antora.yml b/antora/components/testing/antora.yml
index f626323..dd10636 100644
--- a/antora/components/testing/antora.yml
+++ b/antora/components/testing/antora.yml
@@ -1,6 +1,6 @@
name: testing
+title: "Testing Guide"
version: master
-title: "Testing"
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/toc/antora.yml b/antora/components/toc/antora.yml
index c4643e0..ff7b8b6 100644
--- a/antora/components/toc/antora.yml
+++ b/antora/components/toc/antora.yml
@@ -1,5 +1,5 @@
name: toc
-title: Table of Contents
+title: "Table of Contents"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/toc/modules/ROOT/pages/components.adoc b/antora/components/toc/modules/ROOT/pages/components.adoc
index e4fa7df..eced74e 100644
--- a/antora/components/toc/modules/ROOT/pages/components.adoc
+++ b/antora/components/toc/modules/ROOT/pages/components.adoc
@@ -12,7 +12,7 @@ This page provides user/config guides for each of the main components of the fra
_Extensions:_
-* xref:vw:ext-viewer-wicket-excel:about.adoc[Excel Download]
+* xref:vw:excel-download:about.adoc[Excel Download]
* xref:vw:asciidoc:about.adoc[Asciidoc value type ]
* xref:vw:markdown:about.adoc[Markdown value type]
* xref:ext-sse:ROOT:about.adoc[Server Sent Events]
diff --git a/antora/components/userguide/antora.yml b/antora/components/userguide/antora.yml
index 5598246..c22a21e 100644
--- a/antora/components/userguide/antora.yml
+++ b/antora/components/userguide/antora.yml
@@ -1,5 +1,5 @@
name: userguide
-title: "Fundamentals & Beyond"
+title: "User Guide"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/core/plugins/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc b/core/plugins/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
index e9750a5..efa02a3 100644
--- a/core/plugins/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
+++ b/core/plugins/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
@@ -1 +1 @@
-* xref:core:jaxrs-resteasy-4:about.adoc[Core: JAX-RS: RestEasy v4]
+* xref:vro:jaxrs-resteasy-4:about.adoc[JAX-RS: RestEasy v4]
diff --git a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
index 781941a..750f7e6 100644
--- a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1 +1,5 @@
-include::vw:ROOT:partial$module-nav.adoc[]
+include::vro:ROOT:partial$module-nav.adoc[]
+include::vro:jaxrs-resteasy-4:partial$module-nav.adoc[]
+
+* Extensions
+** xref:vro:restclient:about.adoc[REST Client]
diff --git a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
index 8ff4d9b..2162b36a 100644
--- a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
+++ b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
@@ -1,27 +1,25 @@
-* xref:vro:ROOT:about.adoc[Restful Objects Viewer]
+* xref:vro:ROOT:ro-spec.adoc[RO Spec]
-** xref:vro:ROOT:ro-spec.adoc[RO Spec]
+* xref:vro:ROOT:architecture.adoc[Architecture]
-** xref:vro:ROOT:architecture.adoc[Architecture]
+* xref:vro:ROOT:layout-resources.adoc[Layout Resources]
-** xref:vro:ROOT:layout-resources.adoc[Layout Resources]
+* xref:vro:ROOT:health-check.adoc[Health Check]
-** xref:vro:ROOT:health-check.adoc[Health Check]
+* xref:vro:ROOT:simplified-representations.adoc[Simplified Representations]
-** xref:vro:ROOT:simplified-representations.adoc[Simplified Representations]
+* xref:vro:ROOT:configuration-properties.adoc[Configuration Properties]
-** xref:vro:ROOT:configuration-properties.adoc[Configuration Properties]
+* xref:vro:ROOT:security.adoc[Hints-n-Tips]
-** xref:vro:ROOT:security.adoc[Hints-n-Tips]
+* xref:vro:ROOT:hints-and-tips.adoc[Hints-n-Tips]
-** xref:vro:ROOT:hints-and-tips.adoc[Hints-n-Tips]
-
-*** xref:vro:ROOT:hints-and-tips/using-chrome-devtools.adoc[Using Chrome DevTools]
-*** xref:vro:ROOT:hints-and-tips/angular-tips.adoc[Angular Tips]
-*** xref:vro:ROOT:hints-and-tips/pretty-printing.adoc[Pretty Printing]
-*** xref:vro:ROOT:hints-and-tips/restful-image-property.adoc[Restful Image Property]
-*** xref:vro:ROOT:hints-and-tips/view-model-as-parameter.adoc[View Model as Parameter]
-*** xref:vro:ROOT:hints-and-tips/troubleshooting.adoc[Troubleshooting]
+** xref:vro:ROOT:hints-and-tips/using-chrome-devtools.adoc[Using Chrome DevTools]
+** xref:vro:ROOT:hints-and-tips/angular-tips.adoc[Angular Tips]
+** xref:vro:ROOT:hints-and-tips/pretty-printing.adoc[Pretty Printing]
+** xref:vro:ROOT:hints-and-tips/restful-image-property.adoc[Restful Image Property]
+** xref:vro:ROOT:hints-and-tips/view-model-as-parameter.adoc[View Model as Parameter]
+** xref:vro:ROOT:hints-and-tips/troubleshooting.adoc[Troubleshooting]
//https://lists.apache.org/thread.html/cbd18320bbf6e5c5e767283f9e675cf56e7f4692c109e1e79dbaa90a@%3Cusers.isis.apache.org%3E // FIXME: to add
diff --git a/core/viewer-wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/viewer-wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
index f76b1d4..b3e0eb7 100644
--- a/core/viewer-wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/viewer-wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1,4 +1,7 @@
include::vw:ROOT:partial$module-nav.adoc[]
-include::vw:asciidoc:partial$module-nav.adoc[]
-include::vw:markdown:partial$module-nav.adoc[]
-include::vw:ext-viewer-wicket-excel:partial$module-nav.adoc[]
+
+* Extensions
+** xref:vw:asciidoc:about.adoc[Asciidoc]
+** xref:vw:markdown:about.adoc[Markdown]
+** xref:vw:excel-download:about.adoc[Excel Download]
+** xref:vw:sse:about.adoc[Server-side Events]
diff --git a/core/viewer-wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc b/core/viewer-wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc
index dce66d0..084869c 100644
--- a/core/viewer-wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc
+++ b/core/viewer-wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc
@@ -1,67 +1,64 @@
-* xref:vw:ROOT:about.adoc[Wicket Viewer]
+* xref:vw:ROOT:layout.adoc[Layout]
+** xref:vw:ROOT:layout/annotation-based.adoc[Annotation based]
+** xref:vw:ROOT:layout/file-based.adoc[File based]
+** xref:vw:ROOT:layout/table-columns.adoc[Table Columns]
-** xref:vw:ROOT:layout.adoc[Layout]
-*** xref:vw:ROOT:layout/annotation-based.adoc[Annotation based]
-*** xref:vw:ROOT:layout/file-based.adoc[File based]
-*** xref:vw:ROOT:layout/table-columns.adoc[Table Columns]
+* xref:vw:ROOT:menubars-layout.adoc[Menubars Layout]
+** xref:vw:ROOT:menubars-layout/annotation-based.adoc[Annotation-based]
+** xref:vw:ROOT:menubars-layout/file-based.adoc[File-based]
-** xref:vw:ROOT:menubars-layout.adoc[Menubars Layout]
-*** xref:vw:ROOT:menubars-layout/annotation-based.adoc[Annotation-based]
-*** xref:vw:ROOT:menubars-layout/file-based.adoc[File-based]
+* xref:vw:ROOT:configuration-properties.adoc[Configuration Properties]
-** xref:vw:ROOT:configuration-properties.adoc[Configuration Properties]
+* xref:vw:ROOT:features.adoc[End-user Features]
+** xref:vw:ROOT:features/sidebar-vs-modal-dialogs.adoc[Sidebar vs Modal Dialogs]
+** xref:vw:ROOT:features/recent-pages.adoc[Recent Pages]
+** xref:vw:ROOT:features/bookmarked-pages.adoc[Bookmarked Pages]
+** xref:vw:ROOT:features/hints-and-copy-url.adoc[Hints-and-copy URL]
+** xref:vw:ROOT:features/where-am-i.adoc[Where am I]
+** xref:vw:ROOT:features/titles-in-tables.adoc[Titles in Tables]
+** xref:vw:ROOT:features/blob-attachments.adoc[Blob Attachments]
+** xref:vw:ROOT:features/user-registration.adoc[User Registration]
-** xref:vw:ROOT:features.adoc[End-user Features]
-*** xref:vw:ROOT:features/sidebar-vs-modal-dialogs.adoc[Sidebar vs Modal Dialogs]
-*** xref:vw:ROOT:features/recent-pages.adoc[Recent Pages]
-*** xref:vw:ROOT:features/bookmarked-pages.adoc[Bookmarked Pages]
-*** xref:vw:ROOT:features/hints-and-copy-url.adoc[Hints-and-copy URL]
-*** xref:vw:ROOT:features/where-am-i.adoc[Where am I]
-*** xref:vw:ROOT:features/titles-in-tables.adoc[Titles in Tables]
-*** xref:vw:ROOT:features/blob-attachments.adoc[Blob Attachments]
-*** xref:vw:ROOT:features/user-registration.adoc[User Registration]
+* xref:vw:ROOT:security.adoc[Security]
-** xref:vw:ROOT:security.adoc[Security]
+* xref:vw:ROOT:customisation.adoc[Customisation]
+** xref:vw:ROOT:customisation/top-level-index-page.adoc[Top-level Index Page]
+** xref:vw:ROOT:customisation/brand-logo.adoc[Brand Logo]
+** xref:vw:ROOT:customisation/welcome-page.adoc[Welcome Page]
+** xref:vw:ROOT:customisation/about-page.adoc[About Page]
+** xref:vw:ROOT:customisation/tweaking-css-classes.adoc[Tweaking CSS Classes]
+** xref:vw:ROOT:customisation/cheap-n-cheerful-theme.adoc[Cheap-n-Cheerful Theme]
+** xref:vw:ROOT:customisation/using-different-css-file.adoc[Using Different CSS File]
+** xref:vw:ROOT:customisation/custom-javascript.adoc[Custom Javascript]
+** xref:vw:ROOT:customisation/auto-refresh.adoc[Auto Refresh]
+** xref:vw:ROOT:customisation/request-parameters.adoc[Request Parameters]
-** xref:vw:ROOT:customisation.adoc[Customisation]
-*** xref:vw:ROOT:customisation/top-level-index-page.adoc[Top-level Index Page]
-*** xref:vw:ROOT:customisation/brand-logo.adoc[Brand Logo]
-*** xref:vw:ROOT:customisation/welcome-page.adoc[Welcome Page]
-*** xref:vw:ROOT:customisation/about-page.adoc[About Page]
-*** xref:vw:ROOT:customisation/tweaking-css-classes.adoc[Tweaking CSS Classes]
-*** xref:vw:ROOT:customisation/cheap-n-cheerful-theme.adoc[Cheap-n-Cheerful Theme]
-*** xref:vw:ROOT:customisation/using-different-css-file.adoc[Using Different CSS File]
-*** xref:vw:ROOT:customisation/custom-javascript.adoc[Custom Javascript]
-*** xref:vw:ROOT:customisation/auto-refresh.adoc[Auto Refresh]
-*** xref:vw:ROOT:customisation/request-parameters.adoc[Request Parameters]
+* xref:vw:ROOT:extending.adoc[Extending]
+** xref:vw:ROOT:extending/custom-bootstrap-theme.adoc[Custom Bootstrap Theme]
+** xref:vw:ROOT:extending/replacing-page-elements.adoc[Replacing Page Elements]
+** xref:vw:ROOT:extending/custom-pages.adoc[Custom Pages]
+** xref:vw:ROOT:extending/login-via-query-args-prototyping.adoc[Login via Query Args Prototyping]
-** xref:vw:ROOT:extending.adoc[Extending]
-*** xref:vw:ROOT:extending/custom-bootstrap-theme.adoc[Custom Bootstrap Theme]
-*** xref:vw:ROOT:extending/replacing-page-elements.adoc[Replacing Page Elements]
-*** xref:vw:ROOT:extending/custom-pages.adoc[Custom Pages]
-*** xref:vw:ROOT:extending/login-via-query-args-prototyping.adoc[Login via Query Args Prototyping]
+* xref:vw:ROOT:hints-and-tips.adoc[Hints-n-Tips]
+** xref:vw:ROOT:hints-and-tips/per-user-themes.adoc[Per User Themes]
+** xref:vw:ROOT:hints-and-tips/i18n-label-in-wicket-viewer.adoc[i18n Label in Wicket Viewer]
+** xref:vw:ROOT:hints-and-tips/highlight-current-row.adoc[Highlight Current Row]
+** xref:vw:ROOT:hints-and-tips/svg-support.adoc[SVG Support]
-** xref:vw:ROOT:hints-and-tips.adoc[Hints-n-Tips]
-*** xref:vw:ROOT:hints-and-tips/per-user-themes.adoc[Per User Themes]
-*** xref:vw:ROOT:hints-and-tips/i18n-label-in-wicket-viewer.adoc[i18n Label in Wicket Viewer]
-*** xref:vw:ROOT:hints-and-tips/highlight-current-row.adoc[Highlight Current Row]
-*** xref:vw:ROOT:hints-and-tips/svg-support.adoc[SVG Support]
-** xref:vw:ROOT:incode-platform.adoc[Incode Platform]
-
diff --git a/examples/apps/demo/pom.xml b/examples/apps/demo/pom.xml
index 94c50ef..572d6e7 100644
--- a/examples/apps/demo/pom.xml
+++ b/examples/apps/demo/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-viewer-wicket-excel</artifactId>
+ <artifactId>isis-extensions-exceldownload</artifactId>
<version>${isis.version}</version>
</dependency>
diff --git a/extensions/asciidoc/src/main/doc/antora.yml b/extensions/asciidoc/src/main/doc/antora.yml
deleted file mode 100644
index 4b66e01..0000000
--- a/extensions/asciidoc/src/main/doc/antora.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: vw
-title: "Ascii Doctor Bundle"
-version: master
diff --git a/extensions/incubator/pom.xml b/extensions/core/incubator/pom.xml
similarity index 100%
rename from extensions/incubator/pom.xml
rename to extensions/core/incubator/pom.xml
diff --git a/extensions/spring/src/main/doc/antora.yml b/extensions/core/incubator/src/main/doc/antora.yml
similarity index 100%
rename from extensions/spring/src/main/doc/antora.yml
rename to extensions/core/incubator/src/main/doc/antora.yml
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/_attributes.adoc b/extensions/core/incubator/src/main/doc/modules/incubator/_attributes.adoc
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/_attributes.adoc
rename to extensions/core/incubator/src/main/doc/modules/incubator/_attributes.adoc
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/images/.gitkeep b/extensions/core/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/images/.gitkeep
rename to extensions/core/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/examples/.gitkeep b/extensions/core/incubator/src/main/doc/modules/incubator/examples/.gitkeep
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/examples/.gitkeep
rename to extensions/core/incubator/src/main/doc/modules/incubator/examples/.gitkeep
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/attachments/.gitkeep b/extensions/core/incubator/src/main/doc/modules/incubator/images/.gitkeep
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/attachments/.gitkeep
rename to extensions/core/incubator/src/main/doc/modules/incubator/images/.gitkeep
diff --git a/extensions/legacy/src/main/doc/modules/legacy/nav.adoc b/extensions/core/incubator/src/main/doc/modules/incubator/nav.adoc
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/nav.adoc
rename to extensions/core/incubator/src/main/doc/modules/incubator/nav.adoc
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/partials/_attributes.adoc b/extensions/core/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/partials/_attributes.adoc
rename to extensions/core/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
diff --git a/extensions/incubator/src/main/doc/modules/incubator/pages/about.adoc b/extensions/core/incubator/src/main/doc/modules/incubator/pages/about.adoc
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/pages/about.adoc
rename to extensions/core/incubator/src/main/doc/modules/incubator/pages/about.adoc
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/pages/_attributes.adoc b/extensions/core/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/pages/_attributes.adoc
rename to extensions/core/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
diff --git a/extensions/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc b/extensions/core/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
rename to extensions/core/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
diff --git a/extensions/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java b/extensions/core/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
similarity index 100%
rename from extensions/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
rename to extensions/core/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
diff --git a/extensions/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java b/extensions/core/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
similarity index 100%
rename from extensions/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
rename to extensions/core/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
diff --git a/extensions/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java b/extensions/core/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
similarity index 100%
rename from extensions/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
rename to extensions/core/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
diff --git a/extensions/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java b/extensions/core/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
similarity index 100%
rename from extensions/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
rename to extensions/core/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
diff --git a/extensions/legacy/.gitignore b/extensions/core/legacy/.gitignore
similarity index 100%
rename from extensions/legacy/.gitignore
rename to extensions/core/legacy/.gitignore
diff --git a/extensions/legacy/pom.xml b/extensions/core/legacy/pom.xml
similarity index 100%
rename from extensions/legacy/pom.xml
rename to extensions/core/legacy/pom.xml
diff --git a/extensions/legacy/src/main/doc/antora.yml b/extensions/core/legacy/src/main/doc/antora.yml
similarity index 100%
rename from extensions/legacy/src/main/doc/antora.yml
rename to extensions/core/legacy/src/main/doc/antora.yml
diff --git a/extensions/sse/src/main/doc/modules/sse/_attributes.adoc b/extensions/core/legacy/src/main/doc/modules/legacy/_attributes.adoc
similarity index 100%
rename from extensions/sse/src/main/doc/modules/sse/_attributes.adoc
rename to extensions/core/legacy/src/main/doc/modules/legacy/_attributes.adoc
diff --git a/extensions/sse/src/main/doc/modules/sse/images/.gitkeep b/extensions/core/legacy/src/main/doc/modules/legacy/attachments/.gitkeep
similarity index 100%
rename from extensions/sse/src/main/doc/modules/sse/images/.gitkeep
rename to extensions/core/legacy/src/main/doc/modules/legacy/attachments/.gitkeep
diff --git a/extensions/sse/src/main/doc/modules/sse/examples/.gitkeep b/extensions/core/legacy/src/main/doc/modules/legacy/examples/.gitkeep
similarity index 100%
rename from extensions/sse/src/main/doc/modules/sse/examples/.gitkeep
rename to extensions/core/legacy/src/main/doc/modules/legacy/examples/.gitkeep
diff --git a/extensions/sse/src/main/doc/modules/sse/attachments/.gitkeep b/extensions/core/legacy/src/main/doc/modules/legacy/images/.gitkeep
similarity index 100%
rename from extensions/sse/src/main/doc/modules/sse/attachments/.gitkeep
rename to extensions/core/legacy/src/main/doc/modules/legacy/images/.gitkeep
diff --git a/extensions/incubator/src/main/doc/modules/incubator/nav.adoc b/extensions/core/legacy/src/main/doc/modules/legacy/nav.adoc
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/nav.adoc
rename to extensions/core/legacy/src/main/doc/modules/legacy/nav.adoc
diff --git a/extensions/sse/src/main/doc/modules/sse/partials/_attributes.adoc b/extensions/core/legacy/src/main/doc/modules/legacy/pages/_attributes.adoc
similarity index 100%
rename from extensions/sse/src/main/doc/modules/sse/partials/_attributes.adoc
rename to extensions/core/legacy/src/main/doc/modules/legacy/pages/_attributes.adoc
diff --git a/extensions/legacy/src/main/doc/modules/legacy/pages/about.adoc b/extensions/core/legacy/src/main/doc/modules/legacy/pages/about.adoc
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/pages/about.adoc
rename to extensions/core/legacy/src/main/doc/modules/legacy/pages/about.adoc
diff --git a/extensions/sse/src/main/doc/modules/sse/pages/_attributes.adoc b/extensions/core/legacy/src/main/doc/modules/legacy/partials/_attributes.adoc
similarity index 100%
rename from extensions/sse/src/main/doc/modules/sse/pages/_attributes.adoc
rename to extensions/core/legacy/src/main/doc/modules/legacy/partials/_attributes.adoc
diff --git a/extensions/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc b/extensions/core/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc
rename to extensions/core/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/AppManifest.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/AppManifest.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/AppManifest.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/AppManifest.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java b/extensions/core/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java b/extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java b/extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java b/extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java b/extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java b/extensions/core/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java b/extensions/core/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java b/extensions/core/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
diff --git a/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java b/extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
similarity index 100%
rename from extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
rename to extensions/core/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
diff --git a/extensions/legacy/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java b/extensions/core/legacy/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
similarity index 100%
rename from extensions/legacy/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
rename to extensions/core/legacy/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
diff --git a/extensions/spring/pom.xml b/extensions/core/spring/pom.xml
similarity index 100%
rename from extensions/spring/pom.xml
rename to extensions/core/spring/pom.xml
diff --git a/extensions/incubator/src/main/doc/antora.yml b/extensions/core/spring/src/main/doc/antora.yml
similarity index 100%
rename from extensions/incubator/src/main/doc/antora.yml
rename to extensions/core/spring/src/main/doc/antora.yml
diff --git a/extensions/spring/src/main/doc/modules/spring/_attributes.adoc b/extensions/core/spring/src/main/doc/modules/spring/_attributes.adoc
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/_attributes.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/_attributes.adoc
diff --git a/extensions/spring/src/main/doc/modules/spring/images/.gitkeep b/extensions/core/spring/src/main/doc/modules/spring/attachments/.gitkeep
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/images/.gitkeep
rename to extensions/core/spring/src/main/doc/modules/spring/attachments/.gitkeep
diff --git a/extensions/spring/src/main/doc/modules/spring/examples/.gitkeep b/extensions/core/spring/src/main/doc/modules/spring/examples/.gitkeep
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/examples/.gitkeep
rename to extensions/core/spring/src/main/doc/modules/spring/examples/.gitkeep
diff --git a/extensions/spring/src/main/doc/modules/spring/attachments/.gitkeep b/extensions/core/spring/src/main/doc/modules/spring/images/.gitkeep
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/attachments/.gitkeep
rename to extensions/core/spring/src/main/doc/modules/spring/images/.gitkeep
diff --git a/extensions/spring/src/main/doc/modules/spring/nav.adoc b/extensions/core/spring/src/main/doc/modules/spring/nav.adoc
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/nav.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/nav.adoc
diff --git a/extensions/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/extensions/core/spring/src/main/doc/modules/spring/pages/_attributes.adoc
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/partials/_attributes.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/pages/_attributes.adoc
diff --git a/extensions/spring/src/main/doc/modules/spring/pages/about.adoc b/extensions/core/spring/src/main/doc/modules/spring/pages/about.adoc
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/pages/about.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/pages/about.adoc
diff --git a/extensions/spring/src/main/doc/modules/spring/pages/_attributes.adoc b/extensions/core/spring/src/main/doc/modules/spring/partials/_attributes.adoc
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/pages/_attributes.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/partials/_attributes.adoc
diff --git a/extensions/spring/src/main/doc/modules/spring/partials/module-nav.adoc b/extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
similarity index 100%
rename from extensions/spring/src/main/doc/modules/spring/partials/module-nav.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
diff --git a/extensions/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java
similarity index 100%
rename from extensions/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java
diff --git a/extensions/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
similarity index 100%
rename from extensions/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
diff --git a/extensions/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
similarity index 100%
rename from extensions/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
diff --git a/extensions/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
similarity index 100%
rename from extensions/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
diff --git a/extensions/markdown/src/main/doc/antora.yml b/extensions/markdown/src/main/doc/antora.yml
deleted file mode 100644
index 157f08f..0000000
--- a/extensions/markdown/src/main/doc/antora.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: vw
-title: "Markdown Bundle"
-version: master
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 61e9fd8a..fa68a94 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -267,18 +267,17 @@
</dependencyManagement>
<modules>
- <module>asciidoc</module>
- <module>fixtures</module>
- <module>spring</module>
- <module>markdown</module>
- <module>restclient</module>
- <module>secman</module>
- <module>specsupport</module>
- <module>sse</module>
- <module>viewer-wicket-excel</module>
-
- <module>incubator</module>
- <module>legacy</module>
+ <module>core/incubator</module>
+ <module>core/legacy</module>
+ <module>core/spring</module>
+ <module>security/secman</module>
+ <module>testing/fixtures</module>
+ <module>testing/specsupport</module>
+ <module>vro/restclient</module>
+ <module>vw/asciidoc</module>
+ <module>vw/exceldownload</module>
+ <module>vw/markdown</module>
+ <module>vw/sse</module>
</modules>
</project>
diff --git a/extensions/secman/api/src/main/doc/modules/api/nav.adoc b/extensions/secman/api/src/main/doc/modules/api/nav.adoc
deleted file mode 100644
index 024cb04..0000000
--- a/extensions/secman/api/src/main/doc/modules/api/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::ext-secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc b/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc
deleted file mode 100644
index 024cb04..0000000
--- a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::ext-secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/secman/model/src/main/doc/modules/model/nav.adoc b/extensions/secman/model/src/main/doc/modules/model/nav.adoc
deleted file mode 100644
index 024cb04..0000000
--- a/extensions/secman/model/src/main/doc/modules/model/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::ext-secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc b/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc
deleted file mode 100644
index 024cb04..0000000
--- a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::ext-secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/nav.adoc b/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/nav.adoc
deleted file mode 100644
index 024cb04..0000000
--- a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::ext-secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/secman/api/pom.xml b/extensions/security/secman/api/pom.xml
similarity index 100%
rename from extensions/secman/api/pom.xml
rename to extensions/security/secman/api/pom.xml
diff --git a/extensions/secman/realm-shiro/src/main/doc/antora.yml b/extensions/security/secman/api/src/main/doc/antora.yml
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/antora.yml
rename to extensions/security/secman/api/src/main/doc/antora.yml
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/_attributes.adoc b/extensions/security/secman/api/src/main/doc/modules/api/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/_attributes.adoc
rename to extensions/security/secman/api/src/main/doc/modules/api/_attributes.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/images/.gitkeep b/extensions/security/secman/api/src/main/doc/modules/api/attachments/.gitkeep
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/images/.gitkeep
rename to extensions/security/secman/api/src/main/doc/modules/api/attachments/.gitkeep
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/examples/.gitkeep b/extensions/security/secman/api/src/main/doc/modules/api/examples/.gitkeep
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/examples/.gitkeep
rename to extensions/security/secman/api/src/main/doc/modules/api/examples/.gitkeep
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/attachments/.gitkeep b/extensions/security/secman/api/src/main/doc/modules/api/images/.gitkeep
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/attachments/.gitkeep
rename to extensions/security/secman/api/src/main/doc/modules/api/images/.gitkeep
diff --git a/extensions/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/api/src/main/doc/modules/api/nav.adoc
similarity index 100%
copy from extensions/secman/src/main/doc/modules/ROOT/nav.adoc
copy to extensions/security/secman/api/src/main/doc/modules/api/nav.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/partials/_attributes.adoc b/extensions/security/secman/api/src/main/doc/modules/api/pages/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/partials/_attributes.adoc
rename to extensions/security/secman/api/src/main/doc/modules/api/pages/_attributes.adoc
diff --git a/extensions/secman/api/src/main/doc/modules/api/pages/about.adoc b/extensions/security/secman/api/src/main/doc/modules/api/pages/about.adoc
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/pages/about.adoc
rename to extensions/security/secman/api/src/main/doc/modules/api/pages/about.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/_attributes.adoc b/extensions/security/secman/api/src/main/doc/modules/api/partials/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/_attributes.adoc
rename to extensions/security/secman/api/src/main/doc/modules/api/partials/_attributes.adoc
diff --git a/extensions/secman/api/src/main/doc/modules/api/partials/module-nav.adoc b/extensions/security/secman/api/src/main/doc/modules/api/partials/module-nav.adoc
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/partials/module-nav.adoc
rename to extensions/security/secman/api/src/main/doc/modules/api/partials/module-nav.adoc
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModule.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModule.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModule.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModule.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModuleConfig.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModuleConfig.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModuleConfig.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModuleConfig.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealm.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealm.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealm.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealm.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmCharacteristic.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmCharacteristic.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmCharacteristic.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmCharacteristic.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmService.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmService.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmService.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityRealmService.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionService.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionService.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionService.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionService.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionServiceNone.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionServiceNone.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionServiceNone.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionServiceNone.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRepository.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRepository.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRepository.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRepository.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRule.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRule.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRule.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionRule.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationService.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationService.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationService.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationService.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAbstract.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAbstract.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAbstract.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAbstract.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRole.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRole.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRole.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRole.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRoleRepository.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRoleRepository.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRoleRepository.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRoleRepository.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancy.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancy.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancy.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancy.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyEvaluator.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyEvaluator.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyEvaluator.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyEvaluator.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyRepository.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyRepository.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyRepository.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancyRepository.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/HasAtPath.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/HasAtPath.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/HasAtPath.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/HasAtPath.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserRepository.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserRepository.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserRepository.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserRepository.java
diff --git a/extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserStatus.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserStatus.java
similarity index 100%
rename from extensions/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserStatus.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserStatus.java
diff --git a/extensions/secman/encryption-jbcrypt/pom.xml b/extensions/security/secman/encryption-jbcrypt/pom.xml
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/pom.xml
rename to extensions/security/secman/encryption-jbcrypt/pom.xml
diff --git a/extensions/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
similarity index 100%
copy from extensions/secman/persistence-jdo/src/main/doc/antora.yml
copy to extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
diff --git a/extensions/secman/src/main/doc/modules/ROOT/_attributes.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/_attributes.adoc
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/_attributes.adoc
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/_attributes.adoc
diff --git a/extensions/secman/src/main/doc/modules/ROOT/images/.gitkeep b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/images/.gitkeep
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/attachments/.gitkeep
diff --git a/extensions/secman/src/main/doc/modules/ROOT/examples/.gitkeep b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/examples/.gitkeep
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/examples/.gitkeep
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/examples/.gitkeep
diff --git a/extensions/secman/src/main/doc/modules/ROOT/attachments/.gitkeep b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/images/.gitkeep
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/attachments/.gitkeep
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/images/.gitkeep
diff --git a/extensions/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc
similarity index 100%
copy from extensions/secman/src/main/doc/modules/ROOT/nav.adoc
copy to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc
diff --git a/extensions/secman/src/main/doc/modules/ROOT/partials/_attributes.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/_attributes.adoc
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/partials/_attributes.adoc
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/_attributes.adoc
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc
diff --git a/extensions/secman/src/main/doc/modules/ROOT/pages/_attributes.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/_attributes.adoc
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/pages/_attributes.adoc
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/_attributes.adoc
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc
rename to extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc
diff --git a/extensions/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisBootSecmanEncryptionJbcrypt.java b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisBootSecmanEncryptionJbcrypt.java
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisBootSecmanEncryptionJbcrypt.java
rename to extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisBootSecmanEncryptionJbcrypt.java
diff --git a/extensions/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/PasswordEncryptionServiceUsingJBcrypt.java b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/PasswordEncryptionServiceUsingJBcrypt.java
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/PasswordEncryptionServiceUsingJBcrypt.java
rename to extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/PasswordEncryptionServiceUsingJBcrypt.java
diff --git a/extensions/secman/model/pom.xml b/extensions/security/secman/model/pom.xml
similarity index 100%
rename from extensions/secman/model/pom.xml
rename to extensions/security/secman/model/pom.xml
diff --git a/extensions/secman/model/src/main/doc/antora.yml b/extensions/security/secman/model/src/main/doc/antora.yml
similarity index 100%
rename from extensions/secman/model/src/main/doc/antora.yml
rename to extensions/security/secman/model/src/main/doc/antora.yml
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/_attributes.adoc b/extensions/security/secman/model/src/main/doc/modules/model/_attributes.adoc
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/_attributes.adoc
rename to extensions/security/secman/model/src/main/doc/modules/model/_attributes.adoc
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/.gitkeep b/extensions/security/secman/model/src/main/doc/modules/model/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/.gitkeep
rename to extensions/security/secman/model/src/main/doc/modules/model/attachments/.gitkeep
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/examples/.gitkeep b/extensions/security/secman/model/src/main/doc/modules/model/examples/.gitkeep
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/examples/.gitkeep
rename to extensions/security/secman/model/src/main/doc/modules/model/examples/.gitkeep
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/attachments/.gitkeep b/extensions/security/secman/model/src/main/doc/modules/model/images/.gitkeep
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/attachments/.gitkeep
rename to extensions/security/secman/model/src/main/doc/modules/model/images/.gitkeep
diff --git a/extensions/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/model/src/main/doc/modules/model/nav.adoc
similarity index 100%
copy from extensions/secman/src/main/doc/modules/ROOT/nav.adoc
copy to extensions/security/secman/model/src/main/doc/modules/model/nav.adoc
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/_attributes.adoc b/extensions/security/secman/model/src/main/doc/modules/model/pages/_attributes.adoc
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/_attributes.adoc
rename to extensions/security/secman/model/src/main/doc/modules/model/pages/_attributes.adoc
diff --git a/extensions/secman/model/src/main/doc/modules/model/pages/about.adoc b/extensions/security/secman/model/src/main/doc/modules/model/pages/about.adoc
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/pages/about.adoc
rename to extensions/security/secman/model/src/main/doc/modules/model/pages/about.adoc
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/_attributes.adoc b/extensions/security/secman/model/src/main/doc/modules/model/partials/_attributes.adoc
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/_attributes.adoc
rename to extensions/security/secman/model/src/main/doc/modules/model/partials/_attributes.adoc
diff --git a/extensions/secman/model/src/main/doc/modules/model/partials/module-nav.adoc b/extensions/security/secman/model/src/main/doc/modules/model/partials/module-nav.adoc
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/partials/module-nav.adoc
rename to extensions/security/secman/model/src/main/doc/modules/model/partials/module-nav.adoc
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPermission_feature.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPermission_feature.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPermission_feature.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPermission_feature.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_permissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_permissions.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_permissions.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_permissions.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/HasUsername_open.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/HasUsername_open.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/HasUsername_open.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/HasUsername_open.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacet.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacet.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacet.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacet.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetDefault.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetDefault.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetDefault.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetDefault.java
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetFactory.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetFactory.java
similarity index 100%
rename from extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetFactory.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetFactory.java
diff --git a/extensions/secman/persistence-jdo/logging-dn-enhance.properties b/extensions/security/secman/persistence-jdo/logging-dn-enhance.properties
similarity index 100%
rename from extensions/secman/persistence-jdo/logging-dn-enhance.properties
rename to extensions/security/secman/persistence-jdo/logging-dn-enhance.properties
diff --git a/extensions/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
similarity index 100%
rename from extensions/secman/persistence-jdo/pom.xml
rename to extensions/security/secman/persistence-jdo/pom.xml
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/antora.yml b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/antora.yml
rename to extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/_attributes.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/_attributes.adoc
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/_attributes.adoc
rename to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/_attributes.adoc
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/images/.gitkeep b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/images/.gitkeep
rename to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/attachments/.gitkeep
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/examples/.gitkeep b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/examples/.gitkeep
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/examples/.gitkeep
rename to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/examples/.gitkeep
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/attachments/.gitkeep b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/images/.gitkeep
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/attachments/.gitkeep
rename to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/images/.gitkeep
diff --git a/extensions/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc
similarity index 100%
copy from extensions/secman/src/main/doc/modules/ROOT/nav.adoc
copy to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/_attributes.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/_attributes.adoc
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/_attributes.adoc
rename to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/_attributes.adoc
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc
similarity index 100%
copy from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc
copy to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/_attributes.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/_attributes.adoc
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/_attributes.adoc
rename to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/_attributes.adoc
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc
rename to extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/package.jdo b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/package.jdo
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/package.jdo
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/package.jdo
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionFactory.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.layout.xml
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleFactory.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.layout.xml
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyFactory.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserFactory.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisApplibFixtureResultsRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisApplibFixtureResultsRoleAndPermissions.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisApplibFixtureResultsRoleAndPermissions.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisApplibFixtureResultsRoleAndPermissions.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/userreg/SecurityModuleAppUserRegistrationServiceAbstract.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/userreg/SecurityModuleAppUserRegistrationServiceAbstract.java
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/userreg/SecurityModuleAppUserRegistrationServiceAbstract.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/userreg/SecurityModuleAppUserRegistrationServiceAbstract.java
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/ApplicationFeature.png b/extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationFeature.png
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/ApplicationFeature.png
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationFeature.png
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/ApplicationPassword.png b/extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationPassword.png
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/ApplicationPassword.png
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationPassword.png
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/ApplicationPermission.png b/extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationPermission.png
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/ApplicationPermission.png
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationPermission.png
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/ApplicationRole.png b/extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationRole.png
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/ApplicationRole.png
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationRole.png
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/ApplicationTenancy.png b/extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationTenancy.png
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/ApplicationTenancy.png
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationTenancy.png
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/ApplicationUser.png b/extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationUser.png
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/ApplicationUser.png
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/ApplicationUser.png
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/UserPermission.png b/extensions/security/secman/persistence-jdo/src/main/resources/images/UserPermission.png
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/UserPermission.png
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/UserPermission.png
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/pdn/UserPermissionViewModel.pdn b/extensions/security/secman/persistence-jdo/src/main/resources/images/pdn/UserPermissionViewModel.pdn
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/pdn/UserPermissionViewModel.pdn
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/pdn/UserPermissionViewModel.pdn
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/zip/key_security.zip b/extensions/security/secman/persistence-jdo/src/main/resources/images/zip/key_security.zip
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/zip/key_security.zip
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/zip/key_security.zip
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/zip/outline_star.zip b/extensions/security/secman/persistence-jdo/src/main/resources/images/zip/outline_star.zip
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/zip/outline_star.zip
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/zip/outline_star.zip
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/zip/question_shield.zip b/extensions/security/secman/persistence-jdo/src/main/resources/images/zip/question_shield.zip
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/zip/question_shield.zip
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/zip/question_shield.zip
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/zip/theatre_masks.zip b/extensions/security/secman/persistence-jdo/src/main/resources/images/zip/theatre_masks.zip
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/zip/theatre_masks.zip
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/zip/theatre_masks.zip
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/zip/user.zip b/extensions/security/secman/persistence-jdo/src/main/resources/images/zip/user.zip
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/zip/user.zip
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/zip/user.zip
diff --git a/extensions/secman/persistence-jdo/src/main/resources/images/zip/worldwide_location.zip b/extensions/security/secman/persistence-jdo/src/main/resources/images/zip/worldwide_location.zip
similarity index 100%
rename from extensions/secman/persistence-jdo/src/main/resources/images/zip/worldwide_location.zip
rename to extensions/security/secman/persistence-jdo/src/main/resources/images/zip/worldwide_location.zip
diff --git a/extensions/secman/pom.xml b/extensions/security/secman/pom.xml
similarity index 100%
rename from extensions/secman/pom.xml
rename to extensions/security/secman/pom.xml
diff --git a/extensions/secman/realm-shiro/pom.xml b/extensions/security/secman/realm-shiro/pom.xml
similarity index 100%
rename from extensions/secman/realm-shiro/pom.xml
rename to extensions/security/secman/realm-shiro/pom.xml
diff --git a/extensions/secman/api/src/main/doc/antora.yml b/extensions/security/secman/realm-shiro/src/main/doc/antora.yml
similarity index 100%
rename from extensions/secman/api/src/main/doc/antora.yml
rename to extensions/security/secman/realm-shiro/src/main/doc/antora.yml
diff --git a/extensions/secman/model/src/main/doc/modules/model/_attributes.adoc b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/_attributes.adoc
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/_attributes.adoc
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/_attributes.adoc
diff --git a/extensions/secman/model/src/main/doc/modules/model/images/.gitkeep b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/images/.gitkeep
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/attachments/.gitkeep
diff --git a/extensions/secman/model/src/main/doc/modules/model/examples/.gitkeep b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/examples/.gitkeep
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/examples/.gitkeep
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/examples/.gitkeep
diff --git a/extensions/secman/model/src/main/doc/modules/model/attachments/.gitkeep b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/.gitkeep
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/attachments/.gitkeep
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/.gitkeep
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/nav.adoc
similarity index 100%
copy from extensions/secman/src/main/doc/modules/ROOT/nav.adoc
copy to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/nav.adoc
diff --git a/extensions/secman/model/src/main/doc/modules/model/partials/_attributes.adoc b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/_attributes.adoc
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/partials/_attributes.adoc
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/_attributes.adoc
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/about.adoc b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/about.adoc
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/about.adoc
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/pages/about.adoc
diff --git a/extensions/secman/model/src/main/doc/modules/model/pages/_attributes.adoc b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/_attributes.adoc
similarity index 100%
rename from extensions/secman/model/src/main/doc/modules/model/pages/_attributes.adoc
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/_attributes.adoc
diff --git a/extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/module-nav.adoc b/extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/module-nav.adoc
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/module-nav.adoc
rename to extensions/security/secman/realm-shiro/src/main/doc/modules/realm-shiro/partials/module-nav.adoc
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthInfoForApplicationUser.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthInfoForApplicationUser.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthInfoForApplicationUser.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthInfoForApplicationUser.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthenticationStrategyForIsisModuleSecurityRealm.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthenticationStrategyForIsisModuleSecurityRealm.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthenticationStrategyForIsisModuleSecurityRealm.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/AuthenticationStrategyForIsisModuleSecurityRealm.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisBootSecmanRealmShiro.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisBootSecmanRealmShiro.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisBootSecmanRealmShiro.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisBootSecmanRealmShiro.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionForMember.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionForMember.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionForMember.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionForMember.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionResolverForIsisShiroAuthorizor.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionResolverForIsisShiroAuthorizor.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionResolverForIsisShiroAuthorizor.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PermissionResolverForIsisShiroAuthorizor.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionForApplicationUserOnSingleRealm.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionForApplicationUserOnSingleRealm.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionForApplicationUserOnSingleRealm.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionForApplicationUserOnSingleRealm.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionWithSinglePrincipalForApplicationUserInAnyRealm.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionWithSinglePrincipalForApplicationUserInAnyRealm.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionWithSinglePrincipalForApplicationUserInAnyRealm.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalCollectionWithSinglePrincipalForApplicationUserInAnyRealm.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalForApplicationUser.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalForApplicationUser.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalForApplicationUser.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/PrincipalForApplicationUser.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/SecurityRealmServiceUsingShiro.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/SecurityRealmServiceUsingShiro.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/SecurityRealmServiceUsingShiro.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/SecurityRealmServiceUsingShiro.java
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/ShiroUtils.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/ShiroUtils.java
similarity index 100%
rename from extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/ShiroUtils.java
rename to extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/ShiroUtils.java
diff --git a/extensions/secman/src/main/doc/antora.yml b/extensions/security/secman/src/main/doc/antora.yml
similarity index 100%
rename from extensions/secman/src/main/doc/antora.yml
rename to extensions/security/secman/src/main/doc/antora.yml
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/_attributes.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/_attributes.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/_attributes.adoc
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/images/.gitkeep b/extensions/security/secman/src/main/doc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/images/.gitkeep
rename to extensions/security/secman/src/main/doc/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/examples/.gitkeep b/extensions/security/secman/src/main/doc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/examples/.gitkeep
rename to extensions/security/secman/src/main/doc/modules/ROOT/examples/.gitkeep
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/attachments/.gitkeep b/extensions/security/secman/src/main/doc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/attachments/.gitkeep
rename to extensions/security/secman/src/main/doc/modules/ROOT/images/.gitkeep
diff --git a/extensions/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/nav.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/_attributes.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/_attributes.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/_attributes.adoc
diff --git a/extensions/secman/src/main/doc/modules/ROOT/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/about.adoc
diff --git a/extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/_attributes.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from extensions/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/_attributes.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
diff --git a/extensions/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from extensions/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
diff --git a/extensions/sse/src/main/doc/antora.yml b/extensions/sse/src/main/doc/antora.yml
deleted file mode 100644
index 7d5fd82..0000000
--- a/extensions/sse/src/main/doc/antora.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: vw
-title: "Server Sent Events"
-version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/sse/nav.adoc
diff --git a/extensions/sse/src/main/doc/modules/sse/nav.adoc b/extensions/sse/src/main/doc/modules/sse/nav.adoc
deleted file mode 100644
index 2815342..0000000
--- a/extensions/sse/src/main/doc/modules/sse/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[About]
-
diff --git a/extensions/fixtures/pom.xml b/extensions/testing/fixtures/pom.xml
similarity index 100%
rename from extensions/fixtures/pom.xml
rename to extensions/testing/fixtures/pom.xml
diff --git a/extensions/specsupport/src/main/doc/antora.yml b/extensions/testing/fixtures/src/main/doc/antora.yml
similarity index 100%
rename from extensions/specsupport/src/main/doc/antora.yml
rename to extensions/testing/fixtures/src/main/doc/antora.yml
diff --git a/extensions/secman/api/src/main/doc/modules/api/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/_attributes.adoc
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/_attributes.adoc
diff --git a/extensions/secman/api/src/main/doc/modules/api/images/.gitkeep b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/images/.gitkeep
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/attachments/.gitkeep
diff --git a/extensions/secman/api/src/main/doc/modules/api/examples/.gitkeep b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/examples/.gitkeep
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/examples/.gitkeep
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/examples/.gitkeep
diff --git a/extensions/secman/api/src/main/doc/modules/api/attachments/.gitkeep b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/.gitkeep
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/attachments/.gitkeep
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/.gitkeep
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/composite.png b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/composite.png
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/composite.png
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/composite.png
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/flat-1.png b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-1.png
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/flat-1.png
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-1.png
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/flat-2.png b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-2.png
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/flat-2.png
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-2.png
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/prompt-specifying-number.png b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt-specifying-number.png
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/prompt-specifying-number.png
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt-specifying-number.png
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/prompt.png b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt.png
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/prompt.png
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt.png
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/prototyping-menu.png b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prototyping-menu.png
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/prototyping-menu.png
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prototyping-menu.png
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/result-list.png b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/result-list.png
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/result-list.png
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/result-list.png
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/nav.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/nav.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/nav.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/nav.adoc
diff --git a/extensions/secman/api/src/main/doc/modules/api/partials/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/_attributes.adoc
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/partials/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/_attributes.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/about.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/about.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/about.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/about.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
diff --git a/extensions/secman/api/src/main/doc/modules/api/pages/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/_attributes.adoc
similarity index 100%
rename from extensions/secman/api/src/main/doc/modules/api/pages/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/_attributes.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/partials/module-nav.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/module-nav.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/partials/module-nav.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/module-nav.adoc
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisBootFixtures.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisBootFixtures.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisBootFixtures.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisBootFixtures.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/DiscoverableFixtureScript.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/DiscoverableFixtureScript.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/DiscoverableFixtureScript.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/DiscoverableFixtureScript.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/SimpleFixtureScript.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/SimpleFixtureScript.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/SimpleFixtureScript.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/SimpleFixtureScript.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsDefault.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsDefault.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsDefault.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsDefault.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlInternal.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlInternal.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlInternal.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlInternal.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/Module.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/Module.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/Module.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/Module.java
diff --git a/extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/ModuleService.java b/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/ModuleService.java
similarity index 100%
rename from extensions/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/ModuleService.java
rename to extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/module/ModuleService.java
diff --git a/extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/css/prism.css b/extensions/testing/fixtures/src/main/resources/prism.css
similarity index 100%
rename from extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/css/prism.css
rename to extensions/testing/fixtures/src/main/resources/prism.css
diff --git a/extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/js/prism1.14.js b/extensions/testing/fixtures/src/main/resources/prism1.14.js
similarity index 100%
rename from extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/js/prism1.14.js
rename to extensions/testing/fixtures/src/main/resources/prism1.14.js
diff --git a/extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java b/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
similarity index 100%
rename from extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
rename to extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
diff --git a/extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java b/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
similarity index 100%
rename from extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
rename to extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
diff --git a/extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java b/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
similarity index 100%
rename from extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
rename to extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
diff --git a/extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java b/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
similarity index 100%
rename from extensions/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
rename to extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
diff --git a/extensions/specsupport/pom.xml b/extensions/testing/specsupport/pom.xml
similarity index 100%
rename from extensions/specsupport/pom.xml
rename to extensions/testing/specsupport/pom.xml
diff --git a/extensions/fixtures/src/main/doc/antora.yml b/extensions/testing/specsupport/src/main/doc/antora.yml
similarity index 100%
rename from extensions/fixtures/src/main/doc/antora.yml
rename to extensions/testing/specsupport/src/main/doc/antora.yml
diff --git a/extensions/restclient/src/main/doc/modules/restclient/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/_attributes.adoc
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/_attributes.adoc
diff --git a/extensions/restclient/src/main/doc/modules/restclient/images/.gitkeep b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/attachments/.gitkeep
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/images/.gitkeep
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/attachments/.gitkeep
diff --git a/extensions/restclient/src/main/doc/modules/restclient/examples/.gitkeep b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/examples/.gitkeep
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/examples/.gitkeep
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/examples/.gitkeep
diff --git a/extensions/restclient/src/main/doc/modules/restclient/attachments/.gitkeep b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/images/.gitkeep
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/attachments/.gitkeep
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/images/.gitkeep
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/nav.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/nav.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/nav.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/nav.adoc
diff --git a/extensions/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/_attributes.adoc
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/_attributes.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/about.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/about.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/about.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/about.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
diff --git a/extensions/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/_attributes.adoc
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/_attributes.adoc
diff --git a/extensions/specsupport/src/main/doc/modules/ext-specsupport/partials/module-nav.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/module-nav.adoc
similarity index 100%
rename from extensions/specsupport/src/main/doc/modules/ext-specsupport/partials/module-nav.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/module-nav.adoc
diff --git a/extensions/specsupport/src/main/java/org/apache/isis/specsupport/ObjectFactoryForIntegration.java b/extensions/testing/specsupport/src/main/java/org/apache/isis/specsupport/ObjectFactoryForIntegration.java
similarity index 100%
rename from extensions/specsupport/src/main/java/org/apache/isis/specsupport/ObjectFactoryForIntegration.java
rename to extensions/testing/specsupport/src/main/java/org/apache/isis/specsupport/ObjectFactoryForIntegration.java
diff --git a/extensions/specsupport/src/main/java/org/apache/isis/specsupport/specs/V.java b/extensions/testing/specsupport/src/main/java/org/apache/isis/specsupport/specs/V.java
similarity index 100%
rename from extensions/specsupport/src/main/java/org/apache/isis/specsupport/specs/V.java
rename to extensions/testing/specsupport/src/main/java/org/apache/isis/specsupport/specs/V.java
diff --git a/extensions/viewer-wicket-excel/src/main/doc/antora.yml b/extensions/viewer-wicket-excel/src/main/doc/antora.yml
deleted file mode 100644
index bcf240a..0000000
--- a/extensions/viewer-wicket-excel/src/main/doc/antora.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: vw
-title: "Viewer Wicket Excel (Excel Download Extensions)"
-version: master
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/pages/about.adoc b/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/pages/about.adoc
deleted file mode 100644
index ea61261..0000000
--- a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/pages/about.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-= About
-: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[]
-
-TODO: v2: placeholder for documentation about ext-viewer-wicket-excel
-
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/partials/module-nav.adoc b/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/partials/module-nav.adoc
deleted file mode 100644
index 1b88c1d..0000000
--- a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/partials/module-nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:vw:ext-viewer-wicket-excel:about.adoc[Excel Download (extension)]
-
diff --git a/extensions/restclient/pom.xml b/extensions/vro/restclient/pom.xml
similarity index 100%
rename from extensions/restclient/pom.xml
rename to extensions/vro/restclient/pom.xml
diff --git a/extensions/restclient/src/main/doc/antora.yml b/extensions/vro/restclient/src/main/doc/antora.yml
similarity index 55%
rename from extensions/restclient/src/main/doc/antora.yml
rename to extensions/vro/restclient/src/main/doc/antora.yml
index 758c04e..576eb80 100644
--- a/extensions/restclient/src/main/doc/antora.yml
+++ b/extensions/vro/restclient/src/main/doc/antora.yml
@@ -1,3 +1,2 @@
name: vro
-title: "REST Client"
version: master
diff --git a/extensions/markdown/src/main/doc/modules/markdown/_attributes.adoc b/extensions/vro/restclient/src/main/doc/modules/restclient/_attributes.adoc
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/_attributes.adoc
rename to extensions/vro/restclient/src/main/doc/modules/restclient/_attributes.adoc
diff --git a/extensions/markdown/src/main/doc/modules/markdown/images/.gitkeep b/extensions/vro/restclient/src/main/doc/modules/restclient/attachments/.gitkeep
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/images/.gitkeep
rename to extensions/vro/restclient/src/main/doc/modules/restclient/attachments/.gitkeep
diff --git a/extensions/markdown/src/main/doc/modules/markdown/examples/.gitkeep b/extensions/vro/restclient/src/main/doc/modules/restclient/examples/.gitkeep
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/examples/.gitkeep
rename to extensions/vro/restclient/src/main/doc/modules/restclient/examples/.gitkeep
diff --git a/extensions/markdown/src/main/doc/modules/markdown/attachments/.gitkeep b/extensions/vro/restclient/src/main/doc/modules/restclient/images/.gitkeep
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/attachments/.gitkeep
rename to extensions/vro/restclient/src/main/doc/modules/restclient/images/.gitkeep
diff --git a/extensions/restclient/src/main/doc/modules/restclient/nav.adoc b/extensions/vro/restclient/src/main/doc/modules/restclient/nav.adoc
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/nav.adoc
rename to extensions/vro/restclient/src/main/doc/modules/restclient/nav.adoc
diff --git a/extensions/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc b/extensions/vro/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
rename to extensions/vro/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc
diff --git a/extensions/restclient/src/main/doc/modules/restclient/pages/about.adoc b/extensions/vro/restclient/src/main/doc/modules/restclient/pages/about.adoc
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/pages/about.adoc
rename to extensions/vro/restclient/src/main/doc/modules/restclient/pages/about.adoc
diff --git a/extensions/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc b/extensions/vro/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
rename to extensions/vro/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc
diff --git a/extensions/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc b/extensions/vro/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from extensions/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
rename to extensions/vro/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
diff --git a/extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java b/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
similarity index 100%
rename from extensions/restclient/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
rename to extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
diff --git a/extensions/asciidoc/pom.xml b/extensions/vw/asciidoc/pom.xml
similarity index 100%
rename from extensions/asciidoc/pom.xml
rename to extensions/vw/asciidoc/pom.xml
diff --git a/extensions/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/vw/asciidoc/src/main/doc/antora.yml
similarity index 55%
copy from extensions/secman/persistence-jdo/src/main/doc/antora.yml
copy to extensions/vw/asciidoc/src/main/doc/antora.yml
index a6ae987..cb832ae 100644
--- a/extensions/secman/persistence-jdo/src/main/doc/antora.yml
+++ b/extensions/vw/asciidoc/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: vw
version: master
diff --git a/extensions/legacy/src/main/doc/modules/legacy/_attributes.adoc b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/_attributes.adoc
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
diff --git a/extensions/legacy/src/main/doc/modules/legacy/images/.gitkeep b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/attachments/.gitkeep
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/images/.gitkeep
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/attachments/.gitkeep
diff --git a/extensions/legacy/src/main/doc/modules/legacy/examples/.gitkeep b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/examples/.gitkeep
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/examples/.gitkeep
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/examples/.gitkeep
diff --git a/extensions/legacy/src/main/doc/modules/legacy/attachments/.gitkeep b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/images/.gitkeep
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/attachments/.gitkeep
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/images/.gitkeep
diff --git a/extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/nav.adoc b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/doc/modules/ext-viewer-wicket-excel/nav.adoc
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
diff --git a/extensions/legacy/src/main/doc/modules/legacy/partials/_attributes.adoc b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/partials/_attributes.adoc
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
diff --git a/extensions/legacy/src/main/doc/modules/legacy/pages/_attributes.adoc b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
similarity index 100%
rename from extensions/legacy/src/main/doc/modules/legacy/pages/_attributes.adoc
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc b/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
rename to extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
diff --git a/extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDoc.java b/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDoc.java
similarity index 100%
rename from extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDoc.java
rename to extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDoc.java
diff --git a/extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocComponent.java b/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocComponent.java
similarity index 100%
rename from extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocComponent.java
rename to extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocComponent.java
diff --git a/extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocConverter.java b/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocConverter.java
similarity index 100%
rename from extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocConverter.java
rename to extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocConverter.java
diff --git a/extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocPanelFactoriesForWicket.java b/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocPanelFactoriesForWicket.java
rename to extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/AsciiDocPanelFactoriesForWicket.java
diff --git a/extensions/fixtures/src/main/resources/prism.css b/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/css/prism.css
similarity index 100%
rename from extensions/fixtures/src/main/resources/prism.css
rename to extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/css/prism.css
diff --git a/extensions/fixtures/src/main/resources/prism1.14.js b/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/js/prism1.14.js
similarity index 100%
rename from extensions/fixtures/src/main/resources/prism1.14.js
rename to extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/js/prism1.14.js
diff --git a/extensions/asciidoc/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory b/extensions/vw/asciidoc/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
similarity index 100%
rename from extensions/asciidoc/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
rename to extensions/vw/asciidoc/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
diff --git a/extensions/viewer-wicket-excel/pom.xml b/extensions/vw/exceldownload/pom.xml
similarity index 97%
rename from extensions/viewer-wicket-excel/pom.xml
rename to extensions/vw/exceldownload/pom.xml
index b181256..f592cf7 100644
--- a/extensions/viewer-wicket-excel/pom.xml
+++ b/extensions/vw/exceldownload/pom.xml
@@ -27,8 +27,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-viewer-wicket-excel</artifactId>
- <name>Apache Isis Extensions - Viewer Wicket Excel</name>
+ <artifactId>isis-extensions-exceldownload</artifactId>
+ <name>Apache Isis Extensions - Excel Download</name>
<description></description>
<properties>
diff --git a/extensions/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/vw/exceldownload/src/main/doc/antora.yml
similarity index 55%
copy from extensions/secman/persistence-jdo/src/main/doc/antora.yml
copy to extensions/vw/exceldownload/src/main/doc/antora.yml
index a6ae987..cb832ae 100644
--- a/extensions/secman/persistence-jdo/src/main/doc/antora.yml
+++ b/extensions/vw/exceldownload/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: vw
version: master
diff --git a/extensions/incubator/src/main/doc/modules/incubator/_attributes.adoc b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/_attributes.adoc
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/_attributes.adoc
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/_attributes.adoc
diff --git a/extensions/incubator/src/main/doc/modules/incubator/images/.gitkeep b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/attachments/.gitkeep
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/images/.gitkeep
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/attachments/.gitkeep
diff --git a/extensions/incubator/src/main/doc/modules/incubator/examples/.gitkeep b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/examples/.gitkeep
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/examples/.gitkeep
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/examples/.gitkeep
diff --git a/extensions/incubator/src/main/doc/modules/incubator/attachments/.gitkeep b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/images/.gitkeep
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/images/.gitkeep
diff --git a/extensions/markdown/src/main/doc/modules/markdown/nav.adoc b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/nav.adoc
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/nav.adoc
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/nav.adoc
diff --git a/extensions/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/_attributes.adoc
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/_attributes.adoc
diff --git a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
similarity index 91%
rename from extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
index 6ccc395..9de9d99 100644
--- a/extensions/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc
+++ b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
@@ -1,7 +1,6 @@
-= JDO Persistence
+= About
: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[]
-:page-partial:
+TODO: v2: placeholder for documentation about excel-download
-TODO: to document
\ No newline at end of file
diff --git a/extensions/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/partials/_attributes.adoc
similarity index 100%
rename from extensions/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
rename to extensions/vw/exceldownload/src/main/doc/modules/exceldownload/partials/_attributes.adoc
diff --git a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/partials/module-nav.adoc b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/partials/module-nav.adoc
new file mode 100644
index 0000000..6644b06
--- /dev/null
+++ b/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/partials/module-nav.adoc
@@ -0,0 +1,2 @@
+* xref:vw:excel-download:about.adoc[Excel Download (extension)]
+
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.css b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.css
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.css
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.css
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.html b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.html
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.html
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.html
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.java b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.java
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.java
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcel.java
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcelFactory.java b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcelFactory.java
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcelFactory.java
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/CollectionContentsAsExcelFactory.java
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileDownloadLink.java b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileDownloadLink.java
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileDownloadLink.java
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileDownloadLink.java
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileModel.java b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileModel.java
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileModel.java
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelFileModel.java
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelUiModule.java b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelUiModule.java
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelUiModule.java
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/ExcelUiModule.java
diff --git a/extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/Util_TimeConversion.java b/extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/Util_TimeConversion.java
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/Util_TimeConversion.java
rename to extensions/vw/exceldownload/src/main/java/org/apache/isis/extensions/viewer/wicket/excel/Util_TimeConversion.java
diff --git a/extensions/viewer-wicket-excel/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory b/extensions/vw/exceldownload/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
similarity index 100%
rename from extensions/viewer-wicket-excel/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
rename to extensions/vw/exceldownload/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
diff --git a/extensions/markdown/pom.xml b/extensions/vw/markdown/pom.xml
similarity index 100%
rename from extensions/markdown/pom.xml
rename to extensions/vw/markdown/pom.xml
diff --git a/extensions/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/vw/markdown/src/main/doc/antora.yml
similarity index 55%
copy from extensions/secman/persistence-jdo/src/main/doc/antora.yml
copy to extensions/vw/markdown/src/main/doc/antora.yml
index a6ae987..cb832ae 100644
--- a/extensions/secman/persistence-jdo/src/main/doc/antora.yml
+++ b/extensions/vw/markdown/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: vw
version: master
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/_attributes.adoc b/extensions/vw/markdown/src/main/doc/modules/markdown/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/_attributes.adoc
rename to extensions/vw/markdown/src/main/doc/modules/markdown/_attributes.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/images/.gitkeep b/extensions/vw/markdown/src/main/doc/modules/markdown/attachments/.gitkeep
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/images/.gitkeep
rename to extensions/vw/markdown/src/main/doc/modules/markdown/attachments/.gitkeep
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/examples/.gitkeep b/extensions/vw/markdown/src/main/doc/modules/markdown/examples/.gitkeep
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/examples/.gitkeep
rename to extensions/vw/markdown/src/main/doc/modules/markdown/examples/.gitkeep
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/attachments/.gitkeep b/extensions/vw/markdown/src/main/doc/modules/markdown/images/.gitkeep
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/attachments/.gitkeep
rename to extensions/vw/markdown/src/main/doc/modules/markdown/images/.gitkeep
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/nav.adoc b/extensions/vw/markdown/src/main/doc/modules/markdown/nav.adoc
similarity index 100%
copy from extensions/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
copy to extensions/vw/markdown/src/main/doc/modules/markdown/nav.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/partials/_attributes.adoc b/extensions/vw/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/partials/_attributes.adoc
rename to extensions/vw/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
diff --git a/extensions/sse/src/main/doc/modules/sse/pages/about.adoc b/extensions/vw/markdown/src/main/doc/modules/markdown/pages/about.adoc
similarity index 100%
rename from extensions/sse/src/main/doc/modules/sse/pages/about.adoc
rename to extensions/vw/markdown/src/main/doc/modules/markdown/pages/about.adoc
diff --git a/extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/_attributes.adoc b/extensions/vw/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/src/main/doc/modules/ext-fixtures/pages/_attributes.adoc
rename to extensions/vw/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
diff --git a/extensions/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc b/extensions/vw/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
rename to extensions/vw/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
diff --git a/extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/Markdown.java b/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/Markdown.java
similarity index 100%
rename from extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/Markdown.java
rename to extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/Markdown.java
diff --git a/extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownComponent.java b/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownComponent.java
similarity index 100%
rename from extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownComponent.java
rename to extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownComponent.java
diff --git a/extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownConverter.java b/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownConverter.java
similarity index 100%
rename from extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownConverter.java
rename to extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownConverter.java
diff --git a/extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownPanelFactoriesForWicket.java b/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownPanelFactoriesForWicket.java
rename to extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/MarkdownPanelFactoriesForWicket.java
diff --git a/extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/css/prism.css b/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/css/prism.css
similarity index 100%
rename from extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/css/prism.css
rename to extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/css/prism.css
diff --git a/extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/js/prism1.14.js b/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/js/prism1.14.js
similarity index 100%
rename from extensions/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/js/prism1.14.js
rename to extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/js/prism1.14.js
diff --git a/extensions/markdown/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory b/extensions/vw/markdown/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
similarity index 100%
rename from extensions/markdown/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
rename to extensions/vw/markdown/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
diff --git a/extensions/sse/pom.xml b/extensions/vw/sse/pom.xml
similarity index 100%
rename from extensions/sse/pom.xml
rename to extensions/vw/sse/pom.xml
diff --git a/extensions/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/vw/sse/src/main/doc/antora.yml
similarity index 55%
rename from extensions/secman/persistence-jdo/src/main/doc/antora.yml
rename to extensions/vw/sse/src/main/doc/antora.yml
index a6ae987..cb832ae 100644
--- a/extensions/secman/persistence-jdo/src/main/doc/antora.yml
+++ b/extensions/vw/sse/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: vw
version: master
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc b/extensions/vw/sse/src/main/doc/modules/sse/_attributes.adoc
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
rename to extensions/vw/sse/src/main/doc/modules/sse/_attributes.adoc
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/images/.gitkeep b/extensions/vw/sse/src/main/doc/modules/sse/attachments/.gitkeep
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/images/.gitkeep
rename to extensions/vw/sse/src/main/doc/modules/sse/attachments/.gitkeep
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/examples/.gitkeep b/extensions/vw/sse/src/main/doc/modules/sse/examples/.gitkeep
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/examples/.gitkeep
rename to extensions/vw/sse/src/main/doc/modules/sse/examples/.gitkeep
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/attachments/.gitkeep b/extensions/vw/sse/src/main/doc/modules/sse/images/.gitkeep
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/attachments/.gitkeep
rename to extensions/vw/sse/src/main/doc/modules/sse/images/.gitkeep
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/nav.adoc b/extensions/vw/sse/src/main/doc/modules/sse/nav.adoc
similarity index 97%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
rename to extensions/vw/sse/src/main/doc/modules/sse/nav.adoc
index bd5d2e6..e63c989 100644
--- a/extensions/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
+++ b/extensions/vw/sse/src/main/doc/modules/sse/nav.adoc
@@ -1 +1,2 @@
include::vw:ROOT:partial$component-nav.adoc[]
+
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc b/extensions/vw/sse/src/main/doc/modules/sse/pages/_attributes.adoc
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
rename to extensions/vw/sse/src/main/doc/modules/sse/pages/_attributes.adoc
diff --git a/extensions/markdown/src/main/doc/modules/markdown/pages/about.adoc b/extensions/vw/sse/src/main/doc/modules/sse/pages/about.adoc
similarity index 100%
rename from extensions/markdown/src/main/doc/modules/markdown/pages/about.adoc
rename to extensions/vw/sse/src/main/doc/modules/sse/pages/about.adoc
diff --git a/extensions/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc b/extensions/vw/sse/src/main/doc/modules/sse/partials/_attributes.adoc
similarity index 100%
rename from extensions/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
rename to extensions/vw/sse/src/main/doc/modules/sse/partials/_attributes.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/partials/module-nav.adoc b/extensions/vw/sse/src/main/doc/modules/sse/partials/module-nav.adoc
new file mode 100644
index 0000000..2f3a6aa
--- /dev/null
+++ b/extensions/vw/sse/src/main/doc/modules/sse/partials/module-nav.adoc
@@ -0,0 +1,2 @@
+* xref:vw:sse:about.adoc[SSE (Extension)]
+
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/webapp/ServerSentEventsServlet.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webapp/ServerSentEventsServlet.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/webapp/ServerSentEventsServlet.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webapp/ServerSentEventsServlet.java
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/webapp/WebModuleServerSentEvents.java b/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webapp/WebModuleServerSentEvents.java
similarity index 100%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/webapp/WebModuleServerSentEvents.java
rename to extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webapp/WebModuleServerSentEvents.java
diff --git a/extensions/sse/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory b/extensions/vw/sse/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
similarity index 100%
rename from extensions/sse/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
rename to extensions/vw/sse/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
diff --git a/site-scratch.yml b/site-scratch.yml
index 99acc5d..d6f252c 100644
--- a/site-scratch.yml
+++ b/site-scratch.yml
@@ -157,7 +157,7 @@ content:
# start_path: extensions/sse/_adoc # vw
# branches: HEAD
# - url: .
-# start_path: extensions/viewer-wicket-excel/_adoc # vw
+# start_path: extensions/exceldownload/_adoc # vw
# branches: HEAD
# - url: .
diff --git a/site.yml b/site.yml
index 6a3c365..9c80559 100644
--- a/site.yml
+++ b/site.yml
@@ -112,52 +112,52 @@ content:
branches: HEAD
- url: .
- start_path: extensions/asciidoc/src/main/doc # vw
+ start_path: extensions/core/incubator/src/main/doc # extensions
branches: HEAD
- url: .
- start_path: extensions/fixtures/src/main/doc # testing
+ start_path: extensions/core/legacy/src/main/doc # extensions
branches: HEAD
- url: .
- start_path: extensions/incubator/src/main/doc # extensions
+ start_path: extensions/core/spring/src/main/doc # extensions
branches: HEAD
- url: .
- start_path: extensions/legacy/src/main/doc # extensions
+ start_path: extensions/security/secman/src/main/doc # secman
branches: HEAD
- url: .
- start_path: extensions/markdown/src/main/doc # vw
+ start_path: extensions/security/secman/api/src/main/doc # secman
branches: HEAD
- url: .
- start_path: extensions/restclient/src/main/doc # vro
+ start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # secman
branches: HEAD
- url: .
- start_path: extensions/secman/src/main/doc # secman
+ start_path: extensions/security/secman/model/src/main/doc # secman
branches: HEAD
- url: .
- start_path: extensions/secman/api/src/main/doc # secman
+ start_path: extensions/security/secman/persistence-jdo/src/main/doc # secman
branches: HEAD
- url: .
- start_path: extensions/secman/encryption-jbcrypt/src/main/doc # secman
+ start_path: extensions/security/secman/realm-shiro/src/main/doc # secman
branches: HEAD
- url: .
- start_path: extensions/secman/model/src/main/doc # secman
+ start_path: extensions/testing/fixtures/src/main/doc # testing
branches: HEAD
- url: .
- start_path: extensions/secman/persistence-jdo/src/main/doc # secman
+ start_path: extensions/testing/specsupport/src/main/doc # secman
branches: HEAD
- url: .
- start_path: extensions/secman/realm-shiro/src/main/doc # secman
+ start_path: extensions/vro/restclient/src/main/doc # vro
branches: HEAD
- url: .
- start_path: extensions/specsupport/src/main/doc # secman
+ start_path: extensions/vw/asciidoc/src/main/doc # vw
branches: HEAD
- url: .
- start_path: extensions/spring/src/main/doc # extensions
+ start_path: extensions/vw/exceldownload/src/main/doc # vw
branches: HEAD
- url: .
- start_path: extensions/sse/src/main/doc # vw
+ start_path: extensions/vw/markdown/src/main/doc # vw
branches: HEAD
- url: .
- start_path: extensions/viewer-wicket-excel/src/main/doc # vw
+ start_path: extensions/vw/sse/src/main/doc # vw
branches: HEAD
- url: .