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/03/24 11:17:25 UTC

[isis] 02/02: ISIS-2444: updates website with menu items for JPA docs

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch release-2.0.0-M5-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 7cb227f97b74fddb74874c5c8680f31a70cb6982
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Mar 24 11:15:29 2021 +0000

    ISIS-2444: updates website with menu items for JPA docs
---
 antora/components/docs/modules/ROOT/pages/about.adoc               | 7 ++++---
 .../docs/modules/ROOT/partials/module-nav/components.adoc          | 7 ++++---
 antora/playbooks/site-persistence.yml                              | 6 +++---
 antora/playbooks/site.yml                                          | 6 +++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc
index 5aad028..2bb8845 100644
--- a/antora/components/docs/modules/ROOT/pages/about.adoc
+++ b/antora/components/docs/modules/ROOT/pages/about.adoc
@@ -89,8 +89,8 @@ _Other_
 
 _Viewers_
 
-* xref:vw:ROOT:about.adoc[Wicket UI]
-* xref:vro:ROOT:about.adoc[Restful Objects (REST API)]
+* xref:vw:ROOT:about.adoc[Web UI (Wicket)]
+* xref:vro:ROOT:about.adoc[REST API (Restful Objects)]
 
 _Security_
 
@@ -98,7 +98,8 @@ _Security_
 
 _Persistence_
 
-* xref:pjdo:ROOT:about.adoc[DataNucleus (JDO)]
+* xref:pjpa:ROOT:about.adoc[JPA (EclipseLink)]
+* xref:pjdo:ROOT:about.adoc[JDO (DataNucleus)]
 
 _Extensions_
 
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
index 04c66d9..3ac57a5 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
@@ -9,8 +9,8 @@
 
 ** Viewers
 
-*** xref:vw:ROOT:about.adoc[Wicket UI]
-*** xref:vro:ROOT:about.adoc[Restful Objects (REST API)]
+*** xref:vw:ROOT:about.adoc[Web UI (Wicket)]
+*** xref:vro:ROOT:about.adoc[REST API (Restful Objects)]
 
 ** Security
 
@@ -18,7 +18,8 @@
 
 ** Persistence
 
-*** xref:pjdo:ROOT:about.adoc[DataNucleus (JDO)]
+*** xref:pjpa:ROOT:about.adoc[JPA (EclipseLink)]
+*** xref:pjdo:ROOT:about.adoc[JDO (DataNucleus)]
 
 ** Extensions
 
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-persistence.yml
index 774fdf0..87f1ffa 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-persistence.yml
@@ -39,11 +39,11 @@ content:
 
 # persistence
     - url: .
+      start_path: persistence/jpa/adoc # pjpa
+      branches: HEAD
+    - url: .
       start_path: persistence/jdo/adoc # pjdo
       branches: HEAD
-#    - url: .
-#      start_path: persistence/jpa/adoc # pjpa
-#      branches: HEAD
 
 # starters
     - url: .
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 381e752..1e02ff3 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -217,11 +217,11 @@ content:
 
 # persistence
     - url: .
+      start_path: persistence/jpa/adoc # pjpa
+      branches: HEAD
+    - url: .
       start_path: persistence/jdo/adoc # pjdo
       branches: HEAD
-#    - url: .
-#      start_path: persistence/jpa/adoc # pjpa
-#      branches: HEAD
 
 # security
     - url: .