You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/10/08 06:52:35 UTC
[isis] 01/04: ISIS-2062: reorgs _partials dir
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f9d2318cdc33f0eb9e3bd4c21fbb0d59f75deefc
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 7 22:33:54 2019 +0100
ISIS-2062: reorgs _partials dir
---
.../archdesign/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials}/_attributes.adoc | 0
.../mignotes/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials}/_attributes.adoc | 0
.../refguide/modules/ROOT/_attributes.adoc | 3 +-
.../modules/ROOT/partials/_attributes.adoc | 2 +-
.../relnotes/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials/_attributes.adoc | 0
.../_adoc => antora/components/testing}/antora.yml | 0
.../components/testing}/examples.csv | 0
.../{toc => testing}/modules/ROOT/_attributes.adoc | 3 +-
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../testing}/modules/ROOT/assets/images/.gitkeep | 0
.../testing/modules/ROOT/examples}/.gitkeep | 0
.../components/testing}/modules/ROOT/nav.adoc | 0
.../testing}/modules/ROOT/pages/_attributes.adoc | 0
.../testing}/modules/ROOT/pages/about.adoc | 0
.../testing}/modules/ROOT/pages/overview.adoc | 0
.../modules/ROOT/partials/_attributes.adoc | 0
.../testing}/modules/ROOT/partials/nav.adoc | 0
.../components/testing}/sync_examples.sh | 0
.../components/toc/modules/ROOT/_attributes.adoc | 1 -
.../toc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../ROOT/partials/_powered-by_contactapp.adoc | 3 +-
.../toc/modules/comguide/_attributes.adoc | 2 +-
.../comguide/pages/_partials/_attributes.adoc | 4 --
.../modules/comguide}/partials/_attributes.adoc | 0
.../toc/modules/devguide/_attributes.adoc | 2 +-
.../devguide/pages/_partials/_attributes.adoc | 4 --
.../modules/devguide}/partials/_attributes.adoc | 0
.../devguide/{pages/_partials => partials}/x.sh | 0
.../toc/modules/module-template/_attributes.adoc | 2 +-
.../pages/_partials/_attributes.adoc | 4 --
.../module-template}/partials/_attributes.adoc | 0
.../userguide/modules/btb/_attributes.adoc | 2 +-
.../modules/btb/pages/_partials/_attributes.adoc | 4 --
.../modules/btb}/partials/_attributes.adoc | 0
.../userguide/modules/fun/_attributes.adoc | 2 +-
.../modules/fun/pages/_partials/_attributes.adoc | 4 --
.../modules/fun}/partials/_attributes.adoc | 0
core/applib/_adoc/modules/ROOT/_attributes.adoc | 3 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/ant/_attributes.adoc | 2 +-
.../_adoc/modules/ant/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/cms/_attributes.adoc | 2 +-
.../_adoc/modules/cms/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/svc/_attributes.adoc | 2 +-
.../svc/pages/metadata-api/SwaggerService.adoc | 3 +-
core/config/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../jdo/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
core/pom.xml | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
core/schema/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../api/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../bypass/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../shiro/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../_adoc/modules/realm-jdbc/_attributes.adoc | 2 +-
.../modules/realm-jdbc/partials/_attributes.adoc | 2 +-
.../_adoc/modules/realm-ldap/_attributes.adoc | 2 +-
.../modules/realm-ldap/partials/_attributes.adoc | 2 +-
core/security/shiro/pom.xml | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 6 ---
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/mvn/_attributes.adoc | 2 +-
.../modules/mvn/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/mvn}/partials/_attributes.adoc | 0
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/nav.adoc | 47 +---------------------
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/pages/hints-and-tips.adoc | 2 -
.../ROOT/pages/simplified-representations.adoc | 6 +++
.../action-invocation.adoc | 4 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../_adoc/modules/ROOT/partials/nav.adoc | 26 ++++++++++++
.../_adoc/modules/security/_attributes.adoc | 2 +-
.../_adoc/modules/security/nav.adoc | 4 ++
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../_adoc/modules/security/_attributes.adoc | 2 +-
core/viewer-wicket/_adoc/modules/security/nav.adoc | 4 ++
.../apps/demo/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
examples/apps/demo/pom.xml | 2 +-
.../helloworld/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
examples/apps/helloworld/pom.xml | 2 +-
.../simpleapp/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
examples/apps/simpleapp/application/pom.xml | 2 +-
.../smoketests/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
examples/smoketests/pom.xml | 2 +-
.../asciidoc/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../fixtures/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../incubator/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../markdown/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../secman/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../secman/_adoc/modules/api/_attributes.adoc | 2 +-
.../modules/encryption-jbcrypt/_attributes.adoc | 2 +-
.../secman/_adoc/modules/model/_attributes.adoc | 2 +-
.../_adoc/modules/persistence-jdo/_attributes.adoc | 2 +-
.../_adoc/modules/realm-shiro/_attributes.adoc | 2 +-
extensions/secman/realm-shiro/pom.xml | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
extensions/sse/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
mavendeps/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
mavendeps/webapp/pom.xml | 2 +-
site.yml | 2 +-
136 files changed, 114 insertions(+), 213 deletions(-)
diff --git a/antora/components/archdesign/modules/ROOT/_attributes.adoc b/antora/components/archdesign/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/archdesign/modules/ROOT/_attributes.adoc
+++ b/antora/components/archdesign/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/archdesign/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/archdesign/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/archdesign/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/mavendeps/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/archdesign/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from mavendeps/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename to antora/components/archdesign/modules/ROOT/partials/_attributes.adoc
diff --git a/antora/components/mignotes/modules/ROOT/_attributes.adoc b/antora/components/mignotes/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/mignotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/mignotes/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/mignotes/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/mignotes/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/mignotes/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/mignotes/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename to antora/components/mignotes/modules/ROOT/partials/_attributes.adoc
diff --git a/antora/components/refguide/modules/ROOT/_attributes.adoc b/antora/components/refguide/modules/ROOT/_attributes.adoc
index 42f13d9..7d698a2 100644
--- a/antora/components/refguide/modules/ROOT/_attributes.adoc
+++ b/antora/components/refguide/modules/ROOT/_attributes.adoc
@@ -2,6 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/refguide/modules/ROOT/partials/_attributes.adoc b/antora/components/refguide/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/antora/components/refguide/modules/ROOT/partials/_attributes.adoc
+++ b/antora/components/refguide/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/_attributes.adoc b/antora/components/relnotes/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/relnotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/relnotes/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/relnotes/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/relnotes/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/relnotes/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/relnotes/modules/ROOT/partials/_attributes.adoc
diff --git a/core/testsupport/_adoc/antora.yml b/antora/components/testing/antora.yml
similarity index 100%
rename from core/testsupport/_adoc/antora.yml
rename to antora/components/testing/antora.yml
diff --git a/core/testsupport/_adoc/examples.csv b/antora/components/testing/examples.csv
similarity index 100%
rename from core/testsupport/_adoc/examples.csv
rename to antora/components/testing/examples.csv
diff --git a/antora/components/toc/modules/ROOT/_attributes.adoc b/antora/components/testing/modules/ROOT/_attributes.adoc
similarity index 82%
copy from antora/components/toc/modules/ROOT/_attributes.adoc
copy to antora/components/testing/modules/ROOT/_attributes.adoc
index 5183e0b..7d698a2 100644
--- a/antora/components/toc/modules/ROOT/_attributes.adoc
+++ b/antora/components/testing/modules/ROOT/_attributes.adoc
@@ -1,7 +1,6 @@
ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
-:partialsdir: {moduledir}/partials
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/examples/.gitkeep b/antora/components/testing/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/examples/.gitkeep
rename to antora/components/testing/modules/ROOT/assets/attachments/.gitkeep
diff --git a/core/testsupport/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/testing/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/testing/modules/ROOT/assets/images/.gitkeep
diff --git a/core/testsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/testing/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/testing/modules/ROOT/examples/.gitkeep
diff --git a/core/testsupport/_adoc/modules/ROOT/nav.adoc b/antora/components/testing/modules/ROOT/nav.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/nav.adoc
rename to antora/components/testing/modules/ROOT/nav.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/_attributes.adoc b/antora/components/testing/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/pages/_attributes.adoc
rename to antora/components/testing/modules/ROOT/pages/_attributes.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/about.adoc b/antora/components/testing/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/pages/about.adoc
rename to antora/components/testing/modules/ROOT/pages/about.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/overview.adoc b/antora/components/testing/modules/ROOT/pages/overview.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/pages/overview.adoc
rename to antora/components/testing/modules/ROOT/pages/overview.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/testing/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/testing/modules/ROOT/partials/_attributes.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/nav.adoc b/antora/components/testing/modules/ROOT/partials/nav.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/partials/nav.adoc
rename to antora/components/testing/modules/ROOT/partials/nav.adoc
diff --git a/core/testsupport/_adoc/sync_examples.sh b/antora/components/testing/sync_examples.sh
similarity index 100%
rename from core/testsupport/_adoc/sync_examples.sh
rename to antora/components/testing/sync_examples.sh
diff --git a/antora/components/toc/modules/ROOT/_attributes.adoc b/antora/components/toc/modules/ROOT/_attributes.adoc
index 5183e0b..8249db3 100644
--- a/antora/components/toc/modules/ROOT/_attributes.adoc
+++ b/antora/components/toc/modules/ROOT/_attributes.adoc
@@ -3,5 +3,4 @@ ifndef::env-site,env-github[]
:examplesdir: {moduledir}/examples
:partialsdir: {moduledir}/partials
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
endif::[]
diff --git a/antora/components/toc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/antora/components/toc/modules/ROOT/partials/_attributes.adoc
+++ b/antora/components/toc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc b/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc
index cb16bef..18b6d7f 100644
--- a/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc
+++ b/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc
@@ -25,7 +25,8 @@ image:https://github.com/incodehq/contactapp/blob/master/docs/contactapp-fronten
As our first Apache Isis app making use of mobile technologies it opens the doors for more to follow.
Ionic has proven easy to learn and build apps with, and has a helpful community. Meanwhile we've used
Apache Isis' support for xref:ug:fun:programming-model.adoc#jaxb[JAXB view models]
-and in particular the http://isis.apache.org/guides/ugvro/ugvro.html#__ugvro_simplified-representations_apache-isis-profile[simplified REST representations] introduced in v1.12.0. The result is code that is easy to follow and enhance.
+and in particular the xref:vro:ROOT:simplified-representations.adoc[simplified REST representations] introduced in v1.12.0.
+The result is code that is easy to follow and enhance.
We expect that the scope of _Contact App_ will expand and new features added, these will (almost certainly) remain open source.
Meanwhile we're now set up nicely to build further mobile apps using this technology stack.
diff --git a/antora/components/toc/modules/comguide/_attributes.adoc b/antora/components/toc/modules/comguide/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/toc/modules/comguide/_attributes.adoc
+++ b/antora/components/toc/modules/comguide/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/comguide/pages/_partials/_attributes.adoc b/antora/components/toc/modules/comguide/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/toc/modules/comguide/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/comguide/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/toc/modules/comguide/partials/_attributes.adoc
diff --git a/antora/components/toc/modules/devguide/_attributes.adoc b/antora/components/toc/modules/devguide/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/toc/modules/devguide/_attributes.adoc
+++ b/antora/components/toc/modules/devguide/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/devguide/pages/_partials/_attributes.adoc b/antora/components/toc/modules/devguide/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/toc/modules/devguide/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/devguide/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/toc/modules/devguide/partials/_attributes.adoc
diff --git a/antora/components/toc/modules/devguide/pages/_partials/x.sh b/antora/components/toc/modules/devguide/partials/x.sh
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/_partials/x.sh
rename to antora/components/toc/modules/devguide/partials/x.sh
diff --git a/antora/components/toc/modules/module-template/_attributes.adoc b/antora/components/toc/modules/module-template/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/toc/modules/module-template/_attributes.adoc
+++ b/antora/components/toc/modules/module-template/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/module-template/pages/_partials/_attributes.adoc b/antora/components/toc/modules/module-template/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/toc/modules/module-template/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/module-template/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/toc/modules/module-template/partials/_attributes.adoc
diff --git a/antora/components/userguide/modules/btb/_attributes.adoc b/antora/components/userguide/modules/btb/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/userguide/modules/btb/_attributes.adoc
+++ b/antora/components/userguide/modules/btb/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc b/antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/userguide/modules/btb/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/userguide/modules/btb/partials/_attributes.adoc
diff --git a/antora/components/userguide/modules/fun/_attributes.adoc b/antora/components/userguide/modules/fun/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/userguide/modules/fun/_attributes.adoc
+++ b/antora/components/userguide/modules/fun/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc b/antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/userguide/modules/fun/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/userguide/modules/fun/partials/_attributes.adoc
diff --git a/core/applib/_adoc/modules/ROOT/_attributes.adoc b/core/applib/_adoc/modules/ROOT/_attributes.adoc
index 42f13d9..7d698a2 100644
--- a/core/applib/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/applib/_adoc/modules/ROOT/_attributes.adoc
@@ -2,6 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc b/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/applib/_adoc/modules/ant/_attributes.adoc b/core/applib/_adoc/modules/ant/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/applib/_adoc/modules/ant/_attributes.adoc
+++ b/core/applib/_adoc/modules/ant/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ant/partials/_attributes.adoc b/core/applib/_adoc/modules/ant/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/applib/_adoc/modules/ant/partials/_attributes.adoc
+++ b/core/applib/_adoc/modules/ant/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/applib/_adoc/modules/cms/_attributes.adoc b/core/applib/_adoc/modules/cms/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/applib/_adoc/modules/cms/_attributes.adoc
+++ b/core/applib/_adoc/modules/cms/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/cms/partials/_attributes.adoc b/core/applib/_adoc/modules/cms/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/applib/_adoc/modules/cms/partials/_attributes.adoc
+++ b/core/applib/_adoc/modules/cms/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/applib/_adoc/modules/svc/_attributes.adoc b/core/applib/_adoc/modules/svc/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/applib/_adoc/modules/svc/_attributes.adoc
+++ b/core/applib/_adoc/modules/svc/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc b/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc
index 17a3738..fe414ef 100644
--- a/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc
@@ -12,7 +12,8 @@ These spec files can then be used with the link:http://swagger.io/swagger-ui/[Sw
[NOTE]
====
-Not all of the REST API exposed by the xref:vro:ROOT:about.adoc[Restful Objects viewer] is included in the Swagger schema definition files; the emphasis is those REST resources that are used to develop custom apps: domain objects, domain object collections and action invocations. When combined with Apache Isis' own xref:vro:ROOT:simplified-representations.adoc[simplified representations], these are pretty much all that is needed for this use case.
+Not all of the REST API exposed by the xref:vro:ROOT:about.adoc[Restful Objects viewer] is included in the Swagger schema definition files; the emphasis is those REST resources that are used to develop custom apps: domain objects, domain object collections and action invocations.
+When combined with Apache Isis' own xref:vro:ROOT:simplified-representations.adoc[simplified representations], these are pretty much all that is needed for this use case.
====
diff --git a/core/config/_adoc/modules/ROOT/_attributes.adoc b/core/config/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/config/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/config/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/config/_adoc/modules/ROOT/partials/_attributes.adoc b/core/config/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/config/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/config/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/plugins/jdo/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/pom.xml b/core/pom.xml
index 6cc920d..5cb3ef2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1397,7 +1397,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
<version>${isis.version}</version>
</dependency>
diff --git a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/runtime-services/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/schema/_adoc/modules/ROOT/_attributes.adoc b/core/schema/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/schema/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/schema/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc b/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/api/_adoc/modules/ROOT/_attributes.adoc b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/api/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/shiro/pom.xml b/core/security/shiro/pom.xml
index f939626..580c0cc 100644
--- a/core/security/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
<name>Apache Isis Plugin for Security (Shiro)</name>
<description>
diff --git a/core/testsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/_attributes.adoc
deleted file mode 100644
index 787e5c4..0000000
--- a/core/testsupport/_adoc/modules/ROOT/_attributes.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
-:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_partials/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/testsupport/integtestsupport/_adoc/modules/mvn/partials/_attributes.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
index 876bc34..3ff6c00 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
@@ -1,46 +1 @@
-* xref:about.adoc[Restful Objects Viewer]
-
-
-
-** xref:ro-spec.adoc[RO Spec]
-
-
-
-** xref:architecture.adoc[Architecture]
-
-
-
-** xref:layout-resources.adoc[Layout Resources]
-
-
-
-** xref:health-check.adoc[Health Check]
-
-
-
-** xref:simplified-representations.adoc[Simplified Representations]
-*** xref:simplified-representations/apache-isis-profile.adoc[Apache Isis Profile]
-*** xref:simplified-representations/domain-object.adoc[Domain Object]
-*** xref:simplified-representations/object-collection.adoc[Object Collection]
-*** xref:simplified-representations/action-invocation.adoc[Action Invocation]
-*** xref:simplified-representations/other-representations.adoc[Other Representations]
-*** xref:simplified-representations/configuration-properties.adoc[Configuration Properties]
-
-
-
-** xref:configuration-properties.adoc[Configuration Properties]
-
-
-
-** xref:hints-and-tips.adoc[Hints-n-Tips]
-
-*** xref:hints-and-tips/using-chrome-devtools.adoc[Using Chrome DevTools]
-*** xref:hints-and-tips/angular-tips.adoc[Angular Tips]
-*** xref:hints-and-tips/pretty-printing.adoc[Pretty Printing]
-*** xref:hints-and-tips/restful-image-property.adoc[Restful Image Property]
-*** xref:hints-and-tips/view-model-as-parameter.adoc[View Model as Parameter]
-*** xref:hints-and-tips/troubleshooting.adoc[Troubleshooting]
-
-//https://lists.apache.org/thread.html/cbd18320bbf6e5c5e767283f9e675cf56e7f4692c109e1e79dbaa90a@%3Cusers.isis.apache.org%3E // FIXME: to add
-
-
+include::vro:ROOT:partial$nav.adoc[]
\ No newline at end of file
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index 3309e69..764b8f8 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -6,8 +6,6 @@ include::_attributes.adoc[]
This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
-
-
Since the Restful Objects viewer is designed for computer programs to interact with (rather than human beings), it can be a little difficult to explore and generally "grok" how it works.
This section provides a few hints-and-tips to help you on your way.
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
index a3fdb27..5795e48 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
@@ -18,3 +18,9 @@ xref:vro:ROOT:architecture.adoc[architecture] chapter.
+include::vro:ROOT:simplified-representations/apache-isis-profile.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/domain-object.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/object-collection.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/action-invocation.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/other-representations.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/configuration-properties.adoc[leveloffset=+1]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
index 8f5b1e6..4f71214 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
@@ -8,7 +8,7 @@ When an action is invoked, it can return a domain object, a list, a scalar, or r
== Returning an Object
-If the action returned an object, then the xref:vro:ROOT:simplified-representations/domain-object.adoc[domain object representation] is returned.
+If the action returned an object, then the xref:vro:ROOT:simplified-representations.adoc#domain-object[domain object representation] is returned.
For example, using the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing
this resource:
@@ -58,7 +58,7 @@ Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="objec
== Returning a List
On the other hand if the action returned a list (a "standalone" collection, then an array representation is returned.
-This is very similar to that returned by a xref:vro:ROOT:simplified-representations/object-collection.adoc[(parented) object collection], though with a slightly different `Content-Type` to distinguish.
+This is very similar to that returned by a xref:vro:ROOT:simplified-representations.adoc#object-collection[(parented) object collection], though with a slightly different `Content-Type` to distinguish.
For example, using the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing
this resource:
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/viewer-restfulobjects/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/nav.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/nav.adoc
new file mode 100644
index 0000000..22baf86
--- /dev/null
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/nav.adoc
@@ -0,0 +1,26 @@
+* xref:vro:ROOT:about.adoc[Restful Objects Viewer]
+
+** xref:vro:ROOT:ro-spec.adoc[RO Spec]
+
+** xref:vro:ROOT:architecture.adoc[Architecture]
+
+** xref:vro:ROOT:layout-resources.adoc[Layout Resources]
+
+** xref:vro:ROOT:health-check.adoc[Health Check]
+
+** xref:vro:ROOT:simplified-representations.adoc[Simplified Representations]
+
+** xref:vro:ROOT:configuration-properties.adoc[Configuration Properties]
+
+** xref:vro:ROOT:hints-and-tips.adoc[Hints-n-Tips]
+
+*** xref:vro:ROOT:hints-and-tips/using-chrome-devtools.adoc[Using Chrome DevTools]
+*** xref:vro:ROOT:hints-and-tips/angular-tips.adoc[Angular Tips]
+*** xref:vro:ROOT:hints-and-tips/pretty-printing.adoc[Pretty Printing]
+*** xref:vro:ROOT:hints-and-tips/restful-image-property.adoc[Restful Image Property]
+*** xref:vro:ROOT:hints-and-tips/view-model-as-parameter.adoc[View Model as Parameter]
+*** xref:vro:ROOT:hints-and-tips/troubleshooting.adoc[Troubleshooting]
+
+//https://lists.apache.org/thread.html/cbd18320bbf6e5c5e767283f9e675cf56e7f4692c109e1e79dbaa90a@%3Cusers.isis.apache.org%3E // FIXME: to add
+
+
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc b/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc
index 1fa1d28..b592857 100644
--- a/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc
@@ -1 +1,5 @@
+//
+// These pages are include:d in both the RO viewer guide and also in the security guide
+//
+
* xref:about.adoc[Security]
\ No newline at end of file
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/viewer-wicket/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/security/nav.adoc b/core/viewer-wicket/_adoc/modules/security/nav.adoc
index 1fa1d28..b592857 100644
--- a/core/viewer-wicket/_adoc/modules/security/nav.adoc
+++ b/core/viewer-wicket/_adoc/modules/security/nav.adoc
@@ -1 +1,5 @@
+//
+// These pages are include:d in both the RO viewer guide and also in the security guide
+//
+
* xref:about.adoc[Security]
\ No newline at end of file
diff --git a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/extensions/sse/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from extensions/sse/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename to examples/apps/demo/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/apps/demo/pom.xml b/examples/apps/demo/pom.xml
index 5f9589d..1b117b3 100644
--- a/examples/apps/demo/pom.xml
+++ b/examples/apps/demo/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<dependency>
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/apps/helloworld/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to examples/apps/helloworld/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/apps/helloworld/pom.xml b/examples/apps/helloworld/pom.xml
index 3be5d3a..be6d9e6 100644
--- a/examples/apps/helloworld/pom.xml
+++ b/examples/apps/helloworld/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<!-- OTHER DEPENDENCIES -->
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to examples/apps/simpleapp/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/apps/simpleapp/application/pom.xml b/examples/apps/simpleapp/application/pom.xml
index 38bd321..8946688 100644
--- a/examples/apps/simpleapp/application/pom.xml
+++ b/examples/apps/simpleapp/application/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<!-- PERSISTENCE -->
diff --git a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/smoketests/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/smoketests/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to examples/smoketests/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 56ced4d..9b5eee8 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<dependency>
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/asciidoc/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/fixtures/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/incubator/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/markdown/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/api/_attributes.adoc b/extensions/secman/_adoc/modules/api/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/api/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/api/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/model/_attributes.adoc b/extensions/secman/_adoc/modules/model/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/model/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/model/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/realm-shiro/pom.xml b/extensions/secman/realm-shiro/pom.xml
index c486330..220ebda 100644
--- a/extensions/secman/realm-shiro/pom.xml
+++ b/extensions/secman/realm-shiro/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/sse/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/sse/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/viewer-wicket-excel/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/mavendeps/_adoc/modules/ROOT/_attributes.adoc b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/mavendeps/_adoc/modules/ROOT/_attributes.adoc
+++ b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/mavendeps/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
rename to mavendeps/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index ba46be1..4e3049e 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -93,7 +93,7 @@
<!-- FIXME[ISIS-1976] plugins are optional -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
</dependencies>
diff --git a/site.yml b/site.yml
index 0184fa5..9165176 100644
--- a/site.yml
+++ b/site.yml
@@ -54,7 +54,7 @@ content:
branches: HEAD
- url: .
- start_path: core/testsupport/_adoc
+ start_path: antora/components/testing
branches: HEAD
- url: .
start_path: core/testsupport/unittestsupport/_adoc