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