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/07 20:08:45 UTC
[isis] 05/05: ISIS-2259: further fix up of antora
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 9495f6ff4dd711eb8493fbe484adef1d17f25ab0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 7 19:24:36 2020 +0000
ISIS-2259: further fix up of antora
---
.../doc/modules/ROOT/partials/component-nav.adoc | 1 -
.../security/secman/api/src/main/doc/antora.yml | 2 +-
.../encryption-jbcrypt/src/main/doc/antora.yml | 2 +-
.../security/secman/model/src/main/doc/antora.yml | 2 +-
.../secman/persistence-jdo/src/main/doc/antora.yml | 2 +-
.../secman/shiro-realm/src/main/doc/antora.yml | 2 +-
extensions/security/secman/src/main/doc/antora.yml | 2 +-
.../doc/modules/shiro-realm-ldap/pages/about.adoc | 8 ++---
site-extensions.yml | 35 ++++++++++++++++++++--
site-incubator.yml | 4 +--
site-legacy.yml | 11 ++++---
site-mappings.yml | 13 ++++++++
site-subdomains.yml | 29 ++++++++++++++++++
site-testing.yml | 13 ++++++--
site-valuetypes.yml | 10 +++++++
site.yml | 2 +-
16 files changed, 114 insertions(+), 24 deletions(-)
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
index 992cf9c..e56cfd1 100644
--- a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1,2 +1 @@
include::pjdo:ROOT:partial$module-nav.adoc[]
-include::pjdo:flywayjdo:partial$module-nav.adoc[]
diff --git a/extensions/security/secman/api/src/main/doc/antora.yml b/extensions/security/secman/api/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/api/src/main/doc/antora.yml
+++ b/extensions/security/secman/api/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
version: master
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
version: master
diff --git a/extensions/security/secman/model/src/main/doc/antora.yml b/extensions/security/secman/model/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/model/src/main/doc/antora.yml
+++ b/extensions/security/secman/model/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
version: master
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
+++ b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
version: master
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
+++ b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
version: master
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/extensions/security/secman/src/main/doc/antora.yml
index b188a2d..88ed3f2 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/extensions/security/secman/src/main/doc/antora.yml
@@ -1,4 +1,4 @@
-name: extensions
+name: secman
title: "SecMan"
version: master
start_page: ROOT:about.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc
index 395791c..48d6984 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc
@@ -6,10 +6,10 @@ TODO
see `shiro.ini` (example)
-[source,properties]
-----
-include::security:shiro-realm-ldap:example$shiro.ini[]
-----
+//[source,properties]
+//----
+//include::security:shiro-realm-ldap:example$shiro.ini[]
+//----
== Setting up Users/Groups in Apache Directory Studio
diff --git a/site-extensions.yml b/site-extensions.yml
index d669d53..4ccdfde 100644
--- a/site-extensions.yml
+++ b/site-extensions.yml
@@ -17,13 +17,42 @@ content:
# extensions
- url: .
- start_path: extensions/core/spring/src/main/doc # extensions
+ start_path: extensions/persistence/flywayjdo/impl/src/main/doc # extensions
branches: HEAD
- url: .
- start_path: extensions/persistence/h2console/src/main/doc # extensions
+ start_path: extensions/persistence/h2console/impl/src/main/doc # extensions
branches: HEAD
- url: .
- start_path: extensions/persistence/hsqldbmgr/src/main/doc # extensions
+ start_path: extensions/persistence/hsqldbmgr/impl/src/main/doc # extensions
+ branches: HEAD
+
+ - url: .
+ 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
+
+ - url: .
+ start_path: extensions/vro/cors/src/main/doc # vro
+ branches: HEAD
+ - url: .
+ start_path: extensions/vw/exceldownload/src/main/doc # vw
branches: HEAD
diff --git a/site-incubator.yml b/site-incubator.yml
index 64189c4..bf2ebbb 100644
--- a/site-incubator.yml
+++ b/site-incubator.yml
@@ -17,10 +17,10 @@ content:
# incubator
- url: .
- start_path: incubator/core/model/src/main/doc # incubator
+ start_path: incubator/extensions/core/model/src/main/doc # incubator
branches: HEAD
- url: .
- start_path: incubator/core/microprofile/src/main/doc # incubator
+ start_path: incubator/extensions/core/microprofile/src/main/doc # incubator
branches: HEAD
diff --git a/site-legacy.yml b/site-legacy.yml
index c6eef96..47e6b91 100644
--- a/site-legacy.yml
+++ b/site-legacy.yml
@@ -17,16 +17,19 @@ content:
# legacy
- url: .
- start_path: legacy/core/applib/src/main/doc # legacy
+ start_path: legacy/extensions/core/applib/src/main/doc # legacy
branches: HEAD
- url: .
- start_path: legacy/core/commons/src/main/doc # legacy
+ start_path: legacy/extensions/core/commons/src/main/doc # legacy
branches: HEAD
- url: .
- start_path: legacy/core/runtime/src/main/doc # legacy
+ start_path: legacy/extensions/core/runtime/src/main/doc # legacy
branches: HEAD
- url: .
- start_path: legacy/vro/restclient/src/main/doc # legacy
+ start_path: legacy/mappings/restclient/src/main/doc # legacy
+ branches: HEAD
+ - url: .
+ start_path: legacy/subdomains/servletapi/impl/src/main/doc # legacy
branches: HEAD
diff --git a/site-mappings.yml b/site-mappings.yml
index 489bb56..5d5a27f 100644
--- a/site-mappings.yml
+++ b/site-mappings.yml
@@ -15,6 +15,19 @@ content:
start_path: antora/components/mappings # mappings
branches: HEAD
+ # mappings
+ - url: .
+ start_path: mappings/jaxrsclient/impl/src/main/doc # mappings
+ branches: HEAD
+ - url: .
+ start_path: mappings/minio/impl/src/main/doc # mappings
+ branches: HEAD
+ - url: .
+ start_path: mappings/restclient/impl/src/main/doc # mappings
+ branches: HEAD
+ - url: .
+ start_path: mappings/slack/impl/src/main/doc # mappings
+ branches: HEAD
ui:
diff --git a/site-subdomains.yml b/site-subdomains.yml
index b9b0b62..cda7ae8 100644
--- a/site-subdomains.yml
+++ b/site-subdomains.yml
@@ -15,6 +15,35 @@ content:
start_path: antora/components/subdomains # subdomains
branches: HEAD
+ # subdomains
+ - url: .
+ start_path: subdomains/base/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/docx/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/excel/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/freemarker/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/ognl/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/pdfbox/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/spring/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
+ branches: HEAD
+ - url: .
+ start_path: subdomains/zip/impl/src/main/doc # subdomains
+ branches: HEAD
+
ui:
diff --git a/site-testing.yml b/site-testing.yml
index dc9cf85..0db27cc 100644
--- a/site-testing.yml
+++ b/site-testing.yml
@@ -23,13 +23,20 @@ content:
start_path: core/testsupport/integtestsupport/src/main/doc # testing
branches: HEAD
-# extensions
+# testing
- url: .
- start_path: extensions/testing/fixtures/src/main/doc # testing
+ start_path: testing/fakedata/impl/src/main/doc # testing
branches: HEAD
- url: .
- start_path: extensions/testing/specsupport/src/main/doc # testing
+ start_path: testing/fixtures/src/main/doc # testing
branches: HEAD
+ - url: .
+ start_path: testing/specsupport/src/main/doc # testing
+ branches: HEAD
+ - url: .
+ start_path: testing/unittestsupport/impl/src/main/doc # testing
+ branches: HEAD
+
ui:
diff --git a/site-valuetypes.yml b/site-valuetypes.yml
index d2a1ba2..8684020 100644
--- a/site-valuetypes.yml
+++ b/site-valuetypes.yml
@@ -15,6 +15,16 @@ content:
start_path: antora/components/valuetypes # valuetypes
branches: HEAD
+ # valuetypes
+ - url: .
+ start_path: valuetypes/asciidoc/src/main/doc # vw
+ branches: HEAD
+ - url: .
+ start_path: valuetypes/markdown/src/main/doc # vw
+ branches: HEAD
+ - url: .
+ start_path: valuetypes/sse/src/main/doc # vw
+ branches: HEAD
ui:
diff --git a/site.yml b/site.yml
index 5ecaf0d..8868783 100644
--- a/site.yml
+++ b/site.yml
@@ -250,7 +250,7 @@ content:
start_path: testing/unittestsupport/impl/src/main/doc # testing
branches: HEAD
- # valuetypes
+# valuetypes
- url: .
start_path: valuetypes/asciidoc/src/main/doc # vw
branches: HEAD