You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 11:17:51 UTC
[isis] 02/21: ISIS-2062: renames secman:ROOT to security:secman
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f27a28276283f04e6b24a64c374e63b9584dcecb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:15:57 2020 +0000
ISIS-2062: renames secman:ROOT to security:secman
---
README.adoc | 8 ++++----
.../extensions/modules/ROOT/partials/component-nav.adoc | 2 +-
antora/components/security/modules/ROOT/pages/about.adoc | 2 +-
.../security/modules/ROOT/partials/component-nav.adoc | 2 ++
antora/components/toc/modules/ROOT/pages/about.adoc | 2 +-
.../toc/modules/ROOT/pages/landing-page/guides.adoc | 2 +-
.../ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc | 10 +++++-----
antora/components/toc/modules/ROOT/partials/module-nav.adoc | 2 +-
.../modules/btb/pages/hints-and-tips/multi-tenancy.adoc | 4 ++--
.../pages/core-concepts/apache-isis-vs/mvc-server-side.adoc | 2 +-
.../modules/fun/pages/core-concepts/philosophy/aop.adoc | 2 +-
.../applib-cm/pages/classes/AppManifest-bootstrapping.adoc | 2 +-
.../applib-cm/pages/classes/contributee/HasUserName.adoc | 4 ++--
.../applib-cm/pages/classes/super/AbstractSubscriber.adoc | 2 +-
.../applib-svc/pages/core-domain-api/EventBusService.adoc | 2 +-
.../persistence-layer-spi/UserRegistrationService.adoc | 2 +-
.../src/main/doc/modules/config/pages/configuring-core.adoc | 2 +-
.../src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc | 2 +-
.../doc/modules/ROOT/pages/features/user-registration.adoc | 4 ++--
.../modules/ROOT/partials/security/user-registration.adoc | 2 +-
extensions/security/secman/src/main/doc/antora.yml | 6 +-----
.../security/secman/src/main/doc/modules/ROOT/nav.adoc | 1 -
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 6 ------
.../src/main/doc/modules/ROOT/partials/module-nav.adoc | 5 -----
...isisaddons-security-module-realm-with-delegate-realm.PNG | Bin
...figure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
.../security/secman/src/main/doc/modules/secman/nav.adoc | 1 +
.../src/main/doc/modules/{ROOT => secman}/pages/about.adoc | 0
.../src/main/doc/modules/{ROOT => secman}/pages/api.adoc | 0
.../modules/{ROOT => secman}/pages/jbcrypt-encryption.adoc | 0
.../doc/modules/{ROOT => secman}/pages/jdo-persistence.adoc | 0
.../src/main/doc/modules/{ROOT => secman}/pages/model.adoc | 0
.../doc/modules/{ROOT => secman}/pages/shiro-realm.adoc | 4 ++--
.../src/main/doc/modules/secman/partials/module-nav.adoc | 5 +++++
34 files changed, 40 insertions(+), 48 deletions(-)
diff --git a/README.adoc b/README.adoc
index 4c95cc5..314250a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -31,7 +31,7 @@ Please note that these modules are not part of ASF, but they *are* all licensed
=== Sign-in
Apache Isis integrates with http://shiro.apache.org[Apache Shiro].
-The core framework supports file-based realms, while the xref:secman:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
+The core framework supports file-based realms, while the xref:security:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png[link="https://raw.githubusercontent.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/what-is-apache-isis/isis-in-pictures/010-login.png"]
@@ -143,7 +143,7 @@ Under the activity menu are four sets of services which provide support for link
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png"]
-In the security menu is access to the rich set of functionality provided by the xref:secman:ROOT:about.adoc[SecMan extension]:
+In the security menu is access to the rich set of functionality provided by the xref:security:ROOT:about.adoc[SecMan extension]:
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png"]
@@ -161,7 +161,7 @@ image::https://raw.githubusercontent.com/apache/isis/master/antora/components/to
Of the various modules in the Incode Platform, the link:https://platform.incode.org/modules/spi/security/spi-security.html[security module] has the most features.
-NOTE: this module has now been integrated into the Apache Isis framework itself, as the xref:secman:ROOT:about.adoc[SecMan extension].
+NOTE: this module has now been integrated into the Apache Isis framework itself, as the xref:security:ROOT:about.adoc[SecMan extension].
One significant feature of the is the ability to associate users and objects with a "tenancy".
The todoapp uses this feature so that different users' list of todo items are kept separate from one another.
@@ -169,7 +169,7 @@ A user with administrator is able to switch their own "tenancy" to the tenancy o
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png"]
-For more details, see the security module's link:https://platform.incode.org/modules/spi/security/spi-security.html[README] (or xref:secman:ROOT:about.adoc[SecMan extension])..
+For more details, see the security module's link:https://platform.incode.org/modules/spi/security/spi-security.html[README] (or xref:security:ROOT:about.adoc[SecMan extension])..
=== Me
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index ff792bd..104d562 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -5,7 +5,7 @@ include::extensions:flywayjdo:partial$module-nav.adoc[]
* Security
include::extensions:shiro-realm-ldap:partial$module-nav.adoc[]
-** xref:secman:ROOT:about.adoc[SecMan]
+** xref:security:ROOT:about.adoc[SecMan]
* Wicket Viewer
diff --git a/antora/components/security/modules/ROOT/pages/about.adoc b/antora/components/security/modules/ROOT/pages/about.adoc
index 9be1d72..94befe2 100644
--- a/antora/components/security/modules/ROOT/pages/about.adoc
+++ b/antora/components/security/modules/ROOT/pages/about.adoc
@@ -37,7 +37,7 @@ The link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:http
Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups.
Apache Isis in turn extends this with its `IsisLdapRealm`, which provides more flexibility for both group/role and role/permissions management.
-In addition, the xref:secman:ROOT:about.adoc[SecMan extension] provides an implementation of the Shiro `Realm` API.
+In addition, the xref:security:ROOT:about.adoc[SecMan extension] provides an implementation of the Shiro `Realm` API.
This extension also represents users, roles and permissions as domain objects, allowing them to be administered through Apache Isis itself.
Moreover, it can also optionally delegate password management to a subsidiary (delegate) realm (usually LDAP as discussed above).
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index 4733610..c82d3a3 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -5,3 +5,5 @@ include::security:shiro:partial$module-nav.adoc[]
include::security:keycloak:partial$module-nav.adoc[]
include::security:ROOT:partial$module-nav2.adoc[]
+* Secman (extension)
+include::security:secman:partial$module-nav.adoc[]
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index df804c7..6570f90 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -38,7 +38,7 @@
* *xref:userguide:ROOT:about.adoc[User Guide]*
* *xref:refguide:ROOT:about.adoc[Reference Guide]*
* xref:security:ROOT:about.adoc[Security Guide]
-** xref:secman:ROOT:about.adoc[SecMan (extension)]
+** xref:security:ROOT:about.adoc[SecMan (extension)]
* *xref:testing:ROOT:about.adoc[Testing]*
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
index 231f5e7..d17de82 100644
--- a/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
@@ -8,7 +8,7 @@ This page lists the user and reference guides available for developers to create
* *xref:userguide:ROOT:about.adoc[User Guide]*
* *xref:refguide:ROOT:about.adoc[Reference Guide]*
* xref:security:ROOT:about.adoc[Security Guide]
-** xref:secman:ROOT:about.adoc[SecMan (extension)]
+** xref:security:ROOT:about.adoc[SecMan (extension)]
* *xref:testing:ROOT:about.adoc[Testing]*
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
index dbf92be..b7648ad 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
@@ -26,7 +26,7 @@ Let's start with the basics...
=== Sign-in
Apache Isis integrates with http://shiro.apache.org[Apache Shiro].
-The core framework supports file-based realms, while the xref:secman:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
+The core framework supports file-based realms, while the xref:security:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
@@ -182,7 +182,7 @@ image::what-is-apache-isis/isis-in-pictures/120-auditing.png[width="800px",link=
-In the security menu is access to the rich set of functionality provided by the xref:secman:ROOT:about.adoc[SecMan extension]:
+In the security menu is access to the rich set of functionality provided by the xref:security:ROOT:about.adoc[SecMan extension]:
image::what-is-apache-isis/isis-in-pictures/130-security.png[width="800px",link="{imagesdir}/what-is-apache-isis/isis-in-pictures/130-security.png"]
@@ -208,7 +208,7 @@ image::what-is-apache-isis/isis-in-pictures/150-appsettings.png[width="800px",li
=== Multi-tenancy support
-One significant feature of the xref:secman:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
+One significant feature of the xref:security:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
The todoapp uses this feature so that different users' list of todo items are kept separate from one another.
A user with administrator is able to switch their own "tenancy" to the tenancy of some other user, in order to access the objects in that tenancy:
@@ -216,12 +216,12 @@ image::what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png[width="800px"
-For more details, see the xref:secman:ROOT:about.adoc[SecMan extension].
+For more details, see the xref:security:ROOT:about.adoc[SecMan extension].
=== Me
-Most of the xref:secman:ROOT:about.adoc[SecMan extension]'s services are on the security menu, which would normally be provided only to administrators.
+Most of the xref:security:ROOT:about.adoc[SecMan extension]'s services are on the security menu, which would normally be provided only to administrators.
Kept separate is the "me" action:
image::what-is-apache-isis/isis-in-pictures/170-me.png[width="800px",link="{imagesdir}/what-is-apache-isis/isis-in-pictures/170-me.png"]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav.adoc b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
index da9748c..f26178e 100644
--- a/antora/components/toc/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
@@ -21,7 +21,7 @@
** xref:userguide:ROOT:about.adoc[User Guide]
** xref:refguide:ROOT:about.adoc[Reference Guide]
** xref:security:ROOT:about.adoc[Security Guide]
-*** xref:secman:ROOT:about.adoc[SecMan (extension)]
+*** xref:security:ROOT:about.adoc[SecMan (extension)]
** xref:testing:ROOT:about.adoc[Testing]
* Components
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
index b27eb2b..5a9c81d 100644
--- a/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
+++ b/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
@@ -4,8 +4,8 @@
:page-partial:
-One significant feature provided by the xref:secman:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
+One significant feature provided by the xref:security:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
-For more details, see the xref:secman:ROOT:about.adoc[SecMan extension]'s documentation.
+For more details, see the xref:security:ROOT:about.adoc[SecMan extension]'s documentation.
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index 2e4c4e5..2f21fbf 100644
--- a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -17,7 +17,7 @@ More sophisticated UIs can be built either by xref:vw:ROOT:extending.adoc[extend
Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.
Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent link:https://platform.incode.org[Incode Platform^] modules (non-ASF) tend to work at a higher-level of abstraction.
-For example, each of these frameworks will integrate with various security mechanism, but the xref:secman:ROOT:about.adoc[SecMan extension] provides a full subdomain of users, roles, features and permissions that can be plugged into any Apache Isis application.
+For example, each of these frameworks will integrate with various security mechanism, but the xref:security:ROOT:about.adoc[SecMan extension] provides a full subdomain of users, roles, features and permissions that can be plugged into any Apache Isis application.
Similarly, the link:https://platform.incode.org[Incode Platform^]'s command and audit modules in combination provide a support for auditing and traceability that can also be used for out of the box profiling.
Again, these addons can be plugged into any Isis app.
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
index e5f0959..b990c52 100644
--- a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
+++ b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
@@ -39,7 +39,7 @@ That's a rather more interesting cross-cutting concern than boring old logging!
Apache Isis also draws heavily on the AOP concept of interceptors.
Whenever an object is rendered in the UI, it is filtered with respect to the user's permissions.
That is, if a user is not authorized to either view or perhaps modify an object, then this is applied transparently by the framework.
-The xref:secman:ROOT:about.adoc[SecMan extension] provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.
+The xref:security:ROOT:about.adoc[SecMan extension] provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.
Another example of interceptors are the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s command and audit modules.
The command module captures every user interaction that modifies the state of the system (the "cause" of a change) while the audit module captures every change to every object (the "effect" of a change).
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
index df457a5..7bf22c6 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
@@ -93,7 +93,7 @@ As can be seen, the various (non-ASF) link:https://platform.incode.org[Incode Pl
We normally we recommend that services are defined exclusively through `getModules()`, and that this method should therefore return an empty list.
However, there are certain use cases where the a service must be explicitly specified either because the service required does not (for whatever reason) have a xref:refguide:applib-ant:DomainService.adoc[`@DomainService`] annotation.
-For example, the xref:secman:ROOT:about.adoc[SecMan extension] allows the policy to evaluate conflicting permissions to be specified by explicitly registering either the `PermissionsEvaluationServiceAllowBeatsVeto` domain service or the `PermissionsEvaluationServiceVetoBeatsAllow` domain service:
+For example, the xref:security:ROOT:about.adoc[SecMan extension] allows the policy to evaluate conflicting permissions to be specified by explicitly registering either the `PermissionsEvaluationServiceAllowBeatsVeto` domain service or the `PermissionsEvaluationServiceVetoBeatsAllow` domain service:
[source,java]
----
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
index 4d1d3a6..502e68e 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
@@ -16,9 +16,9 @@ public interface HasUsername {
}
----
-Modules in the xref:secman:ROOT:about.adoc[SecMan extension] and also the (non-ASF) link:https://platform.incode.org[Incode Platform^] that either have domain entity that implement and/or services that contribute this interface are:
+Modules in the xref:security:ROOT:about.adoc[SecMan extension] and also the (non-ASF) link:https://platform.incode.org[Incode Platform^] that either have domain entity that implement and/or services that contribute this interface are:
-* xref:secman:ROOT:about.adoc[SecMan extension]: `ApplicationUser` entity, `HasUsernameContributions` service
+* xref:security:ROOT:about.adoc[SecMan extension]: `ApplicationUser` entity, `HasUsernameContributions` service
* audit module: `AuditEntry` entity
* command module: `CommandJdo` entity, `HasUsernameContributions` service
* sessionlogger module: `SessionLogEntry` entity, `HasUsernameContributions` service
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
index 9a32efa..52544d2 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
@@ -8,7 +8,7 @@ This is a convenience superclass for creating subscriber domain services on the
It uses xref:refguide:applib-ant:PostConstruct.adoc[`@PostConstruct`] and xref:refguide:applib-ant:PreDestroy.adoc[`@PreDestroy`] callbacks to automatically register/unregister itself with the `EventBusService`.
It's important that subscribers register before any domain services that might emit events on the xref:refguide:applib-svc:core-domain-api/EventBusService.adoc[`EventBusService`].
-For example, the xref:secman:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
+For example, the xref:security:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
The easiest way to do this is to use the Spring link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[`@Order`] annotation.
As a convenience, the `AbstractSubscriber` specifies this attribute.
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
index 762b34e..ade147a 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
@@ -83,7 +83,7 @@ public class MySubscribingDomainService {
----
<1> subscribers are typically not visible in the UI, so specify a `DOMAIN` nature
<2> It's important that subscribers register before any domain services that might emit events on the event bus service.
-For example, the xref:secman:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
+For example, the xref:security:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
The easiest way to do this is to use the link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[`@Order`] annotation.
<3> register with the event bus service during xref:refguide:applib-ant:PostConstruct.adoc[`@PostConstruct`]
initialization
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
index 367cf6a..09208f0 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
@@ -54,7 +54,7 @@ The username and email address must both be unique (not being used by an existin
The core Apache Isis framework itself defines only an API; there is no default implementation.
Rather, the implementation will depend on the security mechanism being used.
-That said, if you have configured your app to use the xref:secman:ROOT:about.adoc[SecMan extension] then note that it _does_ provide an abstract implementation (`SecurityModuleAppUserRegistrationServiceAbstract`) of the `UserRegistrationService`.
+That said, if you have configured your app to use the xref:security:ROOT:about.adoc[SecMan extension] then note that it _does_ provide an abstract implementation (`SecurityModuleAppUserRegistrationServiceAbstract`) of the `UserRegistrationService`.
You will need to extend that service and provide implementation for the two abstract methods: `getInitialRole()` and `getAdditionalInitialRoles()`.
For example:
diff --git a/core/config/src/main/doc/modules/config/pages/configuring-core.adoc b/core/config/src/main/doc/modules/config/pages/configuring-core.adoc
index fdd722e..5523ec0 100644
--- a/core/config/src/main/doc/modules/config/pages/configuring-core.adoc
+++ b/core/config/src/main/doc/modules/config/pages/configuring-core.adoc
@@ -692,7 +692,7 @@ If an parent object has a (scalar) reference some other object to which the user
+
If an object is returned in a list of choices or within an auto-complete list, and the user does not have access, then it is excluded from the rendered list.
-The original motivation for this feature was to transparently support such features as multi-tenancy (as per the xref:secman:ROOT:about.adoc[SecMan extension]).
+The original motivation for this feature was to transparently support such features as multi-tenancy (as per the xref:security:ROOT:about.adoc[SecMan extension]).
That is, if an entity is logically "owned" by a user, then the multi-tenancy support can be arranged to prevent some other user from viewing that object.
By default this configuration property is enabled. To disable the visibility filtering, set the appropriate configuration property to `false`:
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc b/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
index fb22939..4d14a6d 100644
--- a/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
+++ b/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
@@ -7,7 +7,7 @@ There is nothing to stop you from using some other `Realm` implementation (or in
[WARNING]
====
-If you are happy to use a database then we strongly recommend you use the xref:secman:ROOT:about.adoc[SecMan extension] instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Apache Isis application.
+If you are happy to use a database then we strongly recommend you use the xref:security:ROOT:about.adoc[SecMan extension] instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Apache Isis application.
====
If you go down this route, then the architecture is as follows:
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc b/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
index 7b77866..2806043 100644
--- a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
+++ b/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
@@ -20,7 +20,7 @@ To support this the framework requires three services to be registered and confi
* the xref:refguide:applib-svc:integration-api/EmailService.adoc[email service], that is used by the email notification service to actually send the email.
The Apache Isis core framework provides a default implementation of both the email notification service and the email service.
-The xref:secman:ROOT:about.adoc[Security Manager] extension provides a partial implementation of xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] that you can complete for your own applications.
+The xref:security:ROOT:about.adoc[Security Manager] extension provides a partial implementation of xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] that you can complete for your own applications.
@@ -65,7 +65,7 @@ image::user-registration/sign-up-after-registration.png[width="800px",link="{ima
There are two prerequisites:
-* register an implementation of the xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] (eg by using the xref:secman:ROOT:about.adoc[SecMan extension])
+* register an implementation of the xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] (eg by using the xref:security:ROOT:about.adoc[SecMan extension])
* configure the xref:refguide:applib-svc:integration-api/EmailService.adoc[email service]
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
index ba78a52..1301f38 100644
--- a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
+++ b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
@@ -16,7 +16,7 @@ The sign-in verification page to render is pluggable; see xref:vw:ROOT:extending
User registration is only available if the xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[`UserRegistrationService`] is configured; this is used by the framework to actually create new instances of the user as accessed by the corresponding (Shiro) realm.
Because Shiro realms are pluggable, the Apache Isis framework does not provide default implementations of this service.
-However, if you are using the xref:secman:ROOT:about.adoc[SecMan extension], then this module _does_ provide an implementation (that, as you might expect, creates new "user" domain entities).
+However, if you are using the xref:security:ROOT:about.adoc[SecMan extension], then this module _does_ provide an implementation (that, as you might expect, creates new "user" domain entities).
And, if you are using the xref:security:realm-ldap:about.adoc[LDAP realm] and want to enable user-self registration then you'll need to write your own implementation of this service.
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/extensions/security/secman/src/main/doc/antora.yml
index 88ed3f2..09a6b1a 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/extensions/security/secman/src/main/doc/antora.yml
@@ -1,6 +1,2 @@
-name: secman
-title: "SecMan"
+name: security
version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
deleted file mode 100644
index 422ebe1..0000000
--- a/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-include::secman:ROOT:partial$module-nav.adoc[]
-include::secman:api:partial$module-nav.adoc[]
-include::secman:model:partial$module-nav.adoc[]
-include::secman:persistence-jdo:partial$module-nav.adoc[]
-include::secman:encryption-jbcrypt:partial$module-nav.adoc[]
-
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
deleted file mode 100644
index 0aa7514..0000000
--- a/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-* xref:secman:ROOT:api.adoc[API]
-* xref:secman:ROOT:model.adoc[Model]
-* xref:secman:ROOT:jbcrypt-encryption.adoc[JBCrypt Encryption]
-* xref:secman:ROOT:jdo-persistence.adoc[JDO Persistence]
-* xref:secman:ROOT:shiro-realm.adoc[Realm (for Shiro)]
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/security/secman/src/main/doc/modules/secman/nav.adoc b/extensions/security/secman/src/main/doc/modules/secman/nav.adoc
new file mode 100644
index 0000000..4ec4e15
--- /dev/null
+++ b/extensions/security/secman/src/main/doc/modules/secman/nav.adoc
@@ -0,0 +1 @@
+include::security:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/about.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/about.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/api.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/api.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/jbcrypt-encryption.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/jbcrypt-encryption.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/jdo-persistence.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/jdo-persistence.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/model.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/model.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc
similarity index 89%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc
index cc3ea27..658a8f1 100644
--- a/extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
+++ b/extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc
@@ -15,7 +15,7 @@ In the configuration above user passwords are stored in the database. The modul
-The xref:secman:ROOT:about.adoc[SecMan extension] also supports a slightly more sophisticated configuration.
+The xref:security:ROOT:about.adoc[SecMan extension] also supports a slightly more sophisticated configuration.
Most organizations use LDAP for user credentials, and maintaining two separate user accounts would be less than ideal.
The `IsisModuleSecurityRealm` can therefore be configured with a subsidiary "delegate" realm that is responsible for performing the primary authentication of the user; if that passes then a user is created (as a domain entity) automatically.
In most cases this delegate realm will be the LDAP realm, and so the architecture becomes:
@@ -23,7 +23,7 @@ In most cases this delegate realm will be the LDAP realm, and so the architectur
image::configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG[width="600px",link="{imagesdir}/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG"]
-The xref:secman:ROOT:about.adoc[SecMan extension] has many more features than are described here, all of which are described in the module's README.
+The xref:security:ROOT:about.adoc[SecMan extension] has many more features than are described here, all of which are described in the module's README.
The README also explains in detail how to configure an existing app to use this module.
//You can also look at the Isisaddons https://github.com/isisaddons/isis-app-todoapp[todoapp example] (not ASF), which is preconfigured to use the security module.
diff --git a/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc b/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
new file mode 100644
index 0000000..8f6315d
--- /dev/null
+++ b/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
@@ -0,0 +1,5 @@
+** xref:security:ROOT:api.adoc[API]
+** xref:security:ROOT:model.adoc[Model]
+** xref:security:ROOT:jbcrypt-encryption.adoc[JBCrypt Encryption]
+** xref:security:ROOT:jdo-persistence.adoc[JDO Persistence]
+** xref:security:ROOT:shiro-realm.adoc[Realm (for Shiro)]