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 2019/09/18 05:52:23 UTC
[isis] 06/08: renames extensions/viewer-wicket-excel module to
ext-viewer-wicket-excel component
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2d9c46ae34758765cca7c90f92cc3d556462c598
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 00:52:46 2019 +0200
renames extensions/viewer-wicket-excel module to ext-viewer-wicket-excel component
Also updates the ui theme.
---
antora/components/ext-specsupport/antora.yml | 6 ++++++
.../{extensions => ext-specsupport}/examples.csv | 0
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../modules/ROOT/nav.adoc | 0
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 0
.../sync_examples.sh | 0
.../components/ext-viewer-wicket-excel/antora.yml | 6 ++++++
.../examples.csv | 0
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../modules/ROOT/nav.adoc | 0
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 4 ++--
.../sync_examples.sh | 0
antora/components/extensions/antora.yml | 8 --------
.../extensions/modules/ROOT/_attributes.adoc | 6 ------
.../extensions/modules/ROOT/pages/_attributes.adoc | 4 ----
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 ----
.../extensions/modules/ROOT/pages/about.adoc | 3 ---
.../extensions/modules/specsupport/nav.adoc | 2 --
.../modules/viewer-wicket-excel/nav.adoc | 2 --
.../components/toc/modules/ROOT/pages/about.adoc | 4 ++--
antora/theme/ui-bundle.zip | Bin 269845 -> 276988 bytes
site.yml | 9 ++++++---
32 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/antora/components/ext-specsupport/antora.yml b/antora/components/ext-specsupport/antora.yml
new file mode 100644
index 0000000..5c7bc3b
--- /dev/null
+++ b/antora/components/ext-specsupport/antora.yml
@@ -0,0 +1,6 @@
+name: ext-specsupport
+title: "Extensions - (BDD) Spec Support"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/examples.csv b/antora/components/ext-specsupport/examples.csv
similarity index 100%
copy from antora/components/extensions/examples.csv
copy to antora/components/ext-specsupport/examples.csv
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/_attributes.adoc b/antora/components/ext-specsupport/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/_attributes.adoc
rename to antora/components/ext-specsupport/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/examples/.gitkeep b/antora/components/ext-specsupport/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/examples/.gitkeep
rename to antora/components/ext-specsupport/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/assets/images/.gitkeep b/antora/components/ext-specsupport/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/assets/images/.gitkeep
rename to antora/components/ext-specsupport/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/assets/attachments/.gitkeep b/antora/components/ext-specsupport/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/assets/attachments/.gitkeep
rename to antora/components/ext-specsupport/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/extensions/modules/ROOT/nav.adoc b/antora/components/ext-specsupport/modules/ROOT/nav.adoc
similarity index 100%
copy from antora/components/extensions/modules/ROOT/nav.adoc
copy to antora/components/ext-specsupport/modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/pages/_attributes.adoc b/antora/components/ext-specsupport/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/pages/_attributes.adoc
rename to antora/components/ext-specsupport/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/pages/_partials/_attributes.adoc b/antora/components/ext-specsupport/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/viewer-wicket-excel/pages/_partials/_attributes.adoc
rename to antora/components/ext-specsupport/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/specsupport/pages/about.adoc b/antora/components/ext-specsupport/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/pages/about.adoc
rename to antora/components/ext-specsupport/modules/ROOT/pages/about.adoc
diff --git a/antora/components/extensions/sync_examples.sh b/antora/components/ext-specsupport/sync_examples.sh
similarity index 100%
copy from antora/components/extensions/sync_examples.sh
copy to antora/components/ext-specsupport/sync_examples.sh
diff --git a/antora/components/ext-viewer-wicket-excel/antora.yml b/antora/components/ext-viewer-wicket-excel/antora.yml
new file mode 100644
index 0000000..ebf6730
--- /dev/null
+++ b/antora/components/ext-viewer-wicket-excel/antora.yml
@@ -0,0 +1,6 @@
+name: ext-viewer-wicket-excel
+title: "Extensions: Excel Download (Wicket)"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/examples.csv b/antora/components/ext-viewer-wicket-excel/examples.csv
similarity index 100%
rename from antora/components/extensions/examples.csv
rename to antora/components/ext-viewer-wicket-excel/examples.csv
diff --git a/antora/components/extensions/modules/specsupport/_attributes.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/_attributes.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/specsupport/examples/.gitkeep b/antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/specsupport/examples/.gitkeep
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/specsupport/assets/images/.gitkeep b/antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/specsupport/assets/images/.gitkeep
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/specsupport/assets/attachments/.gitkeep b/antora/components/ext-viewer-wicket-excel/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/specsupport/assets/attachments/.gitkeep
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/extensions/modules/ROOT/nav.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/nav.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/modules/specsupport/pages/_attributes.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/pages/_attributes.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/specsupport/pages/_partials/_attributes.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/specsupport/pages/_partials/_attributes.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/pages/about.adoc b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc
similarity index 88%
rename from antora/components/extensions/modules/viewer-wicket-excel/pages/about.adoc
rename to antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc
index cd98d47..ea61261 100644
--- a/antora/components/extensions/modules/viewer-wicket-excel/pages/about.adoc
+++ b/antora/components/ext-viewer-wicket-excel/modules/ROOT/pages/about.adoc
@@ -1,6 +1,6 @@
-= Wicket Excel Extension
+= About
: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::_attributes.adoc[]
-TODO: v2: placeholder for documentation about extensions/viewer-wicket-excel
+TODO: v2: placeholder for documentation about ext-viewer-wicket-excel
diff --git a/antora/components/extensions/sync_examples.sh b/antora/components/ext-viewer-wicket-excel/sync_examples.sh
similarity index 100%
rename from antora/components/extensions/sync_examples.sh
rename to antora/components/ext-viewer-wicket-excel/sync_examples.sh
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
deleted file mode 100644
index 0a2127a..0000000
--- a/antora/components/extensions/antora.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: ext
-title: "Extensions"
-version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
-- modules/specsupport/nav.adoc
-- modules/viewer-wicket-excel/nav.adoc
diff --git a/antora/components/extensions/modules/ROOT/_attributes.adoc b/antora/components/extensions/modules/ROOT/_attributes.adoc
deleted file mode 100644
index 787e5c4..0000000
--- a/antora/components/extensions/modules/ROOT/_attributes.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
-:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-endif::[]
diff --git a/antora/components/extensions/modules/ROOT/pages/_attributes.adoc b/antora/components/extensions/modules/ROOT/pages/_attributes.adoc
deleted file mode 100644
index e8ada7c..0000000
--- a/antora/components/extensions/modules/ROOT/pages/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/antora/components/extensions/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/extensions/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/extensions/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/antora/components/extensions/modules/ROOT/pages/about.adoc b/antora/components/extensions/modules/ROOT/pages/about.adoc
deleted file mode 100644
index 21c3a59..0000000
--- a/antora/components/extensions/modules/ROOT/pages/about.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= About
-include::_attributes.adoc[]
-
diff --git a/antora/components/extensions/modules/specsupport/nav.adoc b/antora/components/extensions/modules/specsupport/nav.adoc
deleted file mode 100644
index 3fa15e7..0000000
--- a/antora/components/extensions/modules/specsupport/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[(BDD) Spec Support]
-
diff --git a/antora/components/extensions/modules/viewer-wicket-excel/nav.adoc b/antora/components/extensions/modules/viewer-wicket-excel/nav.adoc
deleted file mode 100644
index f20e860..0000000
--- a/antora/components/extensions/modules/viewer-wicket-excel/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[Excel Download (Wicket)]
-
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index b769382..385993d 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -61,10 +61,10 @@ include::_attributes.adoc[]
* Testing & Prototyping
** xref:ext-fixtures:ROOT:about.adoc[Fixtures]
-** xref:ext:specsupport:about.adoc[(BDD) Spec Support]
+** xref:ext-specsupport:ROOT:about.adoc[(BDD) Spec Support]
* Modules
** xref:ext-secman:ROOT:about.adoc[Security Manager]
-** xref:ext:viewer-wicket-excel:about.adoc[Excel Download (Wicket)]
+** xref:ext-viewer-wicket-excel:ROOT:about.adoc[Excel Download (Wicket)]
* Values Types
** xref:ext-asciidoc:ROOT:about.adoc[Asciidoc], xref:ext-markdown:ROOT:about.adoc[Markdown]
diff --git a/antora/theme/ui-bundle.zip b/antora/theme/ui-bundle.zip
index db7f537..76b6762 100644
Binary files a/antora/theme/ui-bundle.zip and b/antora/theme/ui-bundle.zip differ
diff --git a/site.yml b/site.yml
index 6efd4d2..fc0767f 100644
--- a/site.yml
+++ b/site.yml
@@ -19,9 +19,6 @@ content:
branches: HEAD
- url: .
branches: HEAD
- start_path: antora/components/extensions
- - url: .
- branches: HEAD
start_path: antora/components/ext-asciidoc
- url: .
branches: HEAD
@@ -34,6 +31,12 @@ content:
start_path: antora/components/ext-secman
- url: .
branches: HEAD
+ start_path: antora/components/ext-specsupport
+ - url: .
+ branches: HEAD
+ start_path: antora/components/ext-viewer-wicket-excel
+ - url: .
+ branches: HEAD
start_path: examples/apps/demo/_adoc
- url: .
branches: HEAD