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 2022/04/14 14:35:57 UTC
[isis] 02/03: ISIS-3001: further minor cleanup
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3001
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a751f820a6242e1d03b350bfb7844f9195a7aa20
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 15:24:30 2022 +0100
ISIS-3001: further minor cleanup
---
.../userguide/modules/ROOT/partials/extensions.adoc | 1 +
.../adoc/modules/excel/partials/module-nav.adoc | 2 +-
isis-tooling.yml | 7 +++----
.../modules/tooling-cli/examples/isis-tooling.yml | 15 +++------------
.../apache/isis/tooling/cli/test/isis-tooling.yml | 20 ++++++--------------
5 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/antora/components/userguide/modules/ROOT/partials/extensions.adoc b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
index c73696b1b4..42657a9538 100644
--- a/antora/components/userguide/modules/ROOT/partials/extensions.adoc
+++ b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
@@ -1,3 +1,4 @@
+include::userguide:excel:partial$module-nav.adoc[]
include::userguide:command-log:partial$module-nav.adoc[]
include::userguide:command-replay:partial$module-nav.adoc[]
include::userguide:flyway:partial$module-nav.adoc[]
diff --git a/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc b/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
index 05fbf416e2..dcf24b5140 100644
--- a/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
+++ b/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
@@ -1,4 +1,4 @@
-* xref:userguide:excel:about.adoc[Excel Library]
+** xref:userguide:excel:about.adoc[Excel Library]
diff --git a/isis-tooling.yml b/isis-tooling.yml
index 978124b6b5..752f7d80d5 100644
--- a/isis-tooling.yml
+++ b/isis-tooling.yml
@@ -54,6 +54,7 @@ commands:
"SSE": "org.apache.isis.valuetypes:isis-valuetypes-sse.*"
Extensions: org.apache.isis.extensions
+ "Applib: Excel": "org.apache.isis.extensions:isis-extensions-excel.*"
"Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
"Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
#"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
@@ -68,16 +69,14 @@ commands:
#"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
"Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
- Subdomains: org.apache.isis.subdomains
- "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
-
"Tooling": org.apache.isis.tooling.*
"Regression Tests": org.apache.isis.regressiontests.*
Incubator: org.apache.isis.incubator
"Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
- "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
+ "GraphQL Viewer": "org.apache.isis.incubator.viewer:isis-viewer-graphql.*"
"Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
+ "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
index:
diff --git a/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml b/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
index ac0d628fc5..752f7d80d5 100644
--- a/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
+++ b/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
@@ -54,6 +54,7 @@ commands:
"SSE": "org.apache.isis.valuetypes:isis-valuetypes-sse.*"
Extensions: org.apache.isis.extensions
+ "Applib: Excel": "org.apache.isis.extensions:isis-extensions-excel.*"
"Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
"Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
#"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
@@ -68,24 +69,14 @@ commands:
#"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
"Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
- Subdomains: org.apache.isis.subdomains
- "Base": "org.apache.isis.subdomains:isis-subdomains-base.*"
- #"docx": "org.apache.isis.subdomains:isis-subdomains-docx.*"
- "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
- #"Freemarker": "org.apache.isis.subdomains:isis-subdomains-freemarker.*"
- #"OGNL": "org.apache.isis.subdomains:isis-subdomains-ognl.*"
- #"PDF Box": "org.apache.isis.subdomains:isis-subdomains-pdfbox.*"
- "Spring": "org.apache.isis.subdomains:isis-subdomains-spring.*"
- "XDocReport": "org.apache.isis.subdomains:isis-subdomains-xdocreport.*"
- #"Zip": "org.apache.isis.subdomains:isis-subdomains-zip.*"
-
"Tooling": org.apache.isis.tooling.*
"Regression Tests": org.apache.isis.regressiontests.*
Incubator: org.apache.isis.incubator
"Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
- "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
+ "GraphQL Viewer": "org.apache.isis.incubator.viewer:isis-viewer-graphql.*"
"Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
+ "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
index:
diff --git a/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml b/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml
index 8e6003b68a..34684964fc 100644
--- a/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml
+++ b/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml
@@ -41,17 +41,20 @@ commands:
Bypass: "org.apache.isis.security:isis-security-bypass.*"
Keycloak: "org.apache.isis.security:isis-security-keycloak.*"
Shiro: "org.apache.isis.security:isis-security-shiro.*"
+ Spring: "org.apache.isis.security:isis-security-spring.*"
Viewer: org.apache.isis.viewer
+ "Common": "org.apache.isis.viewer:isis-viewer-common.*"
"Restful Objects": "org.apache.isis.viewer:isis-viewer-restfulobjects.*"
Wicket: "org.apache.isis.viewer:isis-viewer-wicket.*"
Valuetypes: org.apache.isis.valuetypes.*
"Asciidoc": "org.apache.isis.valuetypes:isis-valuetypes-asciidoc.*"
"Markdown": "org.apache.isis.valuetypes:isis-valuetypes-markdown.*"
- "SSE": "org.apache.isis.valuetypes:isis-valuetypes-ssec.*"
+ "SSE": "org.apache.isis.valuetypes:isis-valuetypes-sse.*"
Extensions: org.apache.isis.extensions
+ "Applib: Excel": "org.apache.isis.extensions:isis-extensions-excel.*"
"Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
"Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
#"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
@@ -66,25 +69,14 @@ commands:
#"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
"Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
- Subdomains: org.apache.isis.subdomains
- "Base": "org.apache.isis.subdomains:isis-subdomains-base.*"
- #"docx": "org.apache.isis.subdomains:isis-subdomains-docx.*"
- "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
- #"Freemarker": "org.apache.isis.subdomains:isis-subdomains-freemarker.*"
- #"OGNL": "org.apache.isis.subdomains:isis-subdomains-ognl.*"
- #"PDF Box": "org.apache.isis.subdomains:isis-subdomains-pdfbox.*"
- "Spring": "org.apache.isis.subdomains:isis-subdomains-spring.*"
- "XDocReport": "org.apache.isis.subdomains:isis-subdomains-xdocreport.*"
- #"Zip": "org.apache.isis.subdomains:isis-subdomains-zip.*"
-
"Tooling": org.apache.isis.tooling.*
"Regression Tests": org.apache.isis.regressiontests.*
Incubator: org.apache.isis.incubator
"Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
- "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
+ "GraphQL Viewer": "org.apache.isis.incubator.viewer:isis-viewer-graphql.*"
"Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
-
+ "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
index: