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:53 UTC
[isis] 04/21: ISIS-2062: moves other modules from extensions to
pjdo, vw and vro
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 6837ce10c643ba647929aeef7e931f1aabe362d9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:36:55 2020 +0000
ISIS-2062: moves other modules from extensions to pjdo, vw and vro
---
.../extensions/modules/ROOT/partials/component-nav.adoc | 15 ++++++++++++---
.../security/modules/ROOT/partials/component-nav.adoc | 2 +-
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 3 +++
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 2 +-
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 4 ++++
.../persistence/jdo/flywayjdo/src/main/doc/antora.yml | 2 +-
.../jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc | 2 +-
.../main/doc/modules/flywayjdo/partials/module-nav.adoc | 2 +-
extensions/vro/cors/src/main/doc/antora.yml | 2 +-
extensions/vro/cors/src/main/doc/modules/cors/nav.adoc | 2 +-
.../src/main/doc/modules/cors/partials/module-nav.adoc | 2 +-
extensions/vw/exceldownload/src/main/doc/antora.yml | 2 +-
extensions/vw/pdfjs/src/main/doc/antora.yml | 2 +-
.../src/main/doc/modules/pdfjs/partials/module-nav.adoc | 2 +-
14 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index a10d993..0d5cc71 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -1,9 +1,18 @@
include::extensions:ROOT:partial$module-nav.adoc[]
* JDO Persistence
-include::extensions:flywayjdo:partial$module-nav.adoc[]
+
+include::pjdo:flywayjdo:partial$module-nav.adoc[]
+
+* Security
+include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+include::security:secman:partial$module-nav.adoc[]
+
+* Restful Objects Viewer
+
+include::vro:cors:partial$module-nav.adoc[]
* Wicket Viewer
-include::extensions:exceldownload:partial$module-nav.adoc[]
-include::extensions:pdfjs:partial$module-nav.adoc[]
+include::vw:exceldownload:partial$module-nav.adoc[]
+include::vw:pdfjs: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 eea4ff8..ddfab02 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -6,5 +6,5 @@ include::security:keycloak:partial$module-nav.adoc[]
include::security:ROOT:partial$module-nav2.adoc[]
* Extensions
-include::security:secman:partial$module-nav.adoc[]
include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+include::security:secman:partial$module-nav.adoc[]
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 e56cfd1..6807b58 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 +1,4 @@
include::pjdo:ROOT:partial$module-nav.adoc[]
+
+* Extensions
+include::pjdo:flywayjdo:partial$module-nav.adoc[]
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
index 750f7e6..75aaff8 100644
--- a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -2,4 +2,4 @@ include::vro:ROOT:partial$module-nav.adoc[]
include::vro:jaxrs-resteasy-4:partial$module-nav.adoc[]
* Extensions
-** xref:vro:restclient:about.adoc[REST Client]
+include::vro:cors:partial$module-nav.adoc[]
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
index f3d4c85..8fac32c 100644
--- a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1,2 +1,6 @@
include::vw:ROOT:partial$module-nav.adoc[]
+* Extensions
+include::vw:exceldownload:partial$module-nav.adoc[]
+include::vw:pdfjs:partial$module-nav.adoc[]
+
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml b/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml
index eeeeb1e..e805b25 100644
--- a/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml
+++ b/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: pjdo
version: master
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc
index 0d9fa23..4763d68 100644
--- a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc
+++ b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc
@@ -1,2 +1,2 @@
-include::pjdo:flywayjdo:partial$component-nav.adoc[]
+include::pjdo:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
index 13c46d1..dd0d54b 100644
--- a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
+++ b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-** xref:extensions:flywayjdo:about.adoc[Flyway for JDO]
+** xref:pjdo:flywayjdo:about.adoc[Flyway for JDO]
diff --git a/extensions/vro/cors/src/main/doc/antora.yml b/extensions/vro/cors/src/main/doc/antora.yml
index eeeeb1e..576eb80 100644
--- a/extensions/vro/cors/src/main/doc/antora.yml
+++ b/extensions/vro/cors/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: vro
version: master
diff --git a/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc b/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc
index e63c989..e4ac9a3 100644
--- a/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc
+++ b/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc
@@ -1,2 +1,2 @@
-include::vw:ROOT:partial$component-nav.adoc[]
+include::vro:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc b/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc
index 2f3a6aa..8fd27ec 100644
--- a/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc
+++ b/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc
@@ -1,2 +1,2 @@
-* xref:vw:sse:about.adoc[SSE (Extension)]
+** xref:vw:vro:about.adoc[CORS]
diff --git a/extensions/vw/exceldownload/src/main/doc/antora.yml b/extensions/vw/exceldownload/src/main/doc/antora.yml
index eeeeb1e..cb832ae 100644
--- a/extensions/vw/exceldownload/src/main/doc/antora.yml
+++ b/extensions/vw/exceldownload/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: vw
version: master
diff --git a/extensions/vw/pdfjs/src/main/doc/antora.yml b/extensions/vw/pdfjs/src/main/doc/antora.yml
index eeeeb1e..cb832ae 100644
--- a/extensions/vw/pdfjs/src/main/doc/antora.yml
+++ b/extensions/vw/pdfjs/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: vw
version: master
diff --git a/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc b/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc
index 4472fc7..90019e5 100644
--- a/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc
+++ b/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc
@@ -1,2 +1,2 @@
-** xref:extensions:pdfjs:about.adoc[pdf.js]
+** xref:vw:pdfjs:about.adoc[pdf.js]