You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/13 21:14:00 UTC
[isis] 03/07: ISIS-1267: tidying up so docs for keycloak that were
copied from shiro
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 13fcff7fcb8fb66942ec837f6b536cfd5bd20b99
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 12 20:19:38 2019 +0100
ISIS-1267: tidying up so docs for keycloak that were copied from shiro
---
.../modules/ROOT/partials/component-nav.adoc | 1 +
.../modules/{shiro => keycloak}/_attributes.adoc | 0
.../examples => keycloak/attachments}/.gitkeep | 0
.../attachments => keycloak/examples}/.gitkeep | 0
.../ldap/activeds-ldap-groups.png | Bin
.../ldap/activeds-ldap-mojo-partition.png | Bin
.../ldap/activeds-ldap-mojo-root-dse.png | Bin
.../ldap/activeds-ldap-sasl-authentication.png | Bin
.../configuring-shiro/ldap/activeds-ldap-users.png | Bin
.../configure-isis-to-use-shiro.png | Bin
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../configure-shiro-to-use-ini-realm.PNG | Bin
.../configure-shiro-to-use-isis-ldap-realm.PNG | Bin
.../_adoc/modules/{shiro => keycloak}/nav.adoc | 0
.../partials => keycloak/pages}/_attributes.adoc | 0
.../modules/{shiro => keycloak}/pages/about.adoc | 0
.../pages/configuring-isis-to-use-shiro.adoc | 0
.../pages/enhanced-wildcard-permission.adoc | 0
.../{shiro => keycloak}/pages/ini-realm.adoc | 0
.../modules/{shiro => keycloak}/pages/run-as.adoc | 0
.../{shiro => keycloak}/pages/shiro-caching.adoc | 0
.../pages => keycloak/partials}/_attributes.adoc | 0
.../modules/keycloak/partials/module-nav.adoc | 1 +
.../modules/shiro-realm-jdbc/_attributes.adoc | 6 -
.../modules/shiro-realm-jdbc/attachments/.gitkeep | 0
.../modules/shiro-realm-jdbc/examples/.gitkeep | 0
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin 33149 -> 0 bytes
.../_adoc/modules/shiro-realm-jdbc/nav.adoc | 1 -
.../shiro-realm-jdbc/pages/_attributes.adoc | 4 -
.../modules/shiro-realm-jdbc/pages/about.adoc | 111 ----------------
.../shiro-realm-jdbc/partials/_attributes.adoc | 4 -
.../shiro-realm-jdbc/partials/module-nav.adoc | 1 -
.../modules/shiro-realm-ldap/_attributes.adoc | 6 -
.../modules/shiro-realm-ldap/attachments/.gitkeep | 0
.../modules/shiro-realm-ldap/examples/.gitkeep | 0
.../images/activeds-ldap-groups.png | Bin 128224 -> 0 bytes
.../images/activeds-ldap-mojo-partition.png | Bin 123256 -> 0 bytes
.../images/activeds-ldap-mojo-root-dse.png | Bin 113723 -> 0 bytes
.../images/activeds-ldap-sasl-authentication.png | Bin 119544 -> 0 bytes
.../images/activeds-ldap-users.png | Bin 123030 -> 0 bytes
.../configure-shiro-to-use-isis-ldap-realm.PNG | Bin 32310 -> 0 bytes
.../_adoc/modules/shiro-realm-ldap/nav.adoc | 1 -
.../shiro-realm-ldap/pages/_attributes.adoc | 4 -
.../modules/shiro-realm-ldap/pages/about.adoc | 145 ---------------------
.../shiro-realm-ldap/partials/_attributes.adoc | 4 -
.../shiro-realm-ldap/partials/module-nav.adoc | 1 -
.../_adoc/modules/shiro/partials/module-nav.adoc | 10 --
47 files changed, 2 insertions(+), 298 deletions(-)
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index 47e3776..439df3b 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -2,6 +2,7 @@ include::security:ROOT:partial$module-nav.adoc[]
include::security:api:partial$module-nav.adoc[]
include::security:bypass:partial$module-nav.adoc[]
include::security:shiro:partial$module-nav.adoc[]
+include::security:keycloak:partial$module-nav.adoc[]
include::security:ROOT:partial$module-nav2.adoc[]
* Extensions
diff --git a/core/security/keycloak/_adoc/modules/shiro/_attributes.adoc b/core/security/keycloak/_adoc/modules/keycloak/_attributes.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/_attributes.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/_attributes.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/examples/.gitkeep b/core/security/keycloak/_adoc/modules/keycloak/attachments/.gitkeep
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/examples/.gitkeep
rename to core/security/keycloak/_adoc/modules/keycloak/attachments/.gitkeep
diff --git a/core/security/keycloak/_adoc/modules/shiro/attachments/.gitkeep b/core/security/keycloak/_adoc/modules/keycloak/examples/.gitkeep
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/attachments/.gitkeep
rename to core/security/keycloak/_adoc/modules/keycloak/examples/.gitkeep
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to core/security/keycloak/_adoc/modules/keycloak/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-isis-to-use-shiro.png b/core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-isis-to-use-shiro.png
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-isis-to-use-shiro.png
rename to core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-isis-to-use-shiro.png
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
rename to core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG b/core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
rename to core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
diff --git a/core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
rename to core/security/keycloak/_adoc/modules/keycloak/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
diff --git a/core/security/keycloak/_adoc/modules/shiro/nav.adoc b/core/security/keycloak/_adoc/modules/keycloak/nav.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/nav.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/nav.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/partials/_attributes.adoc b/core/security/keycloak/_adoc/modules/keycloak/pages/_attributes.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/partials/_attributes.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/pages/_attributes.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/pages/about.adoc b/core/security/keycloak/_adoc/modules/keycloak/pages/about.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/pages/about.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/pages/about.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/pages/configuring-isis-to-use-shiro.adoc b/core/security/keycloak/_adoc/modules/keycloak/pages/configuring-isis-to-use-shiro.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/pages/configuring-isis-to-use-shiro.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/pages/configuring-isis-to-use-shiro.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/pages/enhanced-wildcard-permission.adoc b/core/security/keycloak/_adoc/modules/keycloak/pages/enhanced-wildcard-permission.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/pages/enhanced-wildcard-permission.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/pages/enhanced-wildcard-permission.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/pages/ini-realm.adoc b/core/security/keycloak/_adoc/modules/keycloak/pages/ini-realm.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/pages/ini-realm.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/pages/ini-realm.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/pages/run-as.adoc b/core/security/keycloak/_adoc/modules/keycloak/pages/run-as.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/pages/run-as.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/pages/run-as.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/pages/shiro-caching.adoc b/core/security/keycloak/_adoc/modules/keycloak/pages/shiro-caching.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/pages/shiro-caching.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/pages/shiro-caching.adoc
diff --git a/core/security/keycloak/_adoc/modules/shiro/pages/_attributes.adoc b/core/security/keycloak/_adoc/modules/keycloak/partials/_attributes.adoc
similarity index 100%
rename from core/security/keycloak/_adoc/modules/shiro/pages/_attributes.adoc
rename to core/security/keycloak/_adoc/modules/keycloak/partials/_attributes.adoc
diff --git a/core/security/keycloak/_adoc/modules/keycloak/partials/module-nav.adoc b/core/security/keycloak/_adoc/modules/keycloak/partials/module-nav.adoc
new file mode 100644
index 0000000..ac7c186
--- /dev/null
+++ b/core/security/keycloak/_adoc/modules/keycloak/partials/module-nav.adoc
@@ -0,0 +1 @@
+* xref:security:keycloak:about.adoc[Keycloak]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/_attributes.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/_attributes.adoc
deleted file mode 100644
index 43cb529..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/_attributes.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/attachments
-:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/images
-:partialsdir: {moduledir}/partials
-endif::[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/attachments/.gitkeep b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/attachments/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/examples/.gitkeep b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/examples/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/images/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/images/configure-shiro-to-use-custom-jdbc-realm.png
deleted file mode 100644
index d64751a..0000000
Binary files a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/images/configure-shiro-to-use-custom-jdbc-realm.png and /dev/null differ
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/nav.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/nav.adoc
deleted file mode 100644
index 4ec4e15..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::security:ROOT:partial$component-nav.adoc[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/pages/_attributes.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/pages/_attributes.adoc
deleted file mode 100644
index e8ada7c..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/pages/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/pages/about.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/pages/about.adoc
deleted file mode 100644
index f8b6376..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/pages/about.adoc
+++ /dev/null
@@ -1,111 +0,0 @@
-= Shiro JDBC Realm
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::_attributes.adoc[]
-:page-partial:
-
-
-There is nothing to stop you from using some other `Realm` implementation (or indeed writing one yourself). For example, you could use Shiro's own JDBC realm that loads user/password details from a database.
-
-[WARNING]
-====
-If you are happy to use a database then we strongly recommend you use the xref:ext-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 go down this route, then the architecture is as follows:
-
-image::configure-shiro-to-use-custom-jdbc-realm.png[width="600px",link="{imagesdir}/configure-shiro-to-use-custom-jdbc-realm.png"]
-
-
-
-
-There's quite a lot of configuration required (in `WEB-INF/shiro.ini`) to set up a JDBC realm, so we'll break it out into sections.
-
-First, we need to set up the connection to JDBC:
-
-[source,ini]
-----
-jdbcRealm=org.apache.shiro.realm.jdbc.JdbcRealm # <1>
-
-jof = org.apache.shiro.jndi.JndiObjectFactory # <2>
-jof.resourceName = jdbc/postgres # <3>
-jof.requiredType = javax.sql.DataSource
-jof.resourceRef = true
-
-jdbcRealm.dataSource = $jof # <4>
-----
-<1> instantiate the JDBC realm
-<2> instantiate factory object to lookup DataSource from servlet container
-<3> name of the datasource (as configured in `web.xml`)
-<4> instruct JDBC realm to obtain datasource from the JNDI
-
-
-We next need to tell the realm how to query the database. Shiro supports any schema; what matters is the input search argument and the output results.
-
-[source,ini]
-----
-
-jdbcRealm.authenticationQuery = \ # <1>
- select password \
- from users \
- where username = ?
-
-jdbcRealm.userRolesQuery = \ # <2>
- select r.label \
- from users_roles ur \
- inner join roles r \
- on ur.role_id = r.id \
- where user_id = ( \
- select id \
- from users \
- where username = ?); \
-
-jdbcRealm.permissionsQuery= \ # <3>
- select p.permission \
- from roles_permissions rp \
- inner join permissions p \
- on rp.permission_id = p.id \
- where rp.role_id = ( \
- select id \
- from roles \
- where label = ?);
-
-jdbcRealm.permissionsLookupEnabled=true # <4>
-----
-<1> query to find password for user
-<2> query to find roles for user
-<3> query to find permissions for role
-<4> enable permissions lookup
-
-[WARNING]
-====
-The `permissionsLookupEnabled` is very important, otherwise Shiro just returns an empty list of permissions and your users will have no access to any features(!).
-====
-
-We also should ensure that the passwords are not stored as plain-text:
-
-[source,ini]
-----
-dps = org.apache.shiro.authc.credential.DefaultPasswordService # <1>
-pm = org.apache.shiro.authc.credential.PasswordMatcher # <2>
-pm.passwordService = $dps
-jdbcRealm.credentialsMatcher = $pm # <3>
-----
-<1> mechanism to encrypts password
-<2> service to match passwords
-<3> instruct JDBC realm to use password matching service when authenticating
-
-
-And finally we need to tell Shiro to use the realm, in the usual fashion:
-
-[source,ini]
-----
-securityManager.realms = $jdbcRealm
-----
-
-Using the above configuration you will also need to setup a `DataSource`. The details vary by servlet container, for example this is link:https://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html[how to do the setup on Tomcat 8.0].
-
-[WARNING]
-====
-The name of the `DataSource` can also vary by servlet container; see for example link:http://stackoverflow.com/questions/17441019/how-to-configure-jdbcrealm-to-obtain-its-datasource-from-jndi/23784702#23784702[this StackOverflow answer].
-====
-
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/partials/_attributes.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/partials/_attributes.adoc
deleted file mode 100644
index e8ada7c..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/partials/module-nav.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/partials/module-nav.adoc
deleted file mode 100644
index c9d2bc7..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-jdbc/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-// this module's pages are referenced by security-shiro module
\ No newline at end of file
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/_attributes.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/_attributes.adoc
deleted file mode 100644
index 43cb529..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/_attributes.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/attachments
-:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/images
-:partialsdir: {moduledir}/partials
-endif::[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/attachments/.gitkeep b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/attachments/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/examples/.gitkeep b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/examples/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-groups.png b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-groups.png
deleted file mode 100644
index 0496a84..0000000
Binary files a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-groups.png and /dev/null differ
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-mojo-partition.png b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-mojo-partition.png
deleted file mode 100644
index 42d7480..0000000
Binary files a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-mojo-partition.png and /dev/null differ
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-mojo-root-dse.png b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-mojo-root-dse.png
deleted file mode 100644
index 9c4c480..0000000
Binary files a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-mojo-root-dse.png and /dev/null differ
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-sasl-authentication.png b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-sasl-authentication.png
deleted file mode 100644
index 91d1a61..0000000
Binary files a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-sasl-authentication.png and /dev/null differ
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-users.png b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-users.png
deleted file mode 100644
index 7ff133c..0000000
Binary files a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/activeds-ldap-users.png and /dev/null differ
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/configure-shiro-to-use-isis-ldap-realm.PNG
deleted file mode 100644
index 2a52910..0000000
Binary files a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/images/configure-shiro-to-use-isis-ldap-realm.PNG and /dev/null differ
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/nav.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/nav.adoc
deleted file mode 100644
index 4ec4e15..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::security:ROOT:partial$component-nav.adoc[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/pages/_attributes.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/pages/_attributes.adoc
deleted file mode 100644
index e8ada7c..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/pages/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/pages/about.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/pages/about.adoc
deleted file mode 100644
index 5aecbbf..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/pages/about.adoc
+++ /dev/null
@@ -1,145 +0,0 @@
-= Ldap Realm
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::_attributes.adoc[]
-:page-partial:
-
-
-Apache Isis ships with an implementation of http://shiro.apache.org[Apache Shiro]'s `Realm` class that allows user authentication and authorization to be performed against an LDAP server.
-
-image::configure-shiro-to-use-isis-ldap-realm.PNG[width="600px",link="{imagesdir}/configure-shiro-to-use-isis-ldap-realm.PNG"]
-
-The LDAP database stores the user/passwords and user groups, while the `shiro.ini` file is used to map the LDAP groups to roles, and to map the roles to permissions.
-
-== Shiro Configuration
-
-To use LDAP involves telling Shiro how to instantiate the realm. This bootstrapping info lives in the `WEB-INF/shiro.ini`:
-
-[source,ini]
-----
-contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
-contextFactory.url = ldap://localhost:10389
-contextFactory.systemUsername = uid=admin,ou=system # <1>
-contextFactory.systemPassword = secret
-contextFactory.authenticationMechanism = CRAM-MD5 # <2>
-contextFactory.systemAuthenticationMechanism = simple
-
-ldapRealm = org.apache.isis.security.shiro.IsisLdapRealm # <3>
-ldapRealm.contextFactory = $contextFactory
-
-ldapRealm.searchBase = ou=groups,o=mojo # <4>
-ldapRealm.groupObjectClass = groupOfUniqueNames # <5>
-ldapRealm.uniqueMemberAttribute = uniqueMember # <6>
-ldapRealm.uniqueMemberAttributeValueTemplate = uid={0}
-
-# optional mapping from physical groups to logical application roles
-ldapRealm.rolesByGroup = \ # <7>
- LDN_USERS: user_role,\
- NYK_USERS: user_role,\
- HKG_USERS: user_role,\
- GLOBAL_ADMIN: admin_role,\
- DEMOS: self-install_role
-
-ldapRealm.permissionsByRole=\ # <8>
- user_role = *:ToDoItemsJdo:*:*,\
- *:ToDoItem:*:*; \
- self-install_role = *:ToDoItemsFixturesService:install:* ; \
- admin_role = *
-
-securityManager.realms = $ldapRealm
-----
-<1> user accounts are searched using a dedicated service account
-<2> SASL (CRAM-MD5) authentication is used for this authentication
-<3> Apache Isis' implementation of the LDAP realm.
-<4> groups are searched under `ou=groups,o=mojo` (where `mojo` is the company name)
-<5> each group has an LDAP objectClass of `groupOfUniqueNames`
-<6> each group has a vector attribute of `uniqueMember`
-<7> groups looked up from LDAP can optionally be mapped to logical roles; otherwise groups are used as role names directly
-<8> roles are mapped in turn to permissions
-
-The value of `uniqueMember` is in the form `uid=xxx`, with `xxx` being the uid of the user
-* users searched under `ou=system`
-* users have, at minimum, a `uid` attribute and a password
-* the users credentials are used to verify their user/password
-
-The above configuration has been tested against http://directory.apache.org/apacheds/[ApacheDS], v1.5.7. This can be administered using http://directory.apache.org/studio/[Apache Directory Studio], v1.5.3.
-
-
-[TIP]
-.Shiro Realm Mappings
-====
-When configuring role based permission mapping, there can only be one of these entries per realm:
-
-[source,ini]
-----
-realm.groupToRolesMappings = ...
-----
-
-and
-
-[source,ini]
-----
-realm.roleToPermissionsMappings = ...
-----
-
-This forces you to put everything on one line for each of the above. This is, unfortunately, a Shiro "feature". And if you repeat the entries above then it's "last one wins".)
-
-To make the configuration maintainable, use "\" to separate the mappings onto separate lines in the file. Use this technique for both group to roles mapping and role to permission mapping. If you use the '' after the "," that separates the key:value pairs it is more readable.
-====
-
-
-
-
-
-
-== Externalizing role perms
-
-As an alternative to injecting the `permissionsByRole` property, the role/permission mapping can alternatively be specified by injecting a resource path:
-
-[source,ini]
-----
-ldapRealm.resourcePath=classpath:webapp/myroles.ini
-----
-
-where `myroles.ini` is in `src/main/resources/webapp`, and takes the form:
-
-[source,ini]
-----
-[roles]
-user_role = *:ToDoItemsJdo:*:*,\
- *:ToDoItem:*:*
-self-install_role = *:ToDoItemsFixturesService:install:*
-admin_role = *
-----
-
-This separation of the role/mapping can be useful if Shiro is configured to support multiple realms (eg an LdapRealm based one and also an TextRealm)
-
-
-
-
-== Active DS LDAP tutorial
-
-The screenshots below show how to setup LDAP accounts in ApacheDS using the Apache Directory Studio.
-
-The setup here was initially based on http://krams915.blogspot.co.uk/2011/01/ldap-apache-directory-studio-basic.html[this tutorial], however we have moved the user accounts so that they are defined in a separate LDAP node.
-
-To start, create a partition in order to hold the mojo node (holding the groups):
-
-image::activeds-ldap-mojo-partition.png[link="{imagesdir}/activeds-ldap-mojo-partition.png"]
-
-Create the `ou=groups,o=mojo` hierarchy:
-
-image::activeds-ldap-mojo-root-dse.png[link="{imagesdir}/activeds-ldap-mojo-root-dse.png"]
-
-Configure SASL authentication. This means that the checking of user/password is done implicitly by virtue of Apache Isis connecting to LDAP using these credentials:
-
-image::activeds-ldap-sasl-authentication.png[link="{imagesdir}/activeds-ldap-sas"]
-
-In order for SASL to work, it seems to be necessary to put users under `o=system`. (This is why the setup is slightly different than the tutorial mentioned above):
-
-image::activeds-ldap-users.png[link="{imagesdir}/activeds-ldap-users.png"]
-
-Configure the users into the groups:
-
-image::activeds-ldap-groups.png[link="{imagesdir}/activeds-ldap-groups.png"]
-
-
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/partials/_attributes.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/partials/_attributes.adoc
deleted file mode 100644
index e8ada7c..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/partials/module-nav.adoc b/core/security/keycloak/_adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
deleted file mode 100644
index c9d2bc7..0000000
--- a/core/security/keycloak/_adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-// this module's pages are referenced by security-shiro module
\ No newline at end of file
diff --git a/core/security/keycloak/_adoc/modules/shiro/partials/module-nav.adoc b/core/security/keycloak/_adoc/modules/shiro/partials/module-nav.adoc
deleted file mode 100644
index a209cde..0000000
--- a/core/security/keycloak/_adoc/modules/shiro/partials/module-nav.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-* Shiro Implementation
-
-** xref:security:shiro:configuring-isis-to-use-shiro.adoc[Configuring to use Shiro]
-** Realms
-*** xref:security:shiro:ini-realm.adoc[INI Realm]
-*** xref:security:shiro-realm-jdbc:about.adoc[JDBC Realm]
-*** xref:security:shiro-realm-ldap:about.adoc[LDAP Realm]
-** xref:security:shiro:enhanced-wildcard-permission.adoc[Enhanced Wildcard Permissions]
-** xref:security:shiro:run-as.adoc[Run As]
-** xref:security:shiro:shiro-caching.adoc[Shiro Caching]