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 2021/04/06 16:06:35 UTC
[isis] 02/02: ISIS-2484: cleaning up extension catalog a little
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M5
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a4c68abb59526ca52428190687add5228e7b655e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 6 17:06:14 2021 +0100
ISIS-2484: cleaning up extension catalog a little
---
.../modules/ROOT/partials/component-nav.adoc | 3 ++
extensions/adoc/modules/ROOT/pages/about.adoc | 50 ++++++++++++++++++----
.../adoc/modules/ROOT/partials/component-nav.adoc | 22 ----------
extensions/core/command-log/adoc/antora.yml | 2 +-
extensions/core/command-replay/adoc/antora.yml | 2 +-
extensions/core/command-replay/secondary/pom.xml | 6 +--
extensions/core/model-annotation/adoc/antora.yml | 2 +-
.../adoc/modules/ROOT/partials/component-nav.adoc | 8 ++--
8 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/antora/components/userguide/modules/ROOT/partials/component-nav.adoc b/antora/components/userguide/modules/ROOT/partials/component-nav.adoc
index 227dd73..1a5838f 100644
--- a/antora/components/userguide/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/userguide/modules/ROOT/partials/component-nav.adoc
@@ -3,7 +3,10 @@ include::userguide:btb:partial$module-nav.adoc[]
* Extensions
+include::userguide:command-log:partial$module-nav.adoc[]
+include::userguide:command-replay:partial$module-nav.adoc[]
include::userguide:flyway:partial$module-nav.adoc[]
+include::userguide:model-annotation:partial$module-nav.adoc[]
include::userguide:quartz:partial$module-nav.adoc[]
diff --git a/extensions/adoc/modules/ROOT/pages/about.adoc b/extensions/adoc/modules/ROOT/pages/about.adoc
index 01065c2..0565550 100644
--- a/extensions/adoc/modules/ROOT/pages/about.adoc
+++ b/extensions/adoc/modules/ROOT/pages/about.adoc
@@ -4,15 +4,47 @@
: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 [...]
:page-partial:
-This catalog lists a number of extensions to the framework.
-These typically are for use directly within by the domain application itself.
+Both the core framework and many of the framework components have a variety of optional extensions.
-For convenience, some of the extensions catalogued here are incorporated in other guides:
+This page catalogues all the available extensions, but they are incorporated into other guides:
-* in the xref:security:ROOT:about.adoc[security] guide, and the xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)] guide).
-+
-These extensions extend the capability of those components, or provide alternative implementations
+[.nogrid]
+[cols="1a,1a",frame="none", grid="none", stripes="none"]
+|===
+
+
+|
+xref:userguide:fun:about.adoc[User Guide] +
+for core extensions:
+
+include::userguide:command-log:partial$module-nav.adoc[]
+include::userguide:command-replay:partial$module-nav.adoc[]
+include::userguide:flyway:partial$module-nav.adoc[]
+include::userguide:model-annotation:partial$module-nav.adoc[]
+include::userguide:quartz:partial$module-nav.adoc[]
+
+|
+xref:security::about.adoc[Security] extensions:
+
+include::security:session-log:partial$module-nav.adoc[]
+include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+include::security:secman:partial$module-nav.adoc[]
+
+
+
+|xref:vro::about.adoc[Restful Objects] extensions:
+
+include::vro:cors:partial$module-nav.adoc[]
+
+
+|xref:vw::about.adoc[Wicket viewer] extensions:
+
+include::vw:exceldownload:partial$module-nav.adoc[]
+include::vw:fullcalendar:partial$module-nav.adoc[]
+include::vw:gmap3:partial$module-nav.adoc[]
+include::vw:pdfjs:partial$module-nav.adoc[]
+
+|===
+
+//* xref:testing:ROOT:about.adoc[Testing] extensions:
-* in the xref:testing:ROOT:about.adoc[testing] guide
-+
-The extensions here _are_ for use by the domain application, but only for testing or prototyping (eg fixtures) rather than in the business logic itself.
diff --git a/extensions/adoc/modules/ROOT/partials/component-nav.adoc b/extensions/adoc/modules/ROOT/partials/component-nav.adoc
index eb10ea6..4a1af0a 100644
--- a/extensions/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/extensions/adoc/modules/ROOT/partials/component-nav.adoc
@@ -1,24 +1,2 @@
include::extensions:ROOT:partial$module-nav.adoc[]
-* Core
-
-include::security:session-log:partial$module-nav.adoc[]
-include::extensions:command-log:partial$module-nav.adoc[]
-include::extensions:command-replay:partial$module-nav.adoc[]
-include::userguide:flyway:partial$module-nav.adoc[]
-include::extensions:model-annotation: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::vw:exceldownload:partial$module-nav.adoc[]
-include::vw:fullcalendar:partial$module-nav.adoc[]
-include::vw:gmap3:partial$module-nav.adoc[]
-include::vw:pdfjs:partial$module-nav.adoc[]
diff --git a/extensions/core/command-log/adoc/antora.yml b/extensions/core/command-log/adoc/antora.yml
index 2f3eff2..0baa972 100644
--- a/extensions/core/command-log/adoc/antora.yml
+++ b/extensions/core/command-log/adoc/antora.yml
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-name: extensions
+name: userguide
version: 2.0.0-M5
diff --git a/extensions/core/command-replay/adoc/antora.yml b/extensions/core/command-replay/adoc/antora.yml
index 2f3eff2..0baa972 100644
--- a/extensions/core/command-replay/adoc/antora.yml
+++ b/extensions/core/command-replay/adoc/antora.yml
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-name: extensions
+name: userguide
version: 2.0.0-M5
diff --git a/extensions/core/command-replay/secondary/pom.xml b/extensions/core/command-replay/secondary/pom.xml
index 2f31d1c..963d3d2 100644
--- a/extensions/core/command-replay/secondary/pom.xml
+++ b/extensions/core/command-replay/secondary/pom.xml
@@ -65,20 +65,18 @@
<artifactId>isis-mappings-jaxrsclient-impl</artifactId>
</dependency>
-<!--
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-command-log-jdo</artifactId>
</dependency>
--->
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-quartz-impl</artifactId>
</dependency>
-
+
<!-- TESTING -->
-
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-internaltestsupport</artifactId>
diff --git a/extensions/core/model-annotation/adoc/antora.yml b/extensions/core/model-annotation/adoc/antora.yml
index 2f3eff2..0baa972 100644
--- a/extensions/core/model-annotation/adoc/antora.yml
+++ b/extensions/core/model-annotation/adoc/antora.yml
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-name: extensions
+name: userguide
version: 2.0.0-M5
diff --git a/security/adoc/modules/ROOT/partials/component-nav.adoc b/security/adoc/modules/ROOT/partials/component-nav.adoc
index ffbabc4..280ee13 100644
--- a/security/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/security/adoc/modules/ROOT/partials/component-nav.adoc
@@ -10,9 +10,7 @@ include::security:ROOT:partial$module-nav-end.adoc[]
* Extensions
-include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+include::security:audit-trail:partial$module-nav.adoc[]
include::security:secman:partial$module-nav.adoc[]
-
-// commented out the libraries that have not yet been brought over from incode-platform
-//include::security:audit-trail:partial$module-nav.adoc[]
-//include::security:session-log:partial$module-nav.adoc[]
+include::security:session-log:partial$module-nav.adoc[]
+include::security:shiro-realm-ldap:partial$module-nav.adoc[]