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:50 UTC
[isis] 01/21: ISIS-2062: combines the secman docs together.
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 26afedd309e9733dfd8dff14dc9957308e2c6cf6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:11:45 2020 +0000
ISIS-2062: combines the secman docs together.
---
antora/playbooks/site-security.yml | 15 ---------------
antora/playbooks/site.yml | 15 ---------------
extensions/security/secman/api/src/main/doc/antora.yml | 2 --
.../secman/api/src/main/doc/modules/api/nav.adoc | 1 -
.../src/main/doc/modules/api/partials/module-nav.adoc | 1 -
.../secman/encryption-jbcrypt/src/main/doc/antora.yml | 2 --
.../src/main/doc/modules/encryption-jbcrypt/nav.adoc | 1 -
.../modules/encryption-jbcrypt/partials/module-nav.adoc | 1 -
extensions/security/secman/model/src/main/doc/antora.yml | 2 --
.../secman/model/src/main/doc/modules/model/nav.adoc | 1 -
.../src/main/doc/modules/model/partials/module-nav.adoc | 1 -
.../secman/persistence-jdo/src/main/doc/antora.yml | 2 --
.../src/main/doc/modules/persistence-jdo/nav.adoc | 1 -
.../doc/modules/persistence-jdo/partials/module-nav.adoc | 1 -
.../security/secman/shiro-realm/src/main/doc/antora.yml | 2 --
.../src/main/doc/modules/realm-shiro/nav.adoc | 1 -
.../doc/modules/realm-shiro/partials/module-nav.adoc | 1 -
...saddons-security-module-realm-with-delegate-realm.PNG | Bin
...ure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
.../main/doc/modules/ROOT/pages/api.adoc} | 0
.../main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc} | 0
.../main/doc/modules/ROOT/pages/jdo-persistence.adoc} | 0
.../main/doc/modules/ROOT/pages/model.adoc} | 0
.../main/doc/modules/ROOT/pages/shiro-realm.adoc} | 0
.../main/doc/modules/ROOT/partials/component-nav.adoc | 1 -
.../src/main/doc/modules/ROOT/partials/module-nav.adoc | 5 +++++
26 files changed, 5 insertions(+), 51 deletions(-)
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index ec3676f..2557843 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -34,21 +34,6 @@ content:
start_path: extensions/security/secman/src/main/doc # security
branches: HEAD
- url: .
- start_path: extensions/security/secman/api/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/model/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/shiro-realm/src/main/doc # security
- branches: HEAD
- - url: .
start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index f82b4f8..434fcd9 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -127,21 +127,6 @@ content:
start_path: extensions/security/secman/src/main/doc # security
branches: HEAD
- url: .
- start_path: extensions/security/secman/api/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/model/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/shiro-realm/src/main/doc # security
- branches: HEAD
- - url: .
start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
branches: HEAD
diff --git a/extensions/security/secman/api/src/main/doc/antora.yml b/extensions/security/secman/api/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/api/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/api/src/main/doc/modules/api/nav.adoc b/extensions/security/secman/api/src/main/doc/modules/api/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/api/src/main/doc/modules/api/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/api/src/main/doc/modules/api/partials/module-nav.adoc b/extensions/security/secman/api/src/main/doc/modules/api/partials/module-nav.adoc
deleted file mode 100644
index c251b74..0000000
--- a/extensions/security/secman/api/src/main/doc/modules/api/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:api:about.adoc[API]
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/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/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc
deleted file mode 100644
index 4cc0808..0000000
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:encryption-jbcrypt:about.adoc[JBCrypt Encryption]
diff --git a/extensions/security/secman/model/src/main/doc/antora.yml b/extensions/security/secman/model/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/model/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/model/src/main/doc/modules/model/nav.adoc b/extensions/security/secman/model/src/main/doc/modules/model/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/model/src/main/doc/modules/model/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/model/src/main/doc/modules/model/partials/module-nav.adoc b/extensions/security/secman/model/src/main/doc/modules/model/partials/module-nav.adoc
deleted file mode 100644
index a25cb9d..0000000
--- a/extensions/security/secman/model/src/main/doc/modules/model/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:model:about.adoc[Model]
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/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/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc
deleted file mode 100644
index a005b5c..0000000
--- a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:persistence-jdo:about.adoc[JDO Persistence]
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/nav.adoc b/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/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/shiro-realm/src/main/doc/modules/realm-shiro/partials/module-nav.adoc b/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/partials/module-nav.adoc
deleted file mode 100644
index b0a2d25..0000000
--- a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:realm-shiro:about.adoc[Realm (for Shiro)]
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/security/secman/api/src/main/doc/modules/api/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc
similarity index 100%
rename from extensions/security/secman/api/src/main/doc/modules/api/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc
similarity index 100%
rename from extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc
similarity index 100%
rename from extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc
diff --git a/extensions/security/secman/model/src/main/doc/modules/model/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc
similarity index 100%
rename from extensions/security/secman/model/src/main/doc/modules/model/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
similarity index 100%
rename from extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
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
index 814c28c..422ebe1 100644
--- 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
@@ -1,7 +1,6 @@
include::secman:ROOT:partial$module-nav.adoc[]
include::secman:api:partial$module-nav.adoc[]
include::secman:model:partial$module-nav.adoc[]
-include::secman:realm-shiro: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
index e69de29..0aa7514 100644
--- 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
@@ -0,0 +1,5 @@
+* 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)]