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/10/23 07:19:40 UTC
[isis] 01/02: ISIS-2062: improves formatting
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a18ff6bc60bd93743431ee744d98f4ebc5ed6cc9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Oct 23 00:19:50 2019 +0100
ISIS-2062: improves formatting
---
core/config/_adoc/modules/cfg/examples/.gitignore | 3 +-
.../modules/cfg/pages/spring-configuration.adoc | 65 +++++++++++++---------
core/config/_adoc/modules/cfg/partials/Other.adoc | 4 ++
preview.sh | 4 +-
4 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/core/config/_adoc/modules/cfg/examples/.gitignore b/core/config/_adoc/modules/cfg/examples/.gitignore
index 2606a20..f0d619c 100644
--- a/core/config/_adoc/modules/cfg/examples/.gitignore
+++ b/core/config/_adoc/modules/cfg/examples/.gitignore
@@ -1,2 +1 @@
-!generated/_attributes.adoc
-generated
+generated/*.adoc
diff --git a/core/config/_adoc/modules/cfg/pages/spring-configuration.adoc b/core/config/_adoc/modules/cfg/pages/spring-configuration.adoc
index 0a5944e..744b27c 100644
--- a/core/config/_adoc/modules/cfg/pages/spring-configuration.adoc
+++ b/core/config/_adoc/modules/cfg/pages/spring-configuration.adoc
@@ -5,7 +5,8 @@ include::_attributes.adoc[]
-.Shiro Authentication
+== Shiro Authentication
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -14,12 +15,13 @@ include::_attributes.adoc[]
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.authentication.shiro.adoc
+include::rg:cfg:example$generated/isis.authentication.shiro.adoc[]
|===
-.Persistors (in general)
+== Persistors (in general)
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -27,12 +29,13 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.authenticat
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.persistor.adoc
+include::rg:cfg:example$generated/isis.persistor.adoc[]
|===
-.DataNucleus Persistor
+== DataNucleus Persistor
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -40,15 +43,15 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.persistor.a
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.persistor.datanucleus.adoc
+include::rg:cfg:example$generated/isis.persistor.datanucleus.adoc[]
|===
+== DataNucleus Persistor Pass-thru Settings
-.DataNucleus Persistor Pass-thru Settings
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -56,13 +59,14 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.persistor.d
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.persistor.datanucleus.impl.adoc
+include::rg:cfg:example$generated/isis.persistor.datanucleus.impl.adoc[]
|===
-.Metamodel Reflector
+== Metamodel Reflector
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -70,14 +74,15 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.persistor.d
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.reflector.adoc
+include::rg:cfg:example$generated/isis.reflector.adoc[]
|===
-.MetaModel Facets
+== MetaModel Facets
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -85,14 +90,15 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.reflector.a
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.reflector.facet.adoc
+include::rg:cfg:example$generated/isis.reflector.facet.adoc[]
|===
-.Metamodel Validation
+== Metamodel Validation
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -100,13 +106,14 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.reflector.f
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.reflector.validator.adoc
+include::rg:cfg:example$generated/isis.reflector.validator.adoc[]
|===
-.Individual Domain Services
+== Individual Domain Services
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -114,13 +121,14 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.reflector.v
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.service.email.adoc
+include::rg:cfg:example$generated/isis.service.email.adoc[]
|===
-.Domain Services (in general)
+== Domain Services (in general)
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -128,13 +136,14 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.service.ema
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.services.adoc
+include::rg:cfg:example$generated/isis.services.adoc[]
|===
-.Restful Objects Viewer
+== Restful Objects Viewer
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -142,13 +151,14 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.services.ad
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.viewer.restfulobjects.adoc
+include::rg:cfg:example$generated/isis.viewer.restfulobjects.adoc[]
|===
-.Wicket Viewer
+== Wicket Viewer
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -156,13 +166,14 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.viewer.rest
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.viewer.wicket.adoc
+include::rg:cfg:example$generated/isis.viewer.wicket.adoc[]
|===
-.Viewers (in general)
+== Viewers (in general)
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -170,12 +181,13 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.viewer.wick
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/isis.viewers.adoc
+include::rg:cfg:example$generated/isis.viewers.adoc[]
|===
-.Other
+== Other
+
[cols="2a,1,3a", options="header"]
|===
|Property
@@ -183,11 +195,12 @@ include::rg:cfg:example$generated/spring-configuration-metadata/isis.viewers.ado
(default value)
|Description
-include::rg:cfg:example$generated/spring-configuration-metadata/Other.adoc
+include::rg:cfg:example$generated/Other.adoc[]
|===
+include::rg:cfg:example$generated/Other.adoc[]
diff --git a/core/config/_adoc/modules/cfg/partials/Other.adoc b/core/config/_adoc/modules/cfg/partials/Other.adoc
new file mode 100644
index 0000000..3b739d3
--- /dev/null
+++ b/core/config/_adoc/modules/cfg/partials/Other.adoc
@@ -0,0 +1,4 @@
+| isis.objects.editing
+|
+|
+
diff --git a/preview.sh b/preview.sh
index 5f04a1c..0bea1e6 100644
--- a/preview.sh
+++ b/preview.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
rm -rf antora/target/site \
-&& rm -rf core/config/_adoc/modules/cfg/examples/generated/spring-configuration-metadata \
-&& groovy scripts/generateConfigDocs -f "./core/config/target/classes/META-INF/spring-configuration-metadata.json" -o ./core/config/_adoc/modules/cfg/examples/generated/spring-configuration-metadata \
+&& rm -rf core/config/_adoc/modules/cfg/examples/generated \
+&& groovy scripts/generateConfigDocs -f "./core/config/target/classes/META-INF/spring-configuration-metadata.json" -o ./core/config/_adoc/modules/cfg/examples/generated \
&& antora site.yml $@ \
&& serve antora/target/site