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/10/17 11:50:56 UTC
[isis] branch 2.0.0-M4 created (now 4d1b44d)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git.
at 4d1b44d ISIS-2322: bumps antora.yml and index.html to 2.0.0-M4
This branch includes the following new commits:
new 6f59906 ISIS-2322: minor tweaks to release process
new a1c9aad ISIS-2322: reorganises existing kroviz client docs, also stub docs for vaadin viewer
new 01b4240 ISIS-2322: adds stub docs for jpa and javafx viewers
new a92b2d3 ISIS-2322: updates antora playbooks for kroviz, vaadin, jpa and javafx
new a94f052 ISIS-2322: updates to release process
new de77872 ISIS-2322: adds relnotes for M4, STATUS and doap_isis.rdf
new e235281 ISIS-2322: fixes upd.sh in release process
new ae2daf2 ISIS-2322: updates schema files in the website
new 0aded7c ISIS-2322: updates release procedure
new 7d3d018 ISIS-2322: further improvements to release notes
new 4d1b44d ISIS-2322: bumps antora.yml and index.html to 2.0.0-M4
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis] 07/11: ISIS-2322: fixes upd.sh in release process
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e235281cdad769771cf4282204841c5901ce8f55
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:25:34 2020 +0100
ISIS-2322: fixes upd.sh in release process
---
.../ROOT/pages/post-release-successful.adoc | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index be86e8c..e7d5c5c 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -217,26 +217,25 @@ asc="$zip.asc"
md5="$zip.md5"
-#
-# isis-core
-#
-type="core"
fullname="isis-parent"
-pushd isis-core
+pushd isis-parent
-curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$asc
+curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$asc
svn add $fullname-$new_ver-$asc
-curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$md5
+curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$md5
svn add $fullname-$new_ver-$md5
-curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$zip
+curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$zip
svn add $fullname-$new_ver-$zip
-svn delete $fullname-$old_ver-$asc
-svn delete $fullname-$old_ver-$md5
-svn delete $fullname-$old_ver-$zip
+if [ "Z${old_ver}Z" == "ZZ" ]; then
+ echo "old_ver not specified, so nothing will be removed"
+else
+ svn delete $fullname-$old_ver-$asc
+ svn delete $fullname-$old_ver-$md5
+ svn delete $fullname-$old_ver-$zip
+fi
popd
-
----
[source,bash,subs="attributes+"]
[isis] 01/11: ISIS-2322: minor tweaks to release process
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6f5990626c0bf876795ba393193225273be902f9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 13 07:19:59 2020 +0100
ISIS-2322: minor tweaks to release process
---
.../comguide/modules/ROOT/pages/cutting-a-release.adoc | 13 ++++++++++---
.../comguide/modules/ROOT/partials/verify-process.adoc | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
index a0661e2..746b920 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -372,10 +372,11 @@ Therefore (still in the `isis-parent` directory):
[source,bash,subs="attributes+"]
----
mvn versions:set -DnewVersion=2.0.0-SNAPSHOT
-mvn install -DskipTests -o
+mvn install -DskipTests -o -Dreleased -P'!all'
pushd ../starters
mvn versions:set -DnewVersion=2.0.0-SNAPSHOT
+mvn install -DskipTests -o
popd
git add ..
@@ -439,11 +440,12 @@ git checkout -b $ISISBRANCH
mvn versions:update-parent -DparentVersion=$ISISREL # <.>
mvn versions:set -DnewVersion=$ISISREL
-mvn clean install -o -Dmetamodel.lockdown
-mvn -pl webapp test -o -Dmavendeps.lockdown
+mvn clean install -Dmetamodel.lockdown
+mvn -pl webapp test -Dmavendeps.lockdown -B # <.>
----
<.> requires the current parent to exist locally in `~/.m2/repository`.
If this isn't the case, then manually edit instead.
+<.> the -B flag is required to avoid control characters in generated output
+
Approve any failed lockdown tests (the mavendeps will fail first time around because the dependencies on Apache Isis itself have just be bumped).
+
@@ -453,6 +455,11 @@ Repeat, then run the app as a sanity check:
----
mvn -pl webapp spring-boot:run
----
++
+You could also check the output of the Cucumber tests, under:
+
+** `webapp/target/cucumber-reports` and
+** `webapp/target/cucumber-html-reports`.
* For both apps, commit any changes and then push the release branch to origin once ok:
+
diff --git a/antora/components/comguide/modules/ROOT/partials/verify-process.adoc b/antora/components/comguide/modules/ROOT/partials/verify-process.adoc
index 4d22d20..e33dcd6 100644
--- a/antora/components/comguide/modules/ROOT/partials/verify-process.adoc
+++ b/antora/components/comguide/modules/ROOT/partials/verify-process.adoc
@@ -5,7 +5,7 @@ NEXUSREPONUM=11xx
curl https://downloads.apache.org/isis/KEYS > /tmp/KEYS
gpg --import /tmp/KEYS
-rm -rf isis-$VERSION*
+rm -rf isis-$VERSION
curl -O -L https://raw.githubusercontent.com/apache/isis/release-$VERSION-$RC/scripts/verify-isis-release.sh
[isis] 04/11: ISIS-2322: updates antora playbooks for kroviz, vaadin,
jpa and javafx
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a92b2d334ada248abe889360d64dab948c83ff82
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:06:16 2020 +0100
ISIS-2322: updates antora playbooks for kroviz, vaadin, jpa and javafx
---
antora/playbooks/site-incubator.yml | 9 +++++++++
antora/playbooks/site-persistence.yml | 3 +++
antora/playbooks/site.yml | 12 ++++++++++++
3 files changed, 24 insertions(+)
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index 00220a3..c9c8d1f 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -38,6 +38,15 @@ content:
start_path: incubator/adoc # incubator
branches: HEAD
- url: .
+ start_path: incubator/clients/kroviz/adoc # incubator
+ branches: HEAD
+# - url: .
+# start_path: incubator/viewers/javafx/adoc # incubator
+# branches: HEAD
+ - url: .
+ start_path: incubator/viewers/vaadin/adoc # incubator
+ branches: HEAD
+ - url: .
start_path: incubator/mappings/microprofile/src/main/adoc # incubator
branches: HEAD
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-persistence.yml
index 35b885c..774fdf0 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-persistence.yml
@@ -41,6 +41,9 @@ content:
- 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 1eec227..896fa50 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -152,6 +152,15 @@ content:
start_path: incubator/adoc # incubator
branches: HEAD
- url: .
+ start_path: incubator/clients/kroviz/adoc # incubator
+ branches: HEAD
+# - url: .
+# start_path: incubator/viewers/javafx/adoc # incubator
+# branches: HEAD
+ - url: .
+ start_path: incubator/viewers/vaadin/adoc # incubator
+ branches: HEAD
+ - url: .
start_path: incubator/mappings/microprofile/src/main/adoc # incubator
branches: HEAD
@@ -207,6 +216,9 @@ content:
- url: .
start_path: persistence/jdo/adoc # pjdo
branches: HEAD
+# - url: .
+# start_path: persistence/jpa/adoc # pjpa
+# branches: HEAD
# security
- url: .
[isis] 08/11: ISIS-2322: updates schema files in the website
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ae2daf2ccb28f068afcb3cea62dc0067c7830b09
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:30:49 2020 +0100
ISIS-2322: updates schema files in the website
---
antora/supplemental-ui/schema/common/common-2.0.xsd | 12 ------------
antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd | 8 +++++++-
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/antora/supplemental-ui/schema/common/common-2.0.xsd b/antora/supplemental-ui/schema/common/common-2.0.xsd
index d36a0ba..356d5ff 100644
--- a/antora/supplemental-ui/schema/common/common-2.0.xsd
+++ b/antora/supplemental-ui/schema/common/common-2.0.xsd
@@ -58,18 +58,6 @@
</xs:complexType>
<xs:complexType name="oidDto">
- <xs:sequence>
- <xs:element name="objectType" type="xs:string">
- <xs:annotation>
- <xs:documentation>Deprecated, use the 'objectType' attribute instead.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="objectIdentifier" type="xs:string">
- <xs:annotation>
- <xs:documentation>Deprecated, use the 'id' attribute instead.</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
<xs:attribute name="type" type="xs:string"/>
<xs:attribute name="id" type="xs:string"/>
</xs:complexType>
diff --git a/antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd b/antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd
index cdc76ab..4cd2e29 100644
--- a/antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd
+++ b/antora/supplemental-ui/schema/metamodel/metamodel-2.0.xsd
@@ -276,7 +276,13 @@
<xs:sequence>
<xs:element name="attr" type="facetAttr" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="id" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The facet type (fqcn) that is common to a set of concrete
+ facet implementations. These ids are usually known to the framework for
+ there well defined semantics within the programming model.
+ </xs:documentation>
+ </xs:annotation></xs:attribute>
<xs:attribute name="fqcn" type="xs:string"/>
</xs:complexType>
[isis] 05/11: ISIS-2322: updates to release process
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a94f05242f396bd279106174294f30ce3290617b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:07:07 2020 +0100
ISIS-2322: updates to release process
---
.../ROOT/images/release-process/jira-bulk-tool.png | Bin 0 -> 48843 bytes
.../jira-open-release-in-navigator.png | Bin 0 -> 143997 bytes
.../ROOT/pages/post-release-successful.adoc | 47 ++++++++++++++-------
3 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/images/release-process/jira-bulk-tool.png b/antora/components/comguide/modules/ROOT/images/release-process/jira-bulk-tool.png
new file mode 100644
index 0000000..2635ade
Binary files /dev/null and b/antora/components/comguide/modules/ROOT/images/release-process/jira-bulk-tool.png differ
diff --git a/antora/components/comguide/modules/ROOT/images/release-process/jira-open-release-in-navigator.png b/antora/components/comguide/modules/ROOT/images/release-process/jira-open-release-in-navigator.png
new file mode 100644
index 0000000..e376438
Binary files /dev/null and b/antora/components/comguide/modules/ROOT/images/release-process/jira-open-release-in-navigator.png differ
diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index 9c71a79..be86e8c 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -39,7 +39,7 @@ The vote has completed with the following result :
The vote is SUCCESSFUL.
-I\'ll now go ahead and complete the post-release activities.
+I'll now go ahead and complete the post-release activities.
----
== Release to Maven Central
@@ -101,26 +101,24 @@ As per Apache policy (communicated on 10th Jan 2016 to Apache PMCs), this path i
Close all JIRA tickets for the release, or moved to future releases if not yet addressed.
Any tickets that were partially implemented should be closed, and new tickets created for the functionality on the ticket not yet implemented.
-=== Generate Release Notes
+=== Mark the version as released
-From the root directory, generate the release notes for the current release, in Asciidoc format; eg:
+In JIRA, go to the link:https://issues.apache.org/jira/plugins/servlet/project-config/ISIS/versions[administration section] for the Apache Isis project and update the version as being released.
-[source,bash,subs="attributes+"]
-----
-sh scripts/jira-release-notes.sh ISIS $ISISREL > /tmp/1
-----
+In the link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[Kanban view] this will have the effect of marking all tickets as released (clearing the "done" column).
-[NOTE]
-====
-This script uses 'jq' to parse JSON.
-See the script itself for details of how to install this utility.
-====
+[#create-new-jira]
+=== Close all released tickets
-=== Mark the version as released
+From the link:https://issues.apache.org/jira/projects/ISIS?selectedItem=com.atlassian.jira.jira-projects-plugin%3Arelease-page&status=released-unreleased[Releases page], review the status of all work items in the release to check that they are closed.
-In JIRA, go to the link:https://issues.apache.org/jira/plugins/servlet/project-config/ISIS/versions[administration section] for the Apache Isis project and update the version as being released.
+If any are not, open the tickets in the issue navigator (from the release page):
-In the link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[Kanban view] this will have the effect of marking all tickets as released (clearing the "done" column).
+image::release-process/jira-open-release-in-navigator.png[width=800px]
+
+and then use "Bulk change" to transition through workflow:
+
+image::release-process/jira-bulk-tool.png[width=200px]
[#create-new-jira]
=== Create new JIRA
@@ -142,9 +140,26 @@ This should live in `antora/components/relnotes/modules/ROOT/pages/yyyy/vvv/rel
+
In `antora/components/relnotes/ROOT/nav.adoc`
+* Generate release notes
++
+From the root directory, generate the release notes for the current release, in Asciidoc format; eg:
++
+[source,bash,subs="attributes+"]
+----
+sh scripts/jira-release-notes.sh ISIS $ISISREL > /tmp/$ISISREL.adoc
+----
++
+[NOTE]
+====
+This script uses 'jq' to parse JSON.
+See the script itself for details of how to install this utility.
+====
+
+* Incorporate the release notes (`/tmp/$ISISREL.adoc`) into the `relnotes.adoc`
+
* Update the table in the `about.adoc` summary
+
-In `antora/components/relnotes/ROOT/pages/about.adoc`
+In `antora/components/relnotes/ROOT/pages/about.adoc`.
* update the `doap_isis.rdf` file (which provides a machine-parseable description of the project) with details of the new release.
[isis] 02/11: ISIS-2322: reorganises existing kroviz client docs,
also stub docs for vaadin viewer
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a1c9aada4953d811cc2639a5a65f38edced2a526
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:05:16 2020 +0100
ISIS-2322: reorganises existing kroviz client docs, also stub docs for vaadin viewer
---
.../adoc/modules/ROOT/partials/component-nav.adoc | 3 +
incubator/clients/kroviz/adoc/antora.yml | 19 +
.../{ => adoc/modules/kroviz}/images/Connect1.png | Bin
.../{ => adoc/modules/kroviz}/images/Connect2.png | Bin
.../modules/kroviz}/images/Crow_2_(PSF).png | Bin
.../modules/kroviz}/images/DemoPrimitives.png | Bin
.../{ => adoc/modules/kroviz}/images/DemoText.png | Bin
.../{ => adoc/modules/kroviz}/images/DemoTree.png | Bin
.../modules/kroviz}/images/Extinction_Symbol.svg | 0
.../{ => adoc/modules/kroviz}/images/ListAll1.png | Bin
.../{ => adoc/modules/kroviz}/images/ListAll2.png | Bin
.../modules/kroviz}/images/LogEntries1.png | Bin
.../modules/kroviz}/images/LogEntries2.png | Bin
.../modules/kroviz}/images/Meuble_corbeau.png | Bin
.../modules/kroviz}/images/RunFixtureScript1.png | Bin
.../modules/kroviz}/images/RunFixtureScript2.png | Bin
.../modules/kroviz}/images/RunFixtureScript3.png | Bin
.../modules/kroviz}/images/RunFixtureScript4.png | Bin
.../modules/kroviz}/images/WheatFieldWithCrows.jpg | Bin
.../modules/kroviz}/images/WheatFieldWithCrows.png | Bin
.../modules/kroviz/images}/demo_preview.gif | Bin
.../{ => adoc/modules/kroviz}/images/isis_clut.png | Bin
.../modules/kroviz}/images/kroviz-logo.svg | 0
.../images/kroviz_Run_Debug_Configuration.png | Bin
.../modules/kroviz/nav.adoc} | 27 +-
.../modules/kroviz/pages/DevelopmentGuide.adoc} | 450 ++++++++++++---------
.../modules/kroviz/pages/UsersGuide.adoc} | 38 +-
.../modules/kroviz/pages/about.adoc} | 28 +-
.../kroviz/adoc/modules/kroviz/pages/credits.adoc | 42 ++
.../modules/kroviz/pages}/regression-test.adoc | 7 +-
.../kroviz/partials/design}/arc-overview.adoc | 4 +-
.../kroviz/partials/design}/dev-mindmap.adoc | 5 +-
.../kroviz/partials/design}/dev-overview.adoc | 4 +-
.../kroviz/partials/design}/seq-aggregator.adoc | 4 +-
.../kroviz/partials/design}/uml-aggregator.adoc | 4 +-
.../kroviz/partials/design/uml-handler.adoc} | 6 +-
.../kroviz/partials/design}/uml-layout.adoc | 5 +-
.../kroviz/partials/design}/uml-overview.adoc | 5 +-
.../kroviz/partials/design}/uml-renderer.adoc | 4 +-
.../modules/kroviz/partials/design}/uml-to.adoc | 4 +-
.../adoc/modules/kroviz/partials/module-nav.adoc | 6 +
incubator/clients/kroviz/docs/arc-overview.png | Bin 164448 -> 0 bytes
incubator/clients/kroviz/docs/dev-mindmap.png | Bin 86762 -> 0 bytes
incubator/clients/kroviz/docs/dev-overview.png | Bin 88720 -> 0 bytes
incubator/clients/kroviz/docs/regression-test.png | Bin 240468 -> 0 bytes
incubator/clients/kroviz/docs/seq-aggregator.png | Bin 309074 -> 0 bytes
incubator/clients/kroviz/docs/uml-aggregator.png | Bin 161326 -> 0 bytes
incubator/clients/kroviz/docs/uml-handler.png | Bin 148574 -> 0 bytes
incubator/clients/kroviz/docs/uml-layout.png | Bin 26132 -> 0 bytes
incubator/clients/kroviz/docs/uml-overview.png | Bin 435594 -> 0 bytes
incubator/clients/kroviz/docs/uml-renderer.png | Bin 163215 -> 0 bytes
incubator/clients/kroviz/docs/uml-to.png | Bin 300970 -> 0 bytes
incubator/clients/kroviz/images/README.md | 42 --
incubator/viewers/vaadin/adoc/antora.yml | 19 +
.../vaadin/adoc/modules/vaadin/nav.adoc} | 27 +-
.../vaadin/adoc/modules/vaadin/pages/about.adoc} | 27 +-
.../adoc/modules/vaadin/partials/module-nav.adoc | 3 +
57 files changed, 413 insertions(+), 370 deletions(-)
diff --git a/incubator/adoc/modules/ROOT/partials/component-nav.adoc b/incubator/adoc/modules/ROOT/partials/component-nav.adoc
index 9d4fddf..c7f0015 100644
--- a/incubator/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/incubator/adoc/modules/ROOT/partials/component-nav.adoc
@@ -1,3 +1,6 @@
include::incubator:ROOT:partial$module-nav.adoc[]
include::incubator:microprofile:partial$module-nav.adoc[]
+//include::incubator:javafx:partial$module-nav.adoc[]
+include::incubator:kroviz:partial$module-nav.adoc[]
+include::incubator:vaadin:partial$module-nav.adoc[]
diff --git a/incubator/clients/kroviz/adoc/antora.yml b/incubator/clients/kroviz/adoc/antora.yml
new file mode 100644
index 0000000..bc87cdc
--- /dev/null
+++ b/incubator/clients/kroviz/adoc/antora.yml
@@ -0,0 +1,19 @@
+# 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 agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: incubator
+version: latest
diff --git a/incubator/clients/kroviz/images/Connect1.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/Connect1.png
similarity index 100%
rename from incubator/clients/kroviz/images/Connect1.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/Connect1.png
diff --git a/incubator/clients/kroviz/images/Connect2.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/Connect2.png
similarity index 100%
rename from incubator/clients/kroviz/images/Connect2.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/Connect2.png
diff --git a/incubator/clients/kroviz/images/Crow_2_(PSF).png b/incubator/clients/kroviz/adoc/modules/kroviz/images/Crow_2_(PSF).png
similarity index 100%
rename from incubator/clients/kroviz/images/Crow_2_(PSF).png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/Crow_2_(PSF).png
diff --git a/incubator/clients/kroviz/images/DemoPrimitives.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/DemoPrimitives.png
similarity index 100%
rename from incubator/clients/kroviz/images/DemoPrimitives.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/DemoPrimitives.png
diff --git a/incubator/clients/kroviz/images/DemoText.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/DemoText.png
similarity index 100%
rename from incubator/clients/kroviz/images/DemoText.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/DemoText.png
diff --git a/incubator/clients/kroviz/images/DemoTree.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/DemoTree.png
similarity index 100%
rename from incubator/clients/kroviz/images/DemoTree.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/DemoTree.png
diff --git a/incubator/clients/kroviz/images/Extinction_Symbol.svg b/incubator/clients/kroviz/adoc/modules/kroviz/images/Extinction_Symbol.svg
similarity index 100%
rename from incubator/clients/kroviz/images/Extinction_Symbol.svg
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/Extinction_Symbol.svg
diff --git a/incubator/clients/kroviz/images/ListAll1.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/ListAll1.png
similarity index 100%
rename from incubator/clients/kroviz/images/ListAll1.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/ListAll1.png
diff --git a/incubator/clients/kroviz/images/ListAll2.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/ListAll2.png
similarity index 100%
rename from incubator/clients/kroviz/images/ListAll2.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/ListAll2.png
diff --git a/incubator/clients/kroviz/images/LogEntries1.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/LogEntries1.png
similarity index 100%
rename from incubator/clients/kroviz/images/LogEntries1.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/LogEntries1.png
diff --git a/incubator/clients/kroviz/images/LogEntries2.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/LogEntries2.png
similarity index 100%
rename from incubator/clients/kroviz/images/LogEntries2.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/LogEntries2.png
diff --git a/incubator/clients/kroviz/images/Meuble_corbeau.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/Meuble_corbeau.png
similarity index 100%
rename from incubator/clients/kroviz/images/Meuble_corbeau.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/Meuble_corbeau.png
diff --git a/incubator/clients/kroviz/images/RunFixtureScript1.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript1.png
similarity index 100%
rename from incubator/clients/kroviz/images/RunFixtureScript1.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript1.png
diff --git a/incubator/clients/kroviz/images/RunFixtureScript2.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript2.png
similarity index 100%
rename from incubator/clients/kroviz/images/RunFixtureScript2.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript2.png
diff --git a/incubator/clients/kroviz/images/RunFixtureScript3.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript3.png
similarity index 100%
rename from incubator/clients/kroviz/images/RunFixtureScript3.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript3.png
diff --git a/incubator/clients/kroviz/images/RunFixtureScript4.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript4.png
similarity index 100%
rename from incubator/clients/kroviz/images/RunFixtureScript4.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/RunFixtureScript4.png
diff --git a/incubator/clients/kroviz/images/WheatFieldWithCrows.jpg b/incubator/clients/kroviz/adoc/modules/kroviz/images/WheatFieldWithCrows.jpg
similarity index 100%
rename from incubator/clients/kroviz/images/WheatFieldWithCrows.jpg
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/WheatFieldWithCrows.jpg
diff --git a/incubator/clients/kroviz/images/WheatFieldWithCrows.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/WheatFieldWithCrows.png
similarity index 100%
rename from incubator/clients/kroviz/images/WheatFieldWithCrows.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/WheatFieldWithCrows.png
diff --git a/incubator/clients/kroviz/docs/demo_preview.gif b/incubator/clients/kroviz/adoc/modules/kroviz/images/demo_preview.gif
similarity index 100%
rename from incubator/clients/kroviz/docs/demo_preview.gif
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/demo_preview.gif
diff --git a/incubator/clients/kroviz/images/isis_clut.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/isis_clut.png
similarity index 100%
rename from incubator/clients/kroviz/images/isis_clut.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/isis_clut.png
diff --git a/incubator/clients/kroviz/images/kroviz-logo.svg b/incubator/clients/kroviz/adoc/modules/kroviz/images/kroviz-logo.svg
similarity index 100%
rename from incubator/clients/kroviz/images/kroviz-logo.svg
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/kroviz-logo.svg
diff --git a/incubator/clients/kroviz/images/kroviz_Run_Debug_Configuration.png b/incubator/clients/kroviz/adoc/modules/kroviz/images/kroviz_Run_Debug_Configuration.png
similarity index 100%
rename from incubator/clients/kroviz/images/kroviz_Run_Debug_Configuration.png
rename to incubator/clients/kroviz/adoc/modules/kroviz/images/kroviz_Run_Debug_Configuration.png
diff --git a/incubator/clients/kroviz/docs/uml-layout.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/nav.adoc
similarity index 71%
copy from incubator/clients/kroviz/docs/uml-layout.adoc
copy to incubator/clients/kroviz/adoc/modules/kroviz/nav.adoc
index e9ad9da..b978522 100644
--- a/incubator/clients/kroviz/docs/uml-layout.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/nav.adoc
@@ -1,27 +1,4 @@
-: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 [...]
-
-.Layout Composition
-[plantuml,file="uml-layout.png"]
---
-@startuml
-object root
-object row
-object col
-object fieldSet
-object action
-object tabGroup
-object tab
-
-root *- row
-row *- col
-together {
- col *- fieldSet
- col *-down- action
- col *-down- tabGroup
-}
-tabGroup *-down- tab
-tab *- row
+: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 [...]
-@enduml
---
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/clients/kroviz/docs/DevelopmentGuide.md b/incubator/clients/kroviz/adoc/modules/kroviz/pages/DevelopmentGuide.adoc
similarity index 50%
rename from incubator/clients/kroviz/docs/DevelopmentGuide.md
rename to incubator/clients/kroviz/adoc/modules/kroviz/pages/DevelopmentGuide.adoc
index 918d5c2..f2acb14 100644
--- a/incubator/clients/kroviz/docs/DevelopmentGuide.md
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/pages/DevelopmentGuide.adoc
@@ -1,98 +1,141 @@
-<!--
-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 agr [...]
--->
+= Development Guide
+: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 [...]
-
+image::WheatFieldWithCrows.png[]
+
+== Quickstart
+
+This section provides a quickstart to developing the kroviz client.
-#Quickstart
TIP: Originally Apache Isis SimpleApp 1.16.0 was used as the reference RO backend.
This required some extra steps in order to deal with CORS setup, see sections on pre 2.0.0-M3 and CORS.
-## Frontend
-
-### Requirements
+=== Frontend
+
+==== Requirements
+
Kotlin/JS uses `Gradle` for the build, for the JS runtime `NodeJS`, and for the JS dependency management part `npm`.
You should have installed:
* node js (https://nodejs.org/en/download/current/)
-* Apache Gradle
+* Apache Gradle
* Google Chrome (72.0.3626.81 or higher)
-* <Moesif CORS Plugin (for Chrome)
+* <Moesif CORS Plugin (for Chrome)
+
+==== Build
-### Build
-gradle can be run under Windows with gitbash:
+gradle can be run under Windows with git-bash:
* ./gradlew.bat tasks # list all gradle tasks
* ./gradlew.bat webpack-bundle # create main.bundle.js
-* ./gradlew.bat test --exclude-task npm-install
-
+* ./gradlew.bat test –exclude-task npm-install
+
Internally gradle uses npm for the JS part.
Alternatively you can eg. in IntelliJ a Run/Debug Configuration:
-
-```
+
+image::kroviz_Run_Debug_Configuration.png[Preview]
+
+----
npm --verbose
-```
- If task npm-install hangs, try
-```
+----
+
+If task npm-install hangs, try
+
+----
./gradlew.bat npm-install --info --debug --stacktrace
-```
+----
+
Helps in identifying thing that may go wrong (eg. due to proxy settings).
-### Run
-```
+==== Run
+
+----
gradlew.bat -t run
-```
+----
+
+=== Backend
+
+==== Via Docker Image
-## Backend
-### Via Docker Image
// TODO insert to AI reference /doc
+== Design
+
+In the following section you'll find information that likely helps understanding the implementation.
+
+=== Overview
+
+include::partial$design/uml-overview.adoc[]
-# Design
-In the following section you'll find information that likely helps understanding the implementation.
-## Overview
-
-## Patterns Applied
-### Redux
-The implementation is an (independent) reinvention of Redux.
+=== Patterns Applied
+
+==== Redux
+
+The implementation is an (independent) reinvention of Redux.
I prefer the name Aggregator over Reducer though - IIRC Aggregator is prior art.
-### Half Object Protocol
+
+==== Half Object Protocol
+
The HOP pattern dates back to the early 2000, namely CanooULC.
IMO Naked Objects together with the RO API and kroViz resembles something similar.
-### Transfer Object (JEE / EAA)
+
+==== Transfer Object (JEE / EAA)
+
TO's are created from JSON responses
-### Event Sourcing (EAA)
-Requests, reponses, and resulting TO's are logged.
+
+==== Event Sourcing (EAA)
+
+Requests, reponses, and resulting TO's are logged.
Before requests are sent out to the server this log is consulted and used as a cache.
-### Proxy (GOF)
+
+==== Proxy (GOF)
+
The event source acts as a Proxy and thereby saves time and bandwidth.
-### Aggregator (EAI)
+
+==== Aggregator (EAI)
+
Various aggregators are responsible to collect or assemble displayable objects.
-Once all layout information is there, the UI will be rendered, even if not all elements of a list
+Once all layout information is there, the UI will be rendered, even if not all elements of a list
have arrived. Those elements will be added as they arrive. This is done with the help of
-mutable lists.
-
-### Chain of Responsibility (GOF)
-A chain of handlers is used to identify what kind of TO is to be generated from the
+mutable lists.
+
+include::partial$design/seq-aggregator.adoc[]
+
+
+==== Chain of Responsibility (GOF)
+
+A chain of handlers is used to identify what kind of TO is to be generated from the
JSON response. Handlers are responsible for initial assignment of aggregators.
-
-### Template Method (GOF)
+
+include::partial$design/uml-handler.adoc[]
+
+
+==== Template Method (GOF)
+
The Handler base class makes use of this pattern. Some methods have to be implemented
in each subclass, in some cases the default implementation in the base class is used.
-### Composite Pattern (GOF)
+
+==== Composite Pattern (GOF)
+
UI elements are hierarchically grouped, cf. *layout.xml
-### Factory (GOF)
+
+==== Factory (GOF)
+
Used for building tables dynamically.
-### Remote Facade
+
+==== Remote Facade
+
The Restful Objects API.
-# Code
-Thanks to Kotlin, code is very compact and readable.
+== Code
+
+Thanks to Kotlin, code is very compact and readable.
And, since Kotlin is a typed language and IDE's can infer a lot about the code, there are only few surprises.
Nevertheless Kotlin/JS allows to use Javascript features along side the typed part, what effectively makes it a dynamic language.
-## Hot Spots
+=== Hot Spots
+
Look out for places where typing is escaped and the DOM is manipulated directly:
* asDynamic()
@@ -100,28 +143,32 @@ Look out for places where typing is escaped and the DOM is manipulated directly:
* stopPropagation()
* getElementById()
-# Trouble Shooting
-
-## Corporate Firewall with SSL 'inspection'
+
+== Trouble Shooting
+
+=== Corporate Firewall with SSL 'inspection'
+
There are some questionable setups in coporate settings that are based on SSL replacement.
-In order to cope with it, you may try to import the Certificate into cacerts,
+In order to cope with it, you may try to import the Certificate into cacerts,
see https://intellij-support.jetbrains.com/hc/en-us/community/posts/115000094584-IDEA-Ultimate-2016-3-4-throwing-unable-to-find-valid-certification-path-to-requested-target-when-trying-to-refresh-gradle
- ## Network Proxy
+## Network Proxy
Depending on the network you are in, you may need to configure the proxy settings. Among the relevant files are:
- ```bash
+ `bash
~/.npmrc
~/.gitconfig
~/.ssh/config
~/.ssh/id_rsa
- ```
+`
### References
- * https://jjasonclark.com/how-to-setup-node-behind-web-proxy/
- * https://gist.github.com/EudesSilva/0329645b9c258e0495544b8a5ccd1454
+ * https://jjasonclark.com/how-to-setup-node-behind-web-proxy/
+ * https://gist.github.com/EudesSilva/0329645b9c258e0495544b8a5ccd1454
+
+=== Access to git from npm
-## Access to git from npm
-### Problem
- ```bash
+==== Problem
+
+`bash
npm ERR! Error while executing:
npm ERR! C:\Program Files\Git\bin\git.EXE ls-remote -h -t ssh://git@github.com/jarecsni/font-awesome-webpack.git
npm ERR!
@@ -132,79 +179,93 @@ see https://intellij-support.jetbrains.com/hc/en-us/community/posts/115000094584
npm ERR! and the repository exists.
npm ERR!
npm ERR! exited with error code: 128
- ```
+`
### Solution
- `~/.ssh/config`
- ```bash
- ProxyCommand /bin/connect.exe -H proxy.server.name:3128 %h %p
-
- Host github.com
- User git
- Port 22
- Hostname github.com
- IdentityFile "C:\users\username\.ssh\id_rsa"
- TCPKeepAlive yes
- IdentitiesOnly yes
-
- Host ssh.github.com
- User git
- Port 443
- Hostname ssh.github.com
- IdentityFile "C:\users\username\.ssh\id_rsa"
- TCPKeepAlive yes
- IdentitiesOnly yes
- ```
-
- ## Karma-Tests do not respond to code changes
- Windows:
+ `~/.ssh/config`
+ ```bash
+ ProxyCommand /bin/connect.exe -H proxy.server.name:3128 %h %p
+
+Host github.com
+ User git
+ Port 22
+ Hostname github.com
+ IdentityFile "C:\users\username.ssh\id_rsa"
+ TCPKeepAlive yes
+ IdentitiesOnly yes
+
+Host ssh.github.com
+ User git
+ Port 443
+ Hostname ssh.github.com
+ IdentityFile "C:\users\username.ssh\id_rsa"
+ TCPKeepAlive yes
+ IdentitiesOnly yes
```
+
+## Karma-Tests do not respond to code changes
+ Windows:
+ `
taskkill /f /im node.exe
- ```
- Linux:
- ```
+`
+ Linux:
+ `
killall node
- ```
+`
+
+== Misc
+
+=== Toolchain Overview
-# Misc
-## Toolchain Overview
When you are accustomed to the well settled Java ecosystem with integrated development environments, prepare yourself for learning new tools and addressing new problems.
Kotlin is straightforward and once you now it, you may not want to go back.
-
+include::partial$design/dev-mindmap.adoc[]
+
+=== Visualize JSON
-## Visualize JSON
-See [json-to-plantuml](https://github.com/meteorbites/json-to-plantuml)
-```
+See https://github.com/meteorbites/json-to-plantuml[json-to-plantuml]
+
+----
npm install -g json-to-plantuml
-```
+----
+
+=== Visualize JS dependencies
-## Visualize JS dependencies
-```
+----
npm -g install dependo
dependo -f amd ./build/js/kroviz.js > dependo.html
-```
+----
+
+=== Measure Test Coverage
-## Measure Test Coverage
-```
+----
nyc npm test
-```
-#### References
+----
+
+===== References
+
https://github.com/istanbuljs/nyc
-## Gradle Build Overview
-
+=== Gradle Build Overview
+
+include::partial$design/dev-overview.adoc[]
+
+=== Build the Backend Yourself
+
+==== Tool Chain
-## Build the Backend Yourself
-### Tool Chain
* (Oracle) JDK 1.8_181 (or higher)
* Apache Maven 3.6.0
-### Create from Archetype
+==== Create from Archetype
+
Create from the Apache Isis SimpleApp archetype:
-```bash
+
+[source,bash]
+----
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
@@ -212,100 +273,113 @@ mvn archetype:generate \
-D groupId=org.my \
-D artifactId=myapp-2.0.0-M3 \
-D version=1.0.0 -B
-```
-### Compile
-```bash
+----
+
+==== Compile
+
+[source,bash]
+----
mvn clean install -DskipTests
-```
-### Run
-```bash
+----
+
+==== Run
+
+[source,bash]
+----
cd webapp
mvn -Djetty.port=8080 jetty:run -DPROTOTYPING
-```
+----
+== Appendix
-
+=== JSON Terminology
-# Appendix
-## JSON Terminology
See: elp.kapowsoftware.com/9.4/index.jsp?topic=/doc/rm/JSONTerminology.html
-
-| | |
-|---------------|-------------|
-| JSON Text | JSON Object | JSON Array |
-| JSON Object | {} | { Properties } |
-| JSON Array | [] | [ Items ] |
-| Properties | Property, Properties |
-| Property | String : JSON Value |
-| Items | JSON Value, Items |
-| JSON Value | JSON Text | String | Number | false | null | true |
-| String | "" | " Characters " |
-| Characters | Character Characters |
-| Character | any Unicode character except ", \ or control character | \" | \\ | \/ | \b | \f | \n | \r | \t | \u 4 hex digits |
-| Number | a number very much like a C or Java number, see RFC 4627 for details. |
-
-## CORS
- CORS stands for 'Cross Origin Resource Sharing' aka: 'Same Origin Policy' was designed to improve security and is implemented in browsers.
+|===
+| |
+
+|JSON Text |JSON Object | JSON Array
+|JSON Object |{} | { Properties }
+|JSON Array |[] | [ Items ]
+|Properties |Property, Properties
+|Property |String : JSON Value
+|Items |JSON Value, Items
+|JSON Value |JSON Text | String | Number | false | null | true
+|String |"" | " Characters " |
+| Characters | Character Characters |
+| Character | any Unicode character except ", \ or control character | " | \ | \/ | \b | \f | \n | \r | \t | \u 4 hex digits
+|Number |a number very much like a C or Java number, see RFC 4627 for details.
+|===
+
+=== CORS
+
+CORS stands for 'Cross Origin Resource Sharing' aka: 'Same Origin Policy' was designed to improve security and is implemented in browsers.
In short it means: your browser will allow loading of resources only if host and port are identical to the url you are on.
Ie. webpage loaded from http://localhost:8088/ resources from http://localhost:8080/restful will not be accessible.
-
- ### Solution 1 (Q&D):
+
+==== Solution 1 (Q&D):
+
Disable CORS in your browser, eg. for Chrome with the MOESIF plugin.
-
- Nicely done introduction:
+
+Nicely done introduction:
+
* https://www.moesif.com/blog/technical/cors/Authoritative-Guide-to-CORS-Cross-Origin-Resource-Sharing-for-REST-APIs/#how-is-origin-definedhttps://www.moesif.com/blog/technical/cors/Authoritative-Guide-to-CORS-Cross-Origin-Resource-Sharing-for-REST-APIs/#how-is-origin-defined
-
- ### Solution 2:
+
+==== Solution 2:
+
Add to webapp\src\main\webapp\WEB-INF\web.xml
-
- ```xml
- <!-- CORS filter for XmlHttpRequests -->
- <filter>
- <filter-name>cross-origin</filter-name>
- <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
- <init-param>
- <param-name>allowedOrigins</param-name>
- <param-value>*</param-value>
- </init-param>
- <init-param>
- <param-name>allowedMethods</param-name>
- <value>*</value>
- </init-param>
- <init-param>
- <param-name>allowedHeaders</param-name>
- <param-value>*</param-value>
- </init-param>
- <init-param>
- <param-name>supportsCredentials</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>chainPreflight</param-name>
- <param-value>false</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>cross-origin</filter-name>
- <url-pattern>/restful/*</url-pattern>
- </filter-mapping>
- ```
-
- Put into webapp/src/main/webapp/WEB-INF/lib:
+
+[source,xml]
+----
+<!-- CORS filter for XmlHttpRequests -->
+<filter>
+ <filter-name>cross-origin</filter-name>
+ <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
+ <init-param>
+ <param-name>allowedOrigins</param-name>
+ <param-value>*</param-value>
+ </init-param>
+ <init-param>
+ <param-name>allowedMethods</param-name>
+ <value>*</value>
+ </init-param>
+ <init-param>
+ <param-name>allowedHeaders</param-name>
+ <param-value>*</param-value>
+ </init-param>
+ <init-param>
+ <param-name>supportsCredentials</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>chainPreflight</param-name>
+ <param-value>false</param-value>
+ </init-param>
+</filter>
+<filter-mapping>
+ <filter-name>cross-origin</filter-name>
+ <url-pattern>/restful/*</url-pattern>
+</filter-mapping>
+----
+`
+
+Put into webapp/src/main/webapp/WEB-INF/lib:
* https://search.maven.org/artifact/org.eclipse.jetty/jetty-util/9.4.12.v20180830/jar
* https://search.maven.org/artifact/org.eclipse.jetty/jetty-servlets/9.4.12.v20180830/jar
-
- ### Solution 3:
+
+==== Solution 3:
+
Incorporate kroviz.js eg. in the WAR containing your Apache Isis backend.
-
- # Extensions
-
- ## OSM/Leaflet
+
+== Extensions
+
+=== OSM/Leaflet
* 2.5D, buildings see https://osmbuildings.org/documentation/leaflet/
* Magnifying Glass
* Wikipedia markers
* Routing
-
- ## Chart.js
-
- * SanKey diagarms, see CodePen example
+
+=== Chart.js
+
+* SanKey diagarms, see CodePen example
\ No newline at end of file
diff --git a/incubator/clients/kroviz/docs/UsersGuide.md b/incubator/clients/kroviz/adoc/modules/kroviz/pages/UsersGuide.adoc
similarity index 61%
rename from incubator/clients/kroviz/docs/UsersGuide.md
rename to incubator/clients/kroviz/adoc/modules/kroviz/pages/UsersGuide.adoc
index 65583b9..e32b07b 100644
--- a/incubator/clients/kroviz/docs/UsersGuide.md
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/pages/UsersGuide.adoc
@@ -1,17 +1,17 @@
-<!--
-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 agr [...]
--->
+= Users Guide
+: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 [...]
-# Users Guide
This is about explaining what can be done on the client side in order to customize the viewer.
-## Branding
+== Branding
+
See kroviz.css
Colours and dimensions can be influenced here, as well as images:
-```css
+[source,css]
+----
.text-danger {
color: red !important;
}
@@ -49,9 +49,10 @@ div {
background-size: contain, cover;
background-image : url("https://svn.apache.org/repos/asf/comdev/project-logos/originals/isis.svg");
}
-```
+----
+
+== Rendering
-## Rendering
Some data, eg. Dates can be rendered differently depending on context:
* when editing in a form it can be practical to click on a cell in a 5 by 7 table representing a month, or
* selecting a point on a x-axis, resembling a timeline.
@@ -61,21 +62,22 @@ depends on the aspect and the perspective most useful to the user working with t
Which renderers should be provided for what data?
-One approach to identifying applicable renderers is [duck typing](https://en.wikipedia.org/wiki/Duck_typing).
+One approach to identifying applicable renderers is https://en.wikipedia.org/wiki/Duck_typing[duck typing].
This means resorting to behavior / properties of an object. If eg. an object has two properties of type date, labeled "start" and "end"
it is reasonable to render it as horizontal bar on a timeline. If there is a list of such objects, they can form a gantt chart.
The number of renderers included with kroviz is limited and there isn't yet an example of selecting one of possibly many applicale renderers, but there is room for impovement and creativity.
Such renderes should as well have links leading back to 'plain old object' renderings.
-
+include::partial$design/uml-renderer.adoc[]
+
+== Sneak Preview (Demo)
-## Sneak Preview (Demo)
-* Burger Menu -> Connect, OK
-* Primitives -> Temporals
-* Primitives -> Blob
-* _Burger Menu -> History_:
-** Sort,
-** Move Column,
+* Burger Menu -> Connect, OK
+* Primitives -> Temporals
+* Primitives -> Blob
+* _Burger Menu -> History_:
+** Sort,
+** Move Column,
** Filter
-* History -> Details Menu, Visualize
+* History -> Details Menu, Visualize
\ No newline at end of file
diff --git a/incubator/clients/kroviz/docs/uml-layout.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/pages/about.adoc
similarity index 67%
copy from incubator/clients/kroviz/docs/uml-layout.adoc
copy to incubator/clients/kroviz/adoc/modules/kroviz/pages/about.adoc
index e9ad9da..51f2243 100644
--- a/incubator/clients/kroviz/docs/uml-layout.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/pages/about.adoc
@@ -1,27 +1,11 @@
+= Kroviz Viewer (Incubating)
+
: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 [...]
-.Layout Composition
-[plantuml,file="uml-layout.png"]
---
-@startuml
-object root
-object row
-object col
-object fieldSet
-object action
-object tabGroup
-object tab
+The Kroviz client provides a user interface for Apache Isis applications, the same as other viewers such as the xref:vw:ROOT:about.adoc[Wicket Viewer].
+Krovix is called a "client" (rather than a "viewer") because it runs within the web browser, and consumes the REST API provided by the xref:vro:ROOT:about.adoc[Restful Objects Viewer].
+
+
-root *- row
-row *- col
-together {
- col *- fieldSet
- col *-down- action
- col *-down- tabGroup
-}
-tabGroup *-down- tab
-tab *- row
-@enduml
---
diff --git a/incubator/clients/kroviz/adoc/modules/kroviz/pages/credits.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/pages/credits.adoc
new file mode 100644
index 0000000..3983140
--- /dev/null
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/pages/credits.adoc
@@ -0,0 +1,42 @@
+= Credits
+
+Artwork reused:
+
+* https://commons.wikimedia.org/wiki/File:Vincent_Van_Gogh_-_Wheatfield_with_Crows.jpg by Vincent van Gogh 1890
+* https://fr.wikipedia.org/wiki/Fichier:Meuble_corbeau.svg by Henry Salomé le 06/12/2006
+
+Create banner image:
+
+----
+convert.exe WheatFieldWithCrows.jpg -channel all isis_clut.png -clut WheatFieldWithCrows.png
+----
+
+----
+convert.exe WheatFieldWithCrows.jpg -separate -normalize -combine isis_clut.png -clut WheatFieldWithCrows.png
+----
+
+= Apache Isis colors
+
+In the icon: green, orange, red, blue
+Violet #8064A2
+DarkBlue #4F81BD
+LightBlue #4BACC6
+Green #9BBB59
+Orange #F79646
+Red #C0504D
+
+= Components Colors
+
+"JS Runtime" #f7df1e
+KotlinJS link:./https%3A%2F%2Fgithub.com%2FJetBrains%2Fkotlin%2Ftree%2Fmaster%2Fjs.html[https://github.com/JetBrains/kotlin/tree/master/js] #8167FF-02AEFF {
+kotlinx.serialization as KS #DDE1F9/A9B4EF
+kvision link:./https%3A%2F%2Frjaros.github.io%2Fkvision.html[https://rjaros.github.io/kvision] #00AAD4/216778
+Bootstrap link:./https%3A%2F%2Fgetbootstrap.com%2F.html[https://getbootstrap.com/] #8F5ADC-31135B
+"Font\nAwesome" link:./https%3A%2F%2Ffontawesome.com%2F.html[https://fontawesome.com/] #155592-1C7ED6
+Tabulator link:./http%3A%2F%2Ftabulator.info%2F.html[http://tabulator.info/] #21441F|3DB549
+Chart.js link:./https%3A%2F%2Fwww.chartjs.org%2F.html[https://www.chartjs.org/] #f27173
+kroViz #8064A2-F79646
+
+= Convert PNG to SVG
+
+https://www.pngtosvg.com/
\ No newline at end of file
diff --git a/incubator/clients/kroviz/docs/regression-test.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/pages/regression-test.adoc
similarity index 98%
rename from incubator/clients/kroviz/docs/regression-test.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/pages/regression-test.adoc
index 28c4036..7031622 100644
--- a/incubator/clients/kroviz/docs/regression-test.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/pages/regression-test.adoc
@@ -1,6 +1,7 @@
+= RO-based Regression Testing
+
: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 [...]
-# RO based Regression Testing
Given
@@ -18,7 +19,7 @@ Then
.Record and Replay
[plantuml,file="regression-test.png"]
---
+----
@startuml
: : -> FE : action
@@ -76,7 +77,7 @@ APP .. NREG
NREG .. FW
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/arc-overview.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/arc-overview.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/arc-overview.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/arc-overview.adoc
index 83219a4..3557680 100644
--- a/incubator/clients/kroviz/docs/arc-overview.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/arc-overview.adoc
@@ -2,7 +2,7 @@
.Architecture Overview Diagram
[plantuml,file="arc-overview.png"]
---
+----
@startuml
node Desktop <<client>>{
component Chrome <<browser>> {
@@ -33,4 +33,4 @@ node server{
ApacheIsis -- RO
kroViz --> RO : invoke\ \nuse
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/dev-mindmap.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-mindmap.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/dev-mindmap.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-mindmap.adoc
index 13a8092..1b70f6e 100644
--- a/incubator/clients/kroviz/docs/dev-mindmap.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-mindmap.adoc
@@ -2,7 +2,7 @@
.Development MindMap
[plantuml,file="dev-mindmap.png"]
---
+----
@startmindmap
+_ know\nhow
--_ basics
@@ -55,5 +55,4 @@
---- Plugins
--- JavaScript
@endmindmap
---
-~~
+~~--
diff --git a/incubator/clients/kroviz/docs/dev-overview.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-overview.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/dev-overview.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-overview.adoc
index e5ca96c..0afdce4 100644
--- a/incubator/clients/kroviz/docs/dev-overview.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-overview.adoc
@@ -2,7 +2,7 @@
.Development Overview Diagram
[plantuml,file="dev-overview.png"]
---
+----
@startuml
skinparam nodesep 20
skinparam ranksep 5
@@ -64,4 +64,4 @@ package.json.lock
end note
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/seq-aggregator.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/seq-aggregator.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/seq-aggregator.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/seq-aggregator.adoc
index a7f1f9b..b067414 100644
--- a/incubator/clients/kroviz/docs/seq-aggregator.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/seq-aggregator.adoc
@@ -2,7 +2,7 @@
.ListAggregator Sequence Diagram
[plantuml,file="seq-aggregator.png"]
---
+----
@startuml
actor User
@@ -59,4 +59,4 @@ deactivate AGGT
UI -> User : present
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/uml-aggregator.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-aggregator.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/uml-aggregator.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-aggregator.adoc
index 9d8ef86..08c3f2d 100644
--- a/incubator/clients/kroviz/docs/uml-aggregator.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-aggregator.adoc
@@ -2,7 +2,7 @@
.Aggregator Diagram
[plantuml,file="uml-aggregator.png"]
---
+----
@startuml
class LogEntry {
@@ -62,4 +62,4 @@ BaseDisplayable <|-- ObjectDM
ObjectDM o-- ListDM
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/uml-hanlder.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-handler.adoc
similarity index 97%
rename from incubator/clients/kroviz/docs/uml-hanlder.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-handler.adoc
index 9154ec8..d33356b 100644
--- a/incubator/clients/kroviz/docs/uml-hanlder.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-handler.adoc
@@ -1,8 +1,8 @@
: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 [...]
.Overview Handler
-[uml, file="uml-handler.png"]
---
+[plantuml, file="uml-handler.png"]
+----
interface IHandler {
handle()
canHandle()
@@ -33,4 +33,4 @@ MemberHandler --> ListHandler : successor
ListHandler --> ObjectListHandler : successor
ObjectListHandler --> LayoutHandler : successor
LayoutHandler --> DefaultHandler : successor
---
\ No newline at end of file
+----
\ No newline at end of file
diff --git a/incubator/clients/kroviz/docs/uml-layout.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-layout.adoc
similarity index 97%
copy from incubator/clients/kroviz/docs/uml-layout.adoc
copy to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-layout.adoc
index e9ad9da..1ac9baa 100644
--- a/incubator/clients/kroviz/docs/uml-layout.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-layout.adoc
@@ -1,8 +1,7 @@
: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 [...]
-.Layout Composition
[plantuml,file="uml-layout.png"]
---
+----
@startuml
object root
@@ -24,4 +23,4 @@ tabGroup *-down- tab
tab *- row
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/uml-overview.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-overview.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/uml-overview.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-overview.adoc
index eec1a2a..01b523f 100644
--- a/incubator/clients/kroviz/docs/uml-overview.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-overview.adoc
@@ -1,8 +1,9 @@
+
: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 [...]
.Overview Diagram
[plantuml,file="uml-overview.png"]
---
+----
@startuml
class XHR {
@@ -114,4 +115,4 @@ PTO .. TransferObject
note "<<Pattern>>\nAggregator" as PA
PA .. Aggregator
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/uml-renderer.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-renderer.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/uml-renderer.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-renderer.adoc
index d769965..822c7a8 100644
--- a/incubator/clients/kroviz/docs/uml-renderer.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-renderer.adoc
@@ -2,7 +2,7 @@
.Renderer Diagram
[plantuml,file="uml-renderer.png"]
---
+----
@startuml
abstract class Renderer {
@@ -60,4 +60,4 @@ Protocol <|-down- GeoLocationPtc
Protocol <|-down- TimeLinePtc
@enduml
---
+----
diff --git a/incubator/clients/kroviz/docs/uml-to.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-to.adoc
similarity index 99%
rename from incubator/clients/kroviz/docs/uml-to.adoc
rename to incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-to.adoc
index af71554..06a0563 100644
--- a/incubator/clients/kroviz/docs/uml-to.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-to.adoc
@@ -2,7 +2,7 @@
.Transfer Objects Diagram
[uml,file="uml-to.png"]
---
+----
abstract class BaseTO {
fromObject(json)
}
@@ -105,4 +105,4 @@ abstract class TitledTO extends LinkedTO {
}
TitledTO -> Extensions : extension
TitledTO o-> inv.Member : members
---
\ No newline at end of file
+----
\ No newline at end of file
diff --git a/incubator/clients/kroviz/adoc/modules/kroviz/partials/module-nav.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/module-nav.adoc
new file mode 100644
index 0000000..9f1cf12
--- /dev/null
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/module-nav.adoc
@@ -0,0 +1,6 @@
+
+* xref:incubator:kroviz:about.adoc[Kroviz]
+
+** xref:incubator:kroviz:DevelopmentGuide.adoc[Development Guide]
+** xref:incubator:kroviz:UsersGuide.adoc[Users Guide]
+** xref:incubator:kroviz:regression-test.adoc[RO-based Regression Testing]
diff --git a/incubator/clients/kroviz/docs/arc-overview.png b/incubator/clients/kroviz/docs/arc-overview.png
deleted file mode 100644
index e56b93d..0000000
Binary files a/incubator/clients/kroviz/docs/arc-overview.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/dev-mindmap.png b/incubator/clients/kroviz/docs/dev-mindmap.png
deleted file mode 100644
index 70eac07..0000000
Binary files a/incubator/clients/kroviz/docs/dev-mindmap.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/dev-overview.png b/incubator/clients/kroviz/docs/dev-overview.png
deleted file mode 100644
index f4f831a..0000000
Binary files a/incubator/clients/kroviz/docs/dev-overview.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/regression-test.png b/incubator/clients/kroviz/docs/regression-test.png
deleted file mode 100644
index 9f4a673..0000000
Binary files a/incubator/clients/kroviz/docs/regression-test.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/seq-aggregator.png b/incubator/clients/kroviz/docs/seq-aggregator.png
deleted file mode 100644
index b37caf5..0000000
Binary files a/incubator/clients/kroviz/docs/seq-aggregator.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/uml-aggregator.png b/incubator/clients/kroviz/docs/uml-aggregator.png
deleted file mode 100644
index bc1ee32..0000000
Binary files a/incubator/clients/kroviz/docs/uml-aggregator.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/uml-handler.png b/incubator/clients/kroviz/docs/uml-handler.png
deleted file mode 100644
index 41dad52..0000000
Binary files a/incubator/clients/kroviz/docs/uml-handler.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/uml-layout.png b/incubator/clients/kroviz/docs/uml-layout.png
deleted file mode 100644
index f5bc658..0000000
Binary files a/incubator/clients/kroviz/docs/uml-layout.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/uml-overview.png b/incubator/clients/kroviz/docs/uml-overview.png
deleted file mode 100644
index 3bddee6..0000000
Binary files a/incubator/clients/kroviz/docs/uml-overview.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/uml-renderer.png b/incubator/clients/kroviz/docs/uml-renderer.png
deleted file mode 100644
index e6dee7c..0000000
Binary files a/incubator/clients/kroviz/docs/uml-renderer.png and /dev/null differ
diff --git a/incubator/clients/kroviz/docs/uml-to.png b/incubator/clients/kroviz/docs/uml-to.png
deleted file mode 100644
index 3fdb251..0000000
Binary files a/incubator/clients/kroviz/docs/uml-to.png and /dev/null differ
diff --git a/incubator/clients/kroviz/images/README.md b/incubator/clients/kroviz/images/README.md
deleted file mode 100644
index 1acb82b..0000000
--- a/incubator/clients/kroviz/images/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-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 agr [...]
--->
-
-
-#Credits
-Artwork reused:
-
-* https://commons.wikimedia.org/wiki/File:Vincent_Van_Gogh_-_Wheatfield_with_Crows.jpg by Vincent van Gogh 1890
-* https://fr.wikipedia.org/wiki/Fichier:Meuble_corbeau.svg by Henry Salomé le 06/12/2006
-
-Create banner image:
-```
-convert.exe WheatFieldWithCrows.jpg -channel all isis_clut.png -clut WheatFieldWithCrows.png
-```
-
-```
-convert.exe WheatFieldWithCrows.jpg -separate -normalize -combine isis_clut.png -clut WheatFieldWithCrows.png
-```
-
-#Apache Isis colors
-In the icon: green, orange, red, blue
-Violet #8064A2
-DarkBlue #4F81BD
-LightBlue #4BACC6
-Green #9BBB59
-Orange #F79646
-Red #C0504D
-
-# Components Colors
-"JS Runtime" #f7df1e
-KotlinJS [[https://github.com/JetBrains/kotlin/tree/master/js]] #8167FF-02AEFF {
-kotlinx.serialization as KS #DDE1F9/A9B4EF
-kvision [[https://rjaros.github.io/kvision]] #00AAD4/216778
-Bootstrap [[https://getbootstrap.com/]] #8F5ADC-31135B
-"Font\nAwesome" [[https://fontawesome.com/]] #155592-1C7ED6
-Tabulator [[http://tabulator.info/]] #21441F|3DB549
-Chart.js [[https://www.chartjs.org/]] #f27173
-kroViz #8064A2-F79646
-
-# Convert PNG to SVG
-https://www.pngtosvg.com/
diff --git a/incubator/viewers/vaadin/adoc/antora.yml b/incubator/viewers/vaadin/adoc/antora.yml
new file mode 100644
index 0000000..bc87cdc
--- /dev/null
+++ b/incubator/viewers/vaadin/adoc/antora.yml
@@ -0,0 +1,19 @@
+# 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 agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: incubator
+version: latest
diff --git a/incubator/clients/kroviz/docs/uml-layout.adoc b/incubator/viewers/vaadin/adoc/modules/vaadin/nav.adoc
similarity index 71%
copy from incubator/clients/kroviz/docs/uml-layout.adoc
copy to incubator/viewers/vaadin/adoc/modules/vaadin/nav.adoc
index e9ad9da..b978522 100644
--- a/incubator/clients/kroviz/docs/uml-layout.adoc
+++ b/incubator/viewers/vaadin/adoc/modules/vaadin/nav.adoc
@@ -1,27 +1,4 @@
-: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 [...]
-
-.Layout Composition
-[plantuml,file="uml-layout.png"]
---
-@startuml
-object root
-object row
-object col
-object fieldSet
-object action
-object tabGroup
-object tab
-
-root *- row
-row *- col
-together {
- col *- fieldSet
- col *-down- action
- col *-down- tabGroup
-}
-tabGroup *-down- tab
-tab *- row
+: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 [...]
-@enduml
---
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/clients/kroviz/docs/uml-layout.adoc b/incubator/viewers/vaadin/adoc/modules/vaadin/pages/about.adoc
similarity index 71%
rename from incubator/clients/kroviz/docs/uml-layout.adoc
rename to incubator/viewers/vaadin/adoc/modules/vaadin/pages/about.adoc
index e9ad9da..505ac92 100644
--- a/incubator/clients/kroviz/docs/uml-layout.adoc
+++ b/incubator/viewers/vaadin/adoc/modules/vaadin/pages/about.adoc
@@ -1,27 +1,6 @@
-: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 [...]
-
-.Layout Composition
-[plantuml,file="uml-layout.png"]
---
-@startuml
+= Vaadin Viewer (Incubating)
-object root
-object row
-object col
-object fieldSet
-object action
-object tabGroup
-object tab
+: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 [...]
-root *- row
-row *- col
-together {
- col *- fieldSet
- col *-down- action
- col *-down- tabGroup
-}
-tabGroup *-down- tab
-tab *- row
+WARNING: TODO: v2.0
-@enduml
---
diff --git a/incubator/viewers/vaadin/adoc/modules/vaadin/partials/module-nav.adoc b/incubator/viewers/vaadin/adoc/modules/vaadin/partials/module-nav.adoc
new file mode 100644
index 0000000..a436056
--- /dev/null
+++ b/incubator/viewers/vaadin/adoc/modules/vaadin/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+
+* xref:incubator:vaadin:about.adoc[Vaadin]
+
[isis] 09/11: ISIS-2322: updates release procedure
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0aded7ce53d133c1577845696dc2f143fb48e229
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:35:36 2020 +0100
ISIS-2322: updates release procedure
---
.../components/comguide/modules/ROOT/pages/post-release-successful.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index e7d5c5c..e64673c 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -305,7 +305,7 @@ All of this is changed afterwards.
=== Create doc branch
-First, we prepare a doc branch to reference:
+First, we update all versions in `antora.yml`:
* Update all `antora.yml` files, eg using an IDE:
+
[isis] 03/11: ISIS-2322: adds stub docs for jpa and javafx viewers
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 01b4240877dd472b54adeb22c5909f6a23cbea53
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:05:50 2020 +0100
ISIS-2322: adds stub docs for jpa and javafx viewers
---
incubator/viewers/javafx/adoc/antora.yml | 19 ++++++++++++++++++
.../viewers/javafx/adoc/modules/javafx/nav.adoc | 4 ++++
.../javafx/adoc/modules/javafx/pages/about.adoc | 6 ++++++
.../adoc/modules/javafx/partials/module-nav.adoc | 3 +++
persistence/jpa/adoc/antora.yml | 23 ++++++++++++++++++++++
persistence/jpa/adoc/modules/ROOT/nav.adoc | 4 ++++
persistence/jpa/adoc/modules/ROOT/pages/about.adoc | 8 ++++++++
.../adoc/modules/ROOT/partials/component-nav.adoc | 2 ++
.../jpa/adoc/modules/ROOT/partials/module-nav.adoc | 0
9 files changed, 69 insertions(+)
diff --git a/incubator/viewers/javafx/adoc/antora.yml b/incubator/viewers/javafx/adoc/antora.yml
new file mode 100644
index 0000000..bc87cdc
--- /dev/null
+++ b/incubator/viewers/javafx/adoc/antora.yml
@@ -0,0 +1,19 @@
+# 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 agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: incubator
+version: latest
diff --git a/incubator/viewers/javafx/adoc/modules/javafx/nav.adoc b/incubator/viewers/javafx/adoc/modules/javafx/nav.adoc
new file mode 100644
index 0000000..b978522
--- /dev/null
+++ b/incubator/viewers/javafx/adoc/modules/javafx/nav.adoc
@@ -0,0 +1,4 @@
+
+: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 [...]
+
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/viewers/javafx/adoc/modules/javafx/pages/about.adoc b/incubator/viewers/javafx/adoc/modules/javafx/pages/about.adoc
new file mode 100644
index 0000000..cf0dfa6
--- /dev/null
+++ b/incubator/viewers/javafx/adoc/modules/javafx/pages/about.adoc
@@ -0,0 +1,6 @@
+= JavaFX Viewer (Incubating)
+
+: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 [...]
+
+WARNING: TODO: v2.0
+
diff --git a/incubator/viewers/javafx/adoc/modules/javafx/partials/module-nav.adoc b/incubator/viewers/javafx/adoc/modules/javafx/partials/module-nav.adoc
new file mode 100644
index 0000000..d748553
--- /dev/null
+++ b/incubator/viewers/javafx/adoc/modules/javafx/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+
+* xref:incubator:javafx:about.adoc[JavaFX]
+
diff --git a/persistence/jpa/adoc/antora.yml b/persistence/jpa/adoc/antora.yml
new file mode 100644
index 0000000..587cd3b
--- /dev/null
+++ b/persistence/jpa/adoc/antora.yml
@@ -0,0 +1,23 @@
+# 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 agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: pjpa
+title: "JPA"
+version: latest
+start_page: ROOT:about.adoc
+nav:
+ - modules/ROOT/nav.adoc
diff --git a/persistence/jpa/adoc/modules/ROOT/nav.adoc b/persistence/jpa/adoc/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..4c4e42b
--- /dev/null
+++ b/persistence/jpa/adoc/modules/ROOT/nav.adoc
@@ -0,0 +1,4 @@
+
+: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 [...]
+
+include::pjdo:ROOT:partial$component-nav.adoc[]
diff --git a/persistence/jpa/adoc/modules/ROOT/pages/about.adoc b/persistence/jpa/adoc/modules/ROOT/pages/about.adoc
new file mode 100644
index 0000000..ecb2a85
--- /dev/null
+++ b/persistence/jpa/adoc/modules/ROOT/pages/about.adoc
@@ -0,0 +1,8 @@
+= JPA
+
+: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-toc: ~
+
+WARNING: TODO: v2 - in development.
+
diff --git a/persistence/jpa/adoc/modules/ROOT/partials/component-nav.adoc b/persistence/jpa/adoc/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..415fc02
--- /dev/null
+++ b/persistence/jpa/adoc/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,2 @@
+include::pjpa:ROOT:partial$module-nav.adoc[]
+
diff --git a/persistence/jpa/adoc/modules/ROOT/partials/module-nav.adoc b/persistence/jpa/adoc/modules/ROOT/partials/module-nav.adoc
new file mode 100644
index 0000000..e69de29
[isis] 06/11: ISIS-2322: adds relnotes for M4,
STATUS and doap_isis.rdf
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit de77872365cb25e7b9898aed71718f8f5f0cb06b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:07:27 2020 +0100
ISIS-2322: adds relnotes for M4, STATUS and doap_isis.rdf
---
STATUS | 2 +
antora/components/relnotes/modules/ROOT/nav.adoc | 2 +
.../2020/2.0.0-M4/{relnotes.adoc => mignotes.adoc} | 13 +-
.../modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc | 237 ++++++++++++++++-----
.../2020/2.0.0-M5/mignotes.adoc} | 15 +-
.../2020/2.0.0-M5/relnotes.adoc} | 16 +-
.../relnotes/modules/ROOT/pages/about.adoc | 28 ++-
antora/supplemental-ui/doap_isis.rdf | 10 +
8 files changed, 230 insertions(+), 93 deletions(-)
diff --git a/STATUS b/STATUS
index dab75ac..ac3b742 100644
--- a/STATUS
+++ b/STATUS
@@ -23,6 +23,8 @@ Description
TLP releases:
+ * isis-2.0.0-M4 : 17 Oct 2020
+
* isis-2.0.0-M3 : 27 Mar 2020
* isis-2.0.0-M2 : 22 Jan 2019
diff --git a/antora/components/relnotes/modules/ROOT/nav.adoc b/antora/components/relnotes/modules/ROOT/nav.adoc
index 74d6a0e..866fa09 100644
--- a/antora/components/relnotes/modules/ROOT/nav.adoc
+++ b/antora/components/relnotes/modules/ROOT/nav.adoc
@@ -1,8 +1,10 @@
: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 [...]
+
* 2020
+//** xref:relnotes:ROOT:2020/2.0.0-M5/relnotes.adoc[2.0.0-M5]
** xref:relnotes:ROOT:2020/2.0.0-M4/relnotes.adoc[2.0.0-M4]
** xref:relnotes:ROOT:2020/2.0.0-M3/relnotes.adoc[2.0.0-M3]
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/mignotes.adoc
similarity index 93%
copy from antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc
copy to antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/mignotes.adoc
index 8c75c14..854adcd 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/mignotes.adoc
@@ -1,14 +1,12 @@
-[[r2.0.0-M4]]
-= 2.0.0-M4
+= Migrating from M3 to M4
: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:
-WARNING: Not released yet.
-== Migrating from M3 to M4
-=== Maven
+
+== Maven
Some Maven artifacts have been renamed:
@@ -48,7 +46,8 @@ Some Maven artifacts have been renamed:
<artifactId>isis-commons</artifactId>
----
-=== Java
+
+== Java
Some Java classes and packages have been renamed:
@@ -57,4 +56,4 @@ Some Java classes and packages have been renamed:
----
// org.apache.isis.core.commons.*
org.apache.isis.commons.*
-----
\ No newline at end of file
+----
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc
index 8c75c14..d3518c0 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc
@@ -4,57 +4,186 @@
: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:
-WARNING: Not released yet.
-
-== Migrating from M3 to M4
-
-=== Maven
-
-Some Maven artifacts have been renamed:
-
-[source,xml]
-.Parent (pom)
-----
-<!--
-<groupId>org.apache.isis.core</groupId>
-<artifactId>isis-parent</artifactId>
--->
-
-<groupId>org.apache.isis</groupId>
-<artifactId>isis-parent</artifactId>
-----
-
-[source,xml]
-.Core (pom)
-----
-<!--
-<groupId>org.apache.isis.core</groupId>
-<artifactId>isis</artifactId>
--->
-
-<groupId>org.apache.isis.core</groupId>
-<artifactId>isis-core</artifactId>
-----
-
-[source,xml]
-.Commons (jar)
-----
-<!--
-<groupId>org.apache.isis.core.commons</groupId>
-<artifactId>isis-core-commons</artifactId>
--->
-
-<groupId>org.apache.isis.commons</groupId>
-<artifactId>isis-commons</artifactId>
-----
-
-=== Java
-
-Some Java classes and packages have been renamed:
-
-[source,java]
-.Commons
-----
-// org.apache.isis.core.commons.*
-org.apache.isis.commons.*
-----
\ No newline at end of file
+
+This is a further milestone release, consolidating the "re-platforming" of Apache Isis on top of Spring Boot.
+
+Much of the emphasis in this release has been on stabilisation and regression testing.
+That said, there are some new features.
+The release includes support for a new (additional) link:https://cwiki.apache.org/confluence/display/ISIS/ActionParameters?focusedCommentId=158867933#comment-158867933[programming model for action parameters], allowing for more sophisticated management of parameters that interact with each other.
+On the flip side, support for contributed actions from domain services has been removed; use xref:refguide:applib-classes:roles-mixins-contributees/mixins.adoc[Mixins]instead.
+
+This release also has a reworking/simplification of the command service and background commands.
+This includes new extension modules to persist commands (xref:extensions:command-log:about.adoc[Command Log] and xref:extensions:command-replay:about.adoc[Command Replay], to assist regression testing.
+
+Also in this release, the xref:incubator:kroviz:about.adoc[Kroviz client] has been brought into the incubator.
+This is a single-page app that runs within the browser to provide a UI similar to that of the xref:vw:ROOT:about.adoc[Wicket Viewer], but interacting with the domain application exclusively through the REST API provided by the xref:vro:ROOT:about.adoc[Restful Objects Viewer].
+
+The release also includes some preliminary work preparing the way for support for JPA (as an alternative to xref:pjdo:ROOT:about.adoc[JDO/DataNucleus].
+This support is expected to be in the next milestone release.
+
+Other work done in this release includes an experimental porting of the build system from Maven to gradle (though Maven is for now still the official build system of the framework).
+
+The example demo app has also been fleshed out considerably as both a regression tests and to provide living documentation; the docker image can be downloaded from link:https://hub.docker.com/repository/docker/apacheisis/demo-wicket[docker hub].
+
+
+== New Feature
+
+* link:https://issues.apache.org/jira/browse/ISIS-2422[ISIS-2422] - Treat schema DTOs (InteractionDto, ChangesDto, CommandDto) as value types.
+* link:https://issues.apache.org/jira/browse/ISIS-2416[ISIS-2416] - Allow action domain event handlers to change argument in the executing phase.
+* link:https://issues.apache.org/jira/browse/ISIS-2400[ISIS-2400] - Allow sections within menubars.layout.xml to have a name ... then appear in the menu
+* link:https://issues.apache.org/jira/browse/ISIS-2397[ISIS-2397] - Add removeAll to RepositoryService API
+* link:https://issues.apache.org/jira/browse/ISIS-2367[ISIS-2367] - Promote @Model support from 'incubator' to 'extension'
+* link:https://issues.apache.org/jira/browse/ISIS-2362[ISIS-2362] - New Programming Model for Action Parameters
+* link:https://issues.apache.org/jira/browse/ISIS-2340[ISIS-2340] - New common UI Model Module
+* link:https://issues.apache.org/jira/browse/ISIS-2333[ISIS-2333] - Add Object Mixin for graphical Metamodel Inspection
+* link:https://issues.apache.org/jira/browse/ISIS-2312[ISIS-2312] - Add Jdo Metamodel Download Menu (Zip)
+* link:https://issues.apache.org/jira/browse/ISIS-2278[ISIS-2278] - Reinstate background commands for entities, incorporate fix ISIS-2277 from v1
+* link:https://issues.apache.org/jira/browse/ISIS-2276[ISIS-2276] - BackgroundCommandExecution - should use a different persistent session for each command
+* link:https://issues.apache.org/jira/browse/ISIS-2232[ISIS-2232] - Remove support for domain services contributing properties, collections or actions. (Use mixins instead).
+* link:https://issues.apache.org/jira/browse/ISIS-1536[ISIS-1536] - BackgroundService should fail-fast if there is no BackgroundCommandService implementation available to persist the command.
+* link:https://issues.apache.org/jira/browse/ISIS-1281[ISIS-1281] - Provide a programming API (probably via domain events) to allow object visibility to be vetoed.
+
+
+=== Incubating: Kroviz
+
+* link:https://issues.apache.org/jira/browse/ISIS-2324[ISIS-2324] - Merge kroviz
+* link:https://issues.apache.org/jira/browse/ISIS-2353[ISIS-2353] - Open New Browser Tab for External Links
+* link:https://issues.apache.org/jira/browse/ISIS-2350[ISIS-2350] - Drag&Drop Example
+* link:https://issues.apache.org/jira/browse/ISIS-2342[ISIS-2342] - Client Kroviz: UI Polishing
+
+=== Incubating: JPA
+
+* link:https://issues.apache.org/jira/browse/ISIS-2332[ISIS-2332] - Add new JPA module to provide a JpaEntityFacet
+
+== Improvement
+
+* link:https://issues.apache.org/jira/browse/ISIS-2447[ISIS-2447] - Add Regression Tests for Isis' Cucubmber Integration
+* link:https://issues.apache.org/jira/browse/ISIS-2446[ISIS-2446] - Move JaxbService implementation applib -> runtimeservices
+* link:https://issues.apache.org/jira/browse/ISIS-2438[ISIS-2438] - SecMan: rename entity schema 'isissecurity' -> 'isisExtensionsSecman'
+* link:https://issues.apache.org/jira/browse/ISIS-2435[ISIS-2435] - Commons: Polishing
+* link:https://issues.apache.org/jira/browse/ISIS-2428[ISIS-2428] - Cleanup inconsistent Artifact Names
+* link:https://issues.apache.org/jira/browse/ISIS-2419[ISIS-2419] - Less verbose Action Dialog Validation Feedback, if its (just) a Constraint Violation (suppress Category)
+* link:https://issues.apache.org/jira/browse/ISIS-2394[ISIS-2394] - TenantedFacetFactory should be automatically registered into the programming model
+* link:https://issues.apache.org/jira/browse/ISIS-2392[ISIS-2392] - Add CSS classes and identifiers for cypress regression test suite.
+* link:https://issues.apache.org/jira/browse/ISIS-2379[ISIS-2379] - Fire UserCreatedEvent when a new User Entity gets persisted
+* link:https://issues.apache.org/jira/browse/ISIS-2375[ISIS-2375] - IsisIntegrationTestAbstractWithFixtures should also run module fixtures automatically.
+* link:https://issues.apache.org/jira/browse/ISIS-2372[ISIS-2372] - Wicket No-arg Confirm Dialog: render below instead of right of button
+* link:https://issues.apache.org/jira/browse/ISIS-2331[ISIS-2331] - Decouple from PersistenceSession (move to persistence module)
+* link:https://issues.apache.org/jira/browse/ISIS-2330[ISIS-2330] - Extend ObjectManager with ObjectBulkLoader (handle Queries)
+* link:https://issues.apache.org/jira/browse/ISIS-2327[ISIS-2327] - Use new Popover Label for Object Reference Tooltips
+* link:https://issues.apache.org/jira/browse/ISIS-2323[ISIS-2323] - Allow for IsisInteractions to store User Data (InteractionScoped)
+* link:https://issues.apache.org/jira/browse/ISIS-2320[ISIS-2320] - Rename IsisSessionScope -> IsisInteractionScope
+* link:https://issues.apache.org/jira/browse/ISIS-2270[ISIS-2270] - Rethink, who shall manage Lifecycles of DomainObjects, ViewModels and Mixins
+* link:https://issues.apache.org/jira/browse/ISIS-2231[ISIS-2231] - Bring in incode-platform stuff
+* link:https://issues.apache.org/jira/browse/ISIS-2177[ISIS-2177] - Provide an ObjectManager API to decouple from JDO
+* link:https://issues.apache.org/jira/browse/ISIS-2093[ISIS-2093] - Dialog OK Button: when ARE_YOU_SURE semantics then render style 'DANGER'
+
+
+=== Documentation Improvements
+
+* link:https://issues.apache.org/jira/browse/ISIS-2368[ISIS-2368] - Add lightbox support (=enlarge image on click) for Antora template
+* link:https://issues.apache.org/jira/browse/ISIS-2359[ISIS-2359] - Doc: List of Maven Artifacts
+* link:https://issues.apache.org/jira/browse/ISIS-2336[ISIS-2336] - Ongoing improvements for Antora website
+* link:https://issues.apache.org/jira/browse/ISIS-2334[ISIS-2334] - Schema Update: document field Facet#id
+
+=== Demo App Improvements
+
+* link:https://issues.apache.org/jira/browse/ISIS-2321[ISIS-2321] - Demo: Showcase advanced Mixin (rendering as ViewModel)
+* link:https://issues.apache.org/jira/browse/ISIS-2222[ISIS-2222] - Flesh out demo app with extra examples.
+
+=== CI/Tooling Improvements
+
+* link:https://issues.apache.org/jira/browse/ISIS-2433[ISIS-2433] - Gradle Build: automate 'folder' to 'build artifact name' mapping (settings.gradle)
+* link:https://issues.apache.org/jira/browse/ISIS-2426[ISIS-2426] - Add Tooling Infrastructure (Project Introspection, Code Mining/Analysis, Reporting)
+
+== Bug
+
+* link:https://issues.apache.org/jira/browse/ISIS-2440[ISIS-2440] - AsciiDoc: value facets not registered properly
+* link:https://issues.apache.org/jira/browse/ISIS-2439[ISIS-2439] - JDO Create Schema fails on MariaDB/MySql: SQL Syntax Error
+* link:https://issues.apache.org/jira/browse/ISIS-2432[ISIS-2432] - SecMan Entities don't render a meaningful Title (eg. User: name not shown)
+* link:https://issues.apache.org/jira/browse/ISIS-2430[ISIS-2430] - Cannot assume Action Param Spec to be correct when eagerly loaded, eg. SecMan Menu Action (create user) causes Exception
+* link:https://issues.apache.org/jira/browse/ISIS-2429[ISIS-2429] - Demo: ThereCanBeOnlyOne shutdown is hardwired to port 8080
+* link:https://issues.apache.org/jira/browse/ISIS-2423[ISIS-2423] - Persisted callback and PublisherService#changedObjects are not called, instead appear as updates.
+* link:https://issues.apache.org/jira/browse/ISIS-2421[ISIS-2421] - Demo fat jar fails to launch - could not find asciidoctor jruby file
+* link:https://issues.apache.org/jira/browse/ISIS-2418[ISIS-2418] - deselecting checkboxes for collection per @Action(associateWith) doesn't work.
+* link:https://issues.apache.org/jira/browse/ISIS-2407[ISIS-2407] - CORS Extension breaks Wicket Viewer (bulk select issues)
+* link:https://issues.apache.org/jira/browse/ISIS-2406[ISIS-2406] - Header should be sticky (but currently scrolls up)
+* link:https://issues.apache.org/jira/browse/ISIS-2405[ISIS-2405] - @Property mixin on a view model cannot be defined, fails to render with ClassCastException
+* link:https://issues.apache.org/jira/browse/ISIS-2404[ISIS-2404] - Param Negotiation clears already filled out Param when non-scalar
+* link:https://issues.apache.org/jira/browse/ISIS-2403[ISIS-2403] - 'Rebuild metamodel' seems to deadlock, at least in the demo app.
+* link:https://issues.apache.org/jira/browse/ISIS-2401[ISIS-2401] - Memento creation/recreation roundtrip might get confused when processing Value Types
+* link:https://issues.apache.org/jira/browse/ISIS-2399[ISIS-2399] - Spring bean resolution issues when configuring TenantedAuthorizationFacet
+* link:https://issues.apache.org/jira/browse/ISIS-2398[ISIS-2398] - Rendering a StandaloneCollectionPage in Wicket throws Optional not serializable exception
+* link:https://issues.apache.org/jira/browse/ISIS-2395[ISIS-2395] - JDO mapping required for AsciiDoc and Markdown. (Also, Markup should be abstract)
+* link:https://issues.apache.org/jira/browse/ISIS-2393[ISIS-2393] - Editing a property on a view model does not stick
+* link:https://issues.apache.org/jira/browse/ISIS-2388[ISIS-2388] - Regression: value choice mementos are broken
+* link:https://issues.apache.org/jira/browse/ISIS-2387[ISIS-2387] - Regression: boolean parameters not handled properly
+* link:https://issues.apache.org/jira/browse/ISIS-2386[ISIS-2386] - Regression: null parameters not handled properly (invalid method signatures)
+* link:https://issues.apache.org/jira/browse/ISIS-2385[ISIS-2385] - Jaxb PersistentEntityAdapter fails when asked to marshal detached entities
+* link:https://issues.apache.org/jira/browse/ISIS-2384[ISIS-2384] - Action that takes a List of view models fails to gather them when object has been viewed already
+* link:https://issues.apache.org/jira/browse/ISIS-2383[ISIS-2383] - Regression: cannot create mementos from detached choice pojos
+* link:https://issues.apache.org/jira/browse/ISIS-2380[ISIS-2380] - Regression "Inline as if edit" prompt style is broken in Wicket viewer
+* link:https://issues.apache.org/jira/browse/ISIS-2378[ISIS-2378] - Internal _Strings.readAllLines does not honor selected Charset
+* link:https://issues.apache.org/jira/browse/ISIS-2376[ISIS-2376] - Regression: switching Translation Mode fails (Prototyping Menu)
+* link:https://issues.apache.org/jira/browse/ISIS-2371[ISIS-2371] - Regression: inline editing of entities fails (entity not attached)
+* link:https://issues.apache.org/jira/browse/ISIS-2370[ISIS-2370] - Regression: collection result may display negative time amounts (timing info when prototyping)
+* link:https://issues.apache.org/jira/browse/ISIS-2369[ISIS-2369] - Regression: object references within parented tables render just as text
+* link:https://issues.apache.org/jira/browse/ISIS-2365[ISIS-2365] - Action Dialog: Incompatible Parameter Memento if non-scalar
+* link:https://issues.apache.org/jira/browse/ISIS-2364[ISIS-2364] - Bulk selection (first param in action dialog) is also propagated to other params if of same type.
+* link:https://issues.apache.org/jira/browse/ISIS-2361[ISIS-2361] - Bulk selection (first param in action dialog) gets cleared when validation fails.
+* link:https://issues.apache.org/jira/browse/ISIS-2358[ISIS-2358] - A background command referencing a parent command can cause DN exception
+* link:https://issues.apache.org/jira/browse/ISIS-2343[ISIS-2343] - Integration tests w/ Datanucleus might fail when run in a batch
+* link:https://issues.apache.org/jira/browse/ISIS-2339[ISIS-2339] - Dropdownlist requires 2 clicks in order to show (dialog not initialized properly)
+* link:https://issues.apache.org/jira/browse/ISIS-2338[ISIS-2338] - Regression: all Confirmation Dialogs are broken
+* link:https://issues.apache.org/jira/browse/ISIS-2335[ISIS-2335] - Mixins declared using type-level @Action should not contribute as Association
+* link:https://issues.apache.org/jira/browse/ISIS-2328[ISIS-2328] - Missing publisher facet for @Action declared on mixin.
+* link:https://issues.apache.org/jira/browse/ISIS-2326[ISIS-2326] - No-arg Action w/ Confirmation suppresses Tooltips.
+* link:https://issues.apache.org/jira/browse/ISIS-2319[ISIS-2319] - defaults/disable/hide not honored when pending args are preset with defaults
+* link:https://issues.apache.org/jira/browse/ISIS-2317[ISIS-2317] - ManagedObject instances need a side-effect free toString() method
+* link:https://issues.apache.org/jira/browse/ISIS-2316[ISIS-2316] - New type level @Property (Mixins) get picked up as both association and action
+* link:https://issues.apache.org/jira/browse/ISIS-2315[ISIS-2315] - Bad PageParameter: oidString=images (as seen with SimpleApp)
+* link:https://issues.apache.org/jira/browse/ISIS-2314[ISIS-2314] - ComponentHintKey fails to restore field 'hintStore' on de-serialization
+* link:https://issues.apache.org/jira/browse/ISIS-2313[ISIS-2313] - Do not depend on 2 versions of javax.jdo simultaneously
+* link:https://issues.apache.org/jira/browse/ISIS-2311[ISIS-2311] - Bulk Toggle (Multiselect): UI can get out of sync with underlying model
+* link:https://issues.apache.org/jira/browse/ISIS-2309[ISIS-2309] - @EmbeddedOnly types are broken
+* link:https://issues.apache.org/jira/browse/ISIS-2304[ISIS-2304] - Vaadin Viewer: fix menubar rendering
+* link:https://issues.apache.org/jira/browse/ISIS-1919[ISIS-1919] - Collective UI Improvements
+** link:https://issues.apache.org/jira/browse/ISIS-2098[ISIS-2098] - Buttons (action-links) with confirmation don't show their associated tooltip
+** link:https://issues.apache.org/jira/browse/ISIS-1990[ISIS-1990] - Buttons (action-links) don't honor disabled state if providing a confirmation dialog
+** link:https://issues.apache.org/jira/browse/ISIS-1989[ISIS-1989] - Disabled buttons (action-links) won't show the styled tooltip
+** link:https://issues.apache.org/jira/browse/ISIS-1921[ISIS-1921] - Confirmation-Popups sometimes render outside window bounds
+
+
+== Task
+
+* link:https://issues.apache.org/jira/browse/ISIS-2374[ISIS-2374] - Support Gradle Builds
+* link:https://issues.apache.org/jira/browse/ISIS-2341[ISIS-2341] - Ongoing: CI Maintenance
+** link:https://issues.apache.org/jira/browse/ISIS-2425[ISIS-2425] - Gradle Build (CI) does not fail when Metamodel Tests fail
+
+* link:https://issues.apache.org/jira/browse/ISIS-2322[ISIS-2322] - Isis 2.0.0-M4 release activities
+
+== Dependency Upgrades
+
+* link:https://issues.apache.org/jira/browse/ISIS-2434[ISIS-2434] - Bump Spring Boot 2.3.2.RELEASE to 2.3.4.RELEASE
+* link:https://issues.apache.org/jira/browse/ISIS-2391[ISIS-2391] - Upgrade DataNucleus 5.2.2->5.2.3
+* link:https://issues.apache.org/jira/browse/ISIS-2366[ISIS-2366] - Bump to latest Spring Releases
+* link:https://issues.apache.org/jira/browse/ISIS-2357[ISIS-2357] - Upgrade FontAwesome 4 -> 5
+
+
+== Won't Fix
+
+* link:https://issues.apache.org/jira/browse/ISIS-2402[ISIS-2402] - [WON'T FIX] Demo Launch takes >25s until Spring Boot Banner even appears (investigate)
+* link:https://issues.apache.org/jira/browse/ISIS-2436[ISIS-2436] - [NOT AN ISSUE] Secman: Update name(s) for ApplicationUser causes error
+* link:https://issues.apache.org/jira/browse/ISIS-2337[ISIS-2337] - [WON'T FIX] FacetFactories to be managed by Spring
+* link:https://issues.apache.org/jira/browse/ISIS-2318[ISIS-2318] - [CANNOT REPRODUCE] Regression on Mixins: @Action at method level no longer honor association
+* link:https://issues.apache.org/jira/browse/ISIS-2135[ISIS-2135] - [WON'T FIX] Testing: Mockito to replace JMock
+* link:https://issues.apache.org/jira/browse/ISIS-1924[ISIS-1924] - [WON'T FIX] Indicator for Long Running Actions
+* link:https://issues.apache.org/jira/browse/ISIS-996[ISIS-996] - [WON'T FIX] Define component factories as Spring @Components
+
+== Duplicates
+
+These were _not_ implemented in this release ... this is just backlog grooming.
+
+* link:https://issues.apache.org/jira/browse/ISIS-1219[ISIS-1219] - [DUPLICATE?] Extend events to allow subscribers to provide defaults, choices, autoComplete on action parameters.
+* link:https://issues.apache.org/jira/browse/ISIS-510[ISIS-510] - [DUPLICATE] Help page overlay (a la ? in gmail)
+
diff --git a/antora/components/relnotes/modules/ROOT/nav.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
similarity index 74%
copy from antora/components/relnotes/modules/ROOT/nav.adoc
copy to antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
index 74d6a0e..51f87f0 100644
--- a/antora/components/relnotes/modules/ROOT/nav.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
@@ -1,17 +1,8 @@
+= Migrating from M4 to M5
: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:
-* 2020
-
-** xref:relnotes:ROOT:2020/2.0.0-M4/relnotes.adoc[2.0.0-M4]
-** xref:relnotes:ROOT:2020/2.0.0-M3/relnotes.adoc[2.0.0-M3]
-
-* 2019
-
-** xref:relnotes:ROOT:2019/2.0.0-M2/relnotes.adoc[2.0.0-M2]
-
-* 2018
-
-** xref:relnotes:ROOT:2018/2.0.0-M1/relnotes.adoc[2.0.0-M1]
+WARNING: Not released yet.
diff --git a/antora/components/relnotes/modules/ROOT/nav.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/relnotes.adoc
similarity index 74%
copy from antora/components/relnotes/modules/ROOT/nav.adoc
copy to antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/relnotes.adoc
index 74d6a0e..769288b 100644
--- a/antora/components/relnotes/modules/ROOT/nav.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/relnotes.adoc
@@ -1,17 +1,9 @@
+[[r2.0.0-M5]]
+= 2.0.0-M5
: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:
-* 2020
-
-** xref:relnotes:ROOT:2020/2.0.0-M4/relnotes.adoc[2.0.0-M4]
-** xref:relnotes:ROOT:2020/2.0.0-M3/relnotes.adoc[2.0.0-M3]
-
-* 2019
-
-** xref:relnotes:ROOT:2019/2.0.0-M2/relnotes.adoc[2.0.0-M2]
-
-* 2018
-
-** xref:relnotes:ROOT:2018/2.0.0-M1/relnotes.adoc[2.0.0-M1]
+WARNING: Not released yet.
diff --git a/antora/components/relnotes/modules/ROOT/pages/about.adoc b/antora/components/relnotes/modules/ROOT/pages/about.adoc
index 2410a75..ed0d371 100644
--- a/antora/components/relnotes/modules/ROOT/pages/about.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/about.adoc
@@ -16,14 +16,26 @@ This table summarises all releases of Apache Isis v2.0 to date.
| Bugs
| Detail
+//| 2.0.0-M5
+//| not released yet (upcoming)
+//| Fifth milestone release for Apache Isis 2.0.0
+//| ?
+//| ?
+//| ?
+//|
+//* xref:relnotes:ROOT:2020/2.0.0-M5/relnotes.adoc[Release Notes]
+//* xref:relnotes:ROOT:2020/2.0.0-M5/mignotes.adoc[Migration Notes]
+
| 2.0.0-M4
-| not released yet (upcoming)
-| Forth milestone release for Apache Isis 2.0.0
-| ?
-| ?
-| ?
+| 17-10-2020
+| Fourth milestone release for Apache Isis 2.0.0
+| 14
+| 28
+| 54
|
* xref:relnotes:ROOT:2020/2.0.0-M4/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2018/2.0.0-M4/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/projects/ISIS/versions/12347808[JIRA Rel Notes]
| 2.0.0-M3
| 27-03-2020
@@ -33,7 +45,7 @@ This table summarises all releases of Apache Isis v2.0 to date.
| 46
|
* xref:relnotes:ROOT:2020/2.0.0-M3/relnotes.adoc[Release Notes]
-* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12344784[JIRA Rel Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12344784[JIRA Rel Notes]
| 2.0.0-M2
| 22-01-2019
@@ -43,7 +55,7 @@ This table summarises all releases of Apache Isis v2.0 to date.
| 13
|
* xref:relnotes:ROOT:2019/2.0.0-M2/relnotes.adoc[Release Notes]
-* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342393[JIRA Rel Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342393[JIRA Rel Notes]
|2.0.0-M1
| 31-07-2018
@@ -56,7 +68,7 @@ This table summarises all releases of Apache Isis v2.0 to date.
|
* xref:relnotes:ROOT:2018/2.0.0-M1/relnotes.adoc[Release Notes]
* xref:relnotes:ROOT:2018/2.0.0-M1/mignotes.adoc[Migration Notes]
-* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342392[JIRA Rel Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342392[JIRA Rel Notes]
|===
diff --git a/antora/supplemental-ui/doap_isis.rdf b/antora/supplemental-ui/doap_isis.rdf
index 63f107b..b99bd55 100644
--- a/antora/supplemental-ui/doap_isis.rdf
+++ b/antora/supplemental-ui/doap_isis.rdf
@@ -36,6 +36,16 @@
<category rdf:resource="http://projects.apache.org/category/web-framework" />
+ <!-- 2020-10-17 releases -->
+ <release>
+ <Version>
+ <name>isis</name>
+ <created>2020-10-17</created>
+ <revision>2.0.0-M4</revision>
+ </Version>
+ </release>
+
+
<!-- 2020-03-27 releases -->
<release>
<Version>
[isis] 10/11: ISIS-2322: further improvements to release notes
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7d3d01846cabd596335cc02480da422d4757588e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:47:39 2020 +0100
ISIS-2322: further improvements to release notes
---
.../comguide/modules/ROOT/pages/post-release-successful.adoc | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index e64673c..d48c7b7 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -307,9 +307,12 @@ All of this is changed afterwards.
First, we update all versions in `antora.yml`:
-* Update all `antora.yml` files, eg using an IDE:
+* Update all `antora.yml` files:
+
-** `version: latest` -> `version: {page-isisrel}`
+[source,bash,subs="attributes+"]
+----
+find . -name antora.yml -exec sed -i 's/latest/{page-isisrel}/g' {} \;
+----
* Commit all these changes:
+
@@ -344,7 +347,6 @@ Lastly, we update `index.html` and then `site.yml`
* Update the home page of the website, `antora/supplemental-ui/index.html`
+
-Note that this isn't performed in the docs branch (xref:#create-doc-branch[previous section]) because the supplemental files are _not_ versioned as a doc component:
** update any mention of `master` -> `{page-isisrel}`
+
@@ -353,6 +355,8 @@ This should be the two sets of starter app instructions for helloworld and simpl
** update any mention of `latest` -> `{page-isisrel}`
+
This should be in hyperlinks, `<a href="docs/...">`
++
+NOTE: that this isn't performed in the docs branch (xref:#create-doc-branch[previous section]) because the supplemental files are _not_ versioned as a doc component:
* Now update `site.yml`
+
@@ -390,8 +394,6 @@ git revert HEAD
[#update-the-algolia-search-index]
== Update the Algolia search index
-== Index the site
-
Create a `algolia.env` file holding the `APP_ID` and the admin `API_KEY`, in the root of `isis-site`:
[source,ini]
[isis] 11/11: ISIS-2322: bumps antora.yml and index.html to 2.0.0-M4
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4d1b44d34201b6990ca4a243928c7d76e2e5a3a5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 17 12:49:49 2020 +0100
ISIS-2322: bumps antora.yml and index.html to 2.0.0-M4
---
antora/components/comguide/antora.yml | 2 +-
antora/components/conguide/antora.yml | 2 +-
antora/components/docs/antora.yml | 2 +-
antora/components/relnotes/antora.yml | 2 +-
antora/components/setupguide/antora.yml | 2 +-
antora/components/system/antora.yml | 2 +-
api/adoc/refguide/antora.yml | 2 +-
api/adoc/userguide/antora.yml | 2 +-
api/applib/src/main/adoc/antora.yml | 2 +-
api/schema/src/main/adoc/antora.yml | 2 +-
commons/src/main/adoc/antora.yml | 2 +-
core/adoc/antora.yml | 2 +-
core/codegen-bytebuddy/src/main/adoc/antora.yml | 2 +-
core/config/src/main/adoc/antora.yml | 2 +-
core/internaltestsupport/src/main/adoc/antora.yml | 2 +-
core/metamodel/src/main/adoc/antora.yml | 2 +-
core/runtime/src/main/adoc/antora.yml | 2 +-
core/runtimeservices/src/main/adoc/antora.yml | 2 +-
core/security/src/main/adoc/antora.yml | 2 +-
core/webapp/src/main/adoc/antora.yml | 2 +-
examples/demo/domain/src/main/adoc/antora.yml | 2 +-
extensions/adoc/antora.yml | 2 +-
extensions/core/command-log/adoc/antora.yml | 2 +-
extensions/core/command-replay/adoc/antora.yml | 2 +-
extensions/core/flyway/adoc/antora.yml | 2 +-
extensions/core/model-annotation/adoc/antora.yml | 2 +-
extensions/core/quartz/adoc/antora.yml | 2 +-
extensions/security/audit-trail/adoc/antora.yml | 2 +-
extensions/security/secman/adoc/antora.yml | 2 +-
extensions/security/session-log/adoc/antora.yml | 2 +-
extensions/security/shiro-realm-ldap/adoc/antora.yml | 2 +-
extensions/vro/cors/adoc/antora.yml | 2 +-
extensions/vw/exceldownload/adoc/antora.yml | 2 +-
extensions/vw/fullcalendar/adoc/antora.yml | 2 +-
extensions/vw/gmap3/adoc/antora.yml | 2 +-
extensions/vw/pdfjs/adoc/antora.yml | 2 +-
incubator/adoc/antora.yml | 2 +-
incubator/clients/kroviz/adoc/antora.yml | 2 +-
incubator/mappings/microprofile/src/main/adoc/antora.yml | 2 +-
incubator/viewers/javafx/adoc/antora.yml | 2 +-
incubator/viewers/vaadin/adoc/antora.yml | 2 +-
legacy/adoc/antora.yml | 2 +-
legacy/extensions/core/applib/src/main/adoc/antora.yml | 2 +-
legacy/extensions/core/commons/src/main/adoc/antora.yml | 2 +-
legacy/extensions/core/metamodel/src/main/adoc/antora.yml | 2 +-
legacy/extensions/core/runtime/src/main/adoc/antora.yml | 2 +-
legacy/mappings/restclient/src/main/adoc/antora.yml | 2 +-
legacy/subdomains/servletapi/src/main/adoc/antora.yml | 2 +-
mappings/adoc/antora.yml | 2 +-
mappings/jaxrsclient/adoc/antora.yml | 2 +-
mappings/minio/adoc/antora.yml | 2 +-
mappings/publisher/adoc/antora.yml | 2 +-
mappings/restclient/adoc/antora.yml | 2 +-
mappings/slack/adoc/antora.yml | 2 +-
mavendeps/adoc/antora.yml | 2 +-
persistence/jdo/adoc/antora.yml | 2 +-
persistence/jpa/adoc/antora.yml | 2 +-
regressiontests/adoc/antora.yml | 2 +-
security/adoc/antora.yml | 2 +-
security/bypass/src/main/adoc/antora.yml | 2 +-
security/keycloak/src/main/adoc/antora.yml | 2 +-
security/shiro/src/main/adoc/antora.yml | 2 +-
starters/adoc/antora.yml | 2 +-
subdomains/adoc/antora.yml | 2 +-
subdomains/base/adoc/antora.yml | 2 +-
subdomains/docx/adoc/antora.yml | 2 +-
subdomains/excel/adoc/antora.yml | 2 +-
subdomains/freemarker/adoc/antora.yml | 2 +-
subdomains/ognl/adoc/antora.yml | 2 +-
subdomains/pdfbox/adoc/antora.yml | 2 +-
subdomains/settings/adoc/antora.yml | 2 +-
subdomains/spring/adoc/antora.yml | 2 +-
subdomains/xdocreport/adoc/antora.yml | 2 +-
subdomains/zip/adoc/antora.yml | 2 +-
testing/adoc/antora.yml | 2 +-
testing/fakedata/adoc/antora.yml | 2 +-
testing/fixtures/adoc/antora.yml | 2 +-
testing/h2console/adoc/antora.yml | 2 +-
testing/hsqldbmgr/adoc/antora.yml | 2 +-
testing/integtestsupport/adoc/antora.yml | 2 +-
testing/specsupport/adoc/antora.yml | 2 +-
testing/unittestsupport/adoc/antora.yml | 2 +-
valuetypes/adoc/antora.yml | 2 +-
valuetypes/asciidoc/adoc/antora.yml | 2 +-
valuetypes/markdown/adoc/antora.yml | 2 +-
valuetypes/sse/adoc/antora.yml | 2 +-
viewers/restfulobjects/adoc/antora.yml | 2 +-
viewers/wicket/adoc/antora.yml | 2 +-
88 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/antora/components/comguide/antora.yml b/antora/components/comguide/antora.yml
index 9551f2a..20e49a9 100644
--- a/antora/components/comguide/antora.yml
+++ b/antora/components/comguide/antora.yml
@@ -17,7 +17,7 @@
name: comguide
title: "Committers' Guide"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/conguide/antora.yml b/antora/components/conguide/antora.yml
index 057398d..2f3d6a4 100644
--- a/antora/components/conguide/antora.yml
+++ b/antora/components/conguide/antora.yml
@@ -17,7 +17,7 @@
name: conguide
title: "Contributors' Guide"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/docs/antora.yml b/antora/components/docs/antora.yml
index b8b03a3..ed7432e 100644
--- a/antora/components/docs/antora.yml
+++ b/antora/components/docs/antora.yml
@@ -17,7 +17,7 @@
name: docs
title: " "
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/relnotes/antora.yml b/antora/components/relnotes/antora.yml
index eb0cb20..d788221 100644
--- a/antora/components/relnotes/antora.yml
+++ b/antora/components/relnotes/antora.yml
@@ -17,7 +17,7 @@
name: relnotes
title: "Release Notes"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/setupguide/antora.yml b/antora/components/setupguide/antora.yml
index 18768b2..9acf25d 100644
--- a/antora/components/setupguide/antora.yml
+++ b/antora/components/setupguide/antora.yml
@@ -17,7 +17,7 @@
name: setupguide
title: "Setup Guide"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/system/antora.yml b/antora/components/system/antora.yml
index 84c0ebc..7c1fac3 100644
--- a/antora/components/system/antora.yml
+++ b/antora/components/system/antora.yml
@@ -17,7 +17,7 @@
name: system
title: "System Overview"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/api/adoc/refguide/antora.yml b/api/adoc/refguide/antora.yml
index 86ade94..647f625 100644
--- a/api/adoc/refguide/antora.yml
+++ b/api/adoc/refguide/antora.yml
@@ -17,7 +17,7 @@
name: refguide
title: "Reference Guide"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/api/adoc/userguide/antora.yml b/api/adoc/userguide/antora.yml
index 70880f4..3b90132 100644
--- a/api/adoc/userguide/antora.yml
+++ b/api/adoc/userguide/antora.yml
@@ -17,7 +17,7 @@
name: userguide
title: "User Guide"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/api/applib/src/main/adoc/antora.yml b/api/applib/src/main/adoc/antora.yml
index 847bc30..a613036 100644
--- a/api/applib/src/main/adoc/antora.yml
+++ b/api/applib/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: refguide
-version: latest
+version: 2.0.0-M4
diff --git a/api/schema/src/main/adoc/antora.yml b/api/schema/src/main/adoc/antora.yml
index 847bc30..a613036 100644
--- a/api/schema/src/main/adoc/antora.yml
+++ b/api/schema/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: refguide
-version: latest
+version: 2.0.0-M4
diff --git a/commons/src/main/adoc/antora.yml b/commons/src/main/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/commons/src/main/adoc/antora.yml
+++ b/commons/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/core/adoc/antora.yml b/core/adoc/antora.yml
index f1f3633..0bf78ad 100644
--- a/core/adoc/antora.yml
+++ b/core/adoc/antora.yml
@@ -17,7 +17,7 @@
name: core
title: "Design Docs"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/core/codegen-bytebuddy/src/main/adoc/antora.yml b/core/codegen-bytebuddy/src/main/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/core/codegen-bytebuddy/src/main/adoc/antora.yml
+++ b/core/codegen-bytebuddy/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/core/config/src/main/adoc/antora.yml b/core/config/src/main/adoc/antora.yml
index 847bc30..a613036 100644
--- a/core/config/src/main/adoc/antora.yml
+++ b/core/config/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: refguide
-version: latest
+version: 2.0.0-M4
diff --git a/core/internaltestsupport/src/main/adoc/antora.yml b/core/internaltestsupport/src/main/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/core/internaltestsupport/src/main/adoc/antora.yml
+++ b/core/internaltestsupport/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/core/metamodel/src/main/adoc/antora.yml b/core/metamodel/src/main/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/core/metamodel/src/main/adoc/antora.yml
+++ b/core/metamodel/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/core/runtime/src/main/adoc/antora.yml b/core/runtime/src/main/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/core/runtime/src/main/adoc/antora.yml
+++ b/core/runtime/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/core/runtimeservices/src/main/adoc/antora.yml b/core/runtimeservices/src/main/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/core/runtimeservices/src/main/adoc/antora.yml
+++ b/core/runtimeservices/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/core/security/src/main/adoc/antora.yml b/core/security/src/main/adoc/antora.yml
index 2be1151..601395a 100644
--- a/core/security/src/main/adoc/antora.yml
+++ b/core/security/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/core/webapp/src/main/adoc/antora.yml b/core/webapp/src/main/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/core/webapp/src/main/adoc/antora.yml
+++ b/core/webapp/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/examples/demo/domain/src/main/adoc/antora.yml b/examples/demo/domain/src/main/adoc/antora.yml
index 072c382..e9b71e6 100644
--- a/examples/demo/domain/src/main/adoc/antora.yml
+++ b/examples/demo/domain/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: docs
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/adoc/antora.yml b/extensions/adoc/antora.yml
index 2dde8c1..57430d7 100644
--- a/extensions/adoc/antora.yml
+++ b/extensions/adoc/antora.yml
@@ -17,7 +17,7 @@
name: extensions
title: "Extensions Catalog"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/extensions/core/command-log/adoc/antora.yml b/extensions/core/command-log/adoc/antora.yml
index f59b33f..cd1d2eb 100644
--- a/extensions/core/command-log/adoc/antora.yml
+++ b/extensions/core/command-log/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: extensions
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/core/command-replay/adoc/antora.yml b/extensions/core/command-replay/adoc/antora.yml
index f59b33f..cd1d2eb 100644
--- a/extensions/core/command-replay/adoc/antora.yml
+++ b/extensions/core/command-replay/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: extensions
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/core/flyway/adoc/antora.yml b/extensions/core/flyway/adoc/antora.yml
index 448d819..f71e0c0 100644
--- a/extensions/core/flyway/adoc/antora.yml
+++ b/extensions/core/flyway/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: userguide
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/core/model-annotation/adoc/antora.yml b/extensions/core/model-annotation/adoc/antora.yml
index f59b33f..cd1d2eb 100644
--- a/extensions/core/model-annotation/adoc/antora.yml
+++ b/extensions/core/model-annotation/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: extensions
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/core/quartz/adoc/antora.yml b/extensions/core/quartz/adoc/antora.yml
index 448d819..f71e0c0 100644
--- a/extensions/core/quartz/adoc/antora.yml
+++ b/extensions/core/quartz/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: userguide
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/security/audit-trail/adoc/antora.yml b/extensions/security/audit-trail/adoc/antora.yml
index 2be1151..601395a 100644
--- a/extensions/security/audit-trail/adoc/antora.yml
+++ b/extensions/security/audit-trail/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/security/secman/adoc/antora.yml b/extensions/security/secman/adoc/antora.yml
index 2be1151..601395a 100644
--- a/extensions/security/secman/adoc/antora.yml
+++ b/extensions/security/secman/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/security/session-log/adoc/antora.yml b/extensions/security/session-log/adoc/antora.yml
index 2be1151..601395a 100644
--- a/extensions/security/session-log/adoc/antora.yml
+++ b/extensions/security/session-log/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/security/shiro-realm-ldap/adoc/antora.yml b/extensions/security/shiro-realm-ldap/adoc/antora.yml
index 2be1151..601395a 100644
--- a/extensions/security/shiro-realm-ldap/adoc/antora.yml
+++ b/extensions/security/shiro-realm-ldap/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/vro/cors/adoc/antora.yml b/extensions/vro/cors/adoc/antora.yml
index c83b9c2..71cf58b 100644
--- a/extensions/vro/cors/adoc/antora.yml
+++ b/extensions/vro/cors/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vro
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/vw/exceldownload/adoc/antora.yml b/extensions/vw/exceldownload/adoc/antora.yml
index c1675fe..400b302 100644
--- a/extensions/vw/exceldownload/adoc/antora.yml
+++ b/extensions/vw/exceldownload/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/vw/fullcalendar/adoc/antora.yml b/extensions/vw/fullcalendar/adoc/antora.yml
index c1675fe..400b302 100644
--- a/extensions/vw/fullcalendar/adoc/antora.yml
+++ b/extensions/vw/fullcalendar/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/vw/gmap3/adoc/antora.yml b/extensions/vw/gmap3/adoc/antora.yml
index c1675fe..400b302 100644
--- a/extensions/vw/gmap3/adoc/antora.yml
+++ b/extensions/vw/gmap3/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M4
diff --git a/extensions/vw/pdfjs/adoc/antora.yml b/extensions/vw/pdfjs/adoc/antora.yml
index c1675fe..400b302 100644
--- a/extensions/vw/pdfjs/adoc/antora.yml
+++ b/extensions/vw/pdfjs/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M4
diff --git a/incubator/adoc/antora.yml b/incubator/adoc/antora.yml
index 7df66bf..357a8a2 100644
--- a/incubator/adoc/antora.yml
+++ b/incubator/adoc/antora.yml
@@ -17,7 +17,7 @@
name: incubator
title: "Incubator Catalog"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/incubator/clients/kroviz/adoc/antora.yml b/incubator/clients/kroviz/adoc/antora.yml
index bc87cdc..cd5817e 100644
--- a/incubator/clients/kroviz/adoc/antora.yml
+++ b/incubator/clients/kroviz/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: incubator
-version: latest
+version: 2.0.0-M4
diff --git a/incubator/mappings/microprofile/src/main/adoc/antora.yml b/incubator/mappings/microprofile/src/main/adoc/antora.yml
index bc87cdc..cd5817e 100644
--- a/incubator/mappings/microprofile/src/main/adoc/antora.yml
+++ b/incubator/mappings/microprofile/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: incubator
-version: latest
+version: 2.0.0-M4
diff --git a/incubator/viewers/javafx/adoc/antora.yml b/incubator/viewers/javafx/adoc/antora.yml
index bc87cdc..cd5817e 100644
--- a/incubator/viewers/javafx/adoc/antora.yml
+++ b/incubator/viewers/javafx/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: incubator
-version: latest
+version: 2.0.0-M4
diff --git a/incubator/viewers/vaadin/adoc/antora.yml b/incubator/viewers/vaadin/adoc/antora.yml
index bc87cdc..cd5817e 100644
--- a/incubator/viewers/vaadin/adoc/antora.yml
+++ b/incubator/viewers/vaadin/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: incubator
-version: latest
+version: 2.0.0-M4
diff --git a/legacy/adoc/antora.yml b/legacy/adoc/antora.yml
index 61f1510..2dc6793 100644
--- a/legacy/adoc/antora.yml
+++ b/legacy/adoc/antora.yml
@@ -17,7 +17,7 @@
name: legacy
title: "Legacy Catalog"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/legacy/extensions/core/applib/src/main/adoc/antora.yml b/legacy/extensions/core/applib/src/main/adoc/antora.yml
index 3938f85..a44364d 100644
--- a/legacy/extensions/core/applib/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/applib/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M4
diff --git a/legacy/extensions/core/commons/src/main/adoc/antora.yml b/legacy/extensions/core/commons/src/main/adoc/antora.yml
index 3938f85..a44364d 100644
--- a/legacy/extensions/core/commons/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/commons/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M4
diff --git a/legacy/extensions/core/metamodel/src/main/adoc/antora.yml b/legacy/extensions/core/metamodel/src/main/adoc/antora.yml
index 3938f85..a44364d 100644
--- a/legacy/extensions/core/metamodel/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/metamodel/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M4
diff --git a/legacy/extensions/core/runtime/src/main/adoc/antora.yml b/legacy/extensions/core/runtime/src/main/adoc/antora.yml
index 3938f85..a44364d 100644
--- a/legacy/extensions/core/runtime/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/runtime/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M4
diff --git a/legacy/mappings/restclient/src/main/adoc/antora.yml b/legacy/mappings/restclient/src/main/adoc/antora.yml
index 3938f85..a44364d 100644
--- a/legacy/mappings/restclient/src/main/adoc/antora.yml
+++ b/legacy/mappings/restclient/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M4
diff --git a/legacy/subdomains/servletapi/src/main/adoc/antora.yml b/legacy/subdomains/servletapi/src/main/adoc/antora.yml
index 3938f85..a44364d 100644
--- a/legacy/subdomains/servletapi/src/main/adoc/antora.yml
+++ b/legacy/subdomains/servletapi/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M4
diff --git a/mappings/adoc/antora.yml b/mappings/adoc/antora.yml
index 7a27b7f..0db2d9b 100644
--- a/mappings/adoc/antora.yml
+++ b/mappings/adoc/antora.yml
@@ -17,7 +17,7 @@
name: mappings
title: "BC Mappings Catalog"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/mappings/jaxrsclient/adoc/antora.yml b/mappings/jaxrsclient/adoc/antora.yml
index ed780ec..f2be3cb 100644
--- a/mappings/jaxrsclient/adoc/antora.yml
+++ b/mappings/jaxrsclient/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M4
diff --git a/mappings/minio/adoc/antora.yml b/mappings/minio/adoc/antora.yml
index ed780ec..f2be3cb 100644
--- a/mappings/minio/adoc/antora.yml
+++ b/mappings/minio/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M4
diff --git a/mappings/publisher/adoc/antora.yml b/mappings/publisher/adoc/antora.yml
index ed780ec..f2be3cb 100644
--- a/mappings/publisher/adoc/antora.yml
+++ b/mappings/publisher/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M4
diff --git a/mappings/restclient/adoc/antora.yml b/mappings/restclient/adoc/antora.yml
index ed780ec..f2be3cb 100644
--- a/mappings/restclient/adoc/antora.yml
+++ b/mappings/restclient/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M4
diff --git a/mappings/slack/adoc/antora.yml b/mappings/slack/adoc/antora.yml
index ed780ec..f2be3cb 100644
--- a/mappings/slack/adoc/antora.yml
+++ b/mappings/slack/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M4
diff --git a/mavendeps/adoc/antora.yml b/mavendeps/adoc/antora.yml
index 072c382..e9b71e6 100644
--- a/mavendeps/adoc/antora.yml
+++ b/mavendeps/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: docs
-version: latest
+version: 2.0.0-M4
diff --git a/persistence/jdo/adoc/antora.yml b/persistence/jdo/adoc/antora.yml
index f58f7ff..b5133e3 100644
--- a/persistence/jdo/adoc/antora.yml
+++ b/persistence/jdo/adoc/antora.yml
@@ -17,7 +17,7 @@
name: pjdo
title: "JDO/DataNucleus"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/persistence/jpa/adoc/antora.yml b/persistence/jpa/adoc/antora.yml
index 587cd3b..f39ffdf 100644
--- a/persistence/jpa/adoc/antora.yml
+++ b/persistence/jpa/adoc/antora.yml
@@ -17,7 +17,7 @@
name: pjpa
title: "JPA"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/regressiontests/adoc/antora.yml b/regressiontests/adoc/antora.yml
index 1a59920..7a4ea92 100644
--- a/regressiontests/adoc/antora.yml
+++ b/regressiontests/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M4
diff --git a/security/adoc/antora.yml b/security/adoc/antora.yml
index c6687a5..b564f74 100644
--- a/security/adoc/antora.yml
+++ b/security/adoc/antora.yml
@@ -17,7 +17,7 @@
name: security
title: "Security Guide"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/security/bypass/src/main/adoc/antora.yml b/security/bypass/src/main/adoc/antora.yml
index 2be1151..601395a 100644
--- a/security/bypass/src/main/adoc/antora.yml
+++ b/security/bypass/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/security/keycloak/src/main/adoc/antora.yml b/security/keycloak/src/main/adoc/antora.yml
index 2be1151..601395a 100644
--- a/security/keycloak/src/main/adoc/antora.yml
+++ b/security/keycloak/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/security/shiro/src/main/adoc/antora.yml b/security/shiro/src/main/adoc/antora.yml
index 2be1151..601395a 100644
--- a/security/shiro/src/main/adoc/antora.yml
+++ b/security/shiro/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M4
diff --git a/starters/adoc/antora.yml b/starters/adoc/antora.yml
index 072c382..e9b71e6 100644
--- a/starters/adoc/antora.yml
+++ b/starters/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: docs
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/adoc/antora.yml b/subdomains/adoc/antora.yml
index 972e1f9..4fa3224 100644
--- a/subdomains/adoc/antora.yml
+++ b/subdomains/adoc/antora.yml
@@ -17,7 +17,7 @@
name: subdomains
title: "Subdomains Catalog"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/subdomains/base/adoc/antora.yml b/subdomains/base/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/base/adoc/antora.yml
+++ b/subdomains/base/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/docx/adoc/antora.yml b/subdomains/docx/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/docx/adoc/antora.yml
+++ b/subdomains/docx/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/excel/adoc/antora.yml b/subdomains/excel/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/excel/adoc/antora.yml
+++ b/subdomains/excel/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/freemarker/adoc/antora.yml b/subdomains/freemarker/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/freemarker/adoc/antora.yml
+++ b/subdomains/freemarker/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/ognl/adoc/antora.yml b/subdomains/ognl/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/ognl/adoc/antora.yml
+++ b/subdomains/ognl/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/pdfbox/adoc/antora.yml b/subdomains/pdfbox/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/pdfbox/adoc/antora.yml
+++ b/subdomains/pdfbox/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/settings/adoc/antora.yml b/subdomains/settings/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/settings/adoc/antora.yml
+++ b/subdomains/settings/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/spring/adoc/antora.yml b/subdomains/spring/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/spring/adoc/antora.yml
+++ b/subdomains/spring/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/xdocreport/adoc/antora.yml b/subdomains/xdocreport/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/xdocreport/adoc/antora.yml
+++ b/subdomains/xdocreport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/subdomains/zip/adoc/antora.yml b/subdomains/zip/adoc/antora.yml
index 1044dbb..a233f61 100644
--- a/subdomains/zip/adoc/antora.yml
+++ b/subdomains/zip/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M4
diff --git a/testing/adoc/antora.yml b/testing/adoc/antora.yml
index e8921cb..1aa4ee4 100644
--- a/testing/adoc/antora.yml
+++ b/testing/adoc/antora.yml
@@ -17,7 +17,7 @@
name: testing
title: "Testing Guide"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/testing/fakedata/adoc/antora.yml b/testing/fakedata/adoc/antora.yml
index 3c95843..683ee8f 100644
--- a/testing/fakedata/adoc/antora.yml
+++ b/testing/fakedata/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M4
diff --git a/testing/fixtures/adoc/antora.yml b/testing/fixtures/adoc/antora.yml
index 3c95843..683ee8f 100644
--- a/testing/fixtures/adoc/antora.yml
+++ b/testing/fixtures/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M4
diff --git a/testing/h2console/adoc/antora.yml b/testing/h2console/adoc/antora.yml
index 3c95843..683ee8f 100644
--- a/testing/h2console/adoc/antora.yml
+++ b/testing/h2console/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M4
diff --git a/testing/hsqldbmgr/adoc/antora.yml b/testing/hsqldbmgr/adoc/antora.yml
index 3c95843..683ee8f 100644
--- a/testing/hsqldbmgr/adoc/antora.yml
+++ b/testing/hsqldbmgr/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M4
diff --git a/testing/integtestsupport/adoc/antora.yml b/testing/integtestsupport/adoc/antora.yml
index 3c95843..683ee8f 100644
--- a/testing/integtestsupport/adoc/antora.yml
+++ b/testing/integtestsupport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M4
diff --git a/testing/specsupport/adoc/antora.yml b/testing/specsupport/adoc/antora.yml
index 3c95843..683ee8f 100644
--- a/testing/specsupport/adoc/antora.yml
+++ b/testing/specsupport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M4
diff --git a/testing/unittestsupport/adoc/antora.yml b/testing/unittestsupport/adoc/antora.yml
index 3c95843..683ee8f 100644
--- a/testing/unittestsupport/adoc/antora.yml
+++ b/testing/unittestsupport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M4
diff --git a/valuetypes/adoc/antora.yml b/valuetypes/adoc/antora.yml
index 46395c9..e2b4ac1 100644
--- a/valuetypes/adoc/antora.yml
+++ b/valuetypes/adoc/antora.yml
@@ -17,7 +17,7 @@
name: valuetypes
title: "Value Types Catalog"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/valuetypes/asciidoc/adoc/antora.yml b/valuetypes/asciidoc/adoc/antora.yml
index 0f50856..7af281f 100644
--- a/valuetypes/asciidoc/adoc/antora.yml
+++ b/valuetypes/asciidoc/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: valuetypes
-version: latest
+version: 2.0.0-M4
diff --git a/valuetypes/markdown/adoc/antora.yml b/valuetypes/markdown/adoc/antora.yml
index 0f50856..7af281f 100644
--- a/valuetypes/markdown/adoc/antora.yml
+++ b/valuetypes/markdown/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: valuetypes
-version: latest
+version: 2.0.0-M4
diff --git a/valuetypes/sse/adoc/antora.yml b/valuetypes/sse/adoc/antora.yml
index 0f50856..7af281f 100644
--- a/valuetypes/sse/adoc/antora.yml
+++ b/valuetypes/sse/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: valuetypes
-version: latest
+version: 2.0.0-M4
diff --git a/viewers/restfulobjects/adoc/antora.yml b/viewers/restfulobjects/adoc/antora.yml
index 13c5fde..933e2ed 100644
--- a/viewers/restfulobjects/adoc/antora.yml
+++ b/viewers/restfulobjects/adoc/antora.yml
@@ -17,7 +17,7 @@
name: vro
title: "Restful Objects Viewer"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/viewers/wicket/adoc/antora.yml b/viewers/wicket/adoc/antora.yml
index 25d4699..a77fe85 100644
--- a/viewers/wicket/adoc/antora.yml
+++ b/viewers/wicket/adoc/antora.yml
@@ -17,7 +17,7 @@
name: vw
title: "Wicket Viewer"
-version: latest
+version: 2.0.0-M4
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc