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:52 UTC
[isis] 03/21: ISIS-2062: moves secman and shiro-realm-ldap from
extensions to security module.
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 8c563593798f6eed1bfa30bf12f794043635c20f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:19:56 2020 +0000
ISIS-2062: moves secman and shiro-realm-ldap from extensions to security module.
---
.../extensions/modules/ROOT/partials/component-nav.adoc | 4 ----
.../security/modules/ROOT/partials/component-nav.adoc | 3 ++-
.../src/main/doc/modules/secman/partials/module-nav.adoc | 11 ++++++-----
extensions/security/shiro-realm-ldap/src/main/doc/antora.yml | 2 +-
.../doc/modules/shiro-realm-ldap/partials/module-nav.adoc | 2 +-
5 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index 104d562..a10d993 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -3,10 +3,6 @@ include::extensions:ROOT:partial$module-nav.adoc[]
* JDO Persistence
include::extensions:flywayjdo:partial$module-nav.adoc[]
-* Security
-include::extensions:shiro-realm-ldap:partial$module-nav.adoc[]
-** xref:security:ROOT:about.adoc[SecMan]
-
* Wicket Viewer
include::extensions:exceldownload:partial$module-nav.adoc[]
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index c82d3a3..eea4ff8 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -5,5 +5,6 @@ include::security:shiro:partial$module-nav.adoc[]
include::security:keycloak:partial$module-nav.adoc[]
include::security:ROOT:partial$module-nav2.adoc[]
-* Secman (extension)
+* Extensions
include::security:secman:partial$module-nav.adoc[]
+include::security:shiro-realm-ldap:partial$module-nav.adoc[]
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
index 8f6315d..41ad8dc 100644
--- 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
@@ -1,5 +1,6 @@
-** 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)]
+** xref:security:ROOT:about.adoc[Secman]
+*** 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)]
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml b/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
index eeeeb1e..09a6b1a 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: security
version: master
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
index 86e6093..8d22851 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
@@ -1 +1 @@
-** xref:extensions:shiro-realm-ldap:about.adoc[LDAP Realm for Shiro]
\ No newline at end of file
+** xref:security:shiro-realm-ldap:about.adoc[LDAP Realm for Shiro]