This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0f8aba41ae39a2e589056366ff9b25da8c78de52
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Tue Feb 11 22:23:44 2020 +0000
ISIS-2062: docs
---
.../config/pages/configuration-properties.adoc | 100 +++++++++------------
.../apache/isis/core/config/IsisConfiguration.java | 13 ++-
scripts/generateConfigDocs.groovy | 1 +
3 files changed, 50 insertions(+), 64 deletions(-)
diff --git
a/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
b/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
index d13f167..e10798f 100644
---
a/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
+++
b/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
@@ -6,11 +6,10 @@
== Applib
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.applib.adoc[]
@@ -22,11 +21,10 @@
include::refguide:config:example$generated/isis.applib.adoc[]
General configuration:
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.core.meta-model.adoc[]
@@ -35,11 +33,10 @@
include::refguide:config:example$generated/isis.core.meta-model.adoc[]
=== Introspection
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.core.meta-model.introspector.adoc[]
@@ -48,11 +45,10 @@
include::refguide:config:example$generated/isis.core.meta-model.introspector.ado
=== Validator
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.core.meta-model.validator.adoc[]
@@ -64,11 +60,10 @@
include::refguide:config:example$generated/isis.core.meta-model.validator.adoc[]
== Core Runtime
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.core.runtime.adoc[]
@@ -80,11 +75,10 @@
include::refguide:config:example$generated/isis.core.runtime.adoc[]
== Core Runtime Services
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.core.runtime-services.adoc[]
@@ -97,11 +91,10 @@
include::refguide:config:example$generated/isis.core.runtime-services.adoc[]
== JDO DataNucleus Persistence
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.persistence.jdo-datanucleus.adoc[]
@@ -122,11 +115,10 @@ Configuration properties keys under `datanucleus` need to
be specified in `camel
Configuration properties keys under `javax.jdo.option` need to be specified in
`PascalCase`.
====
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.persistence.jdo-datanucleus.impl.adoc[]
@@ -136,11 +128,10 @@
include::refguide:config:example$generated/isis.persistence.jdo-datanucleus.impl
== Shiro Security
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
@@ -152,11 +143,10 @@
include::refguide:config:example$generated/isis.security.shiro.adoc[]
== Restful Objects Viewer
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.viewer.restfulobjects.adoc[]
@@ -167,11 +157,10 @@
include::refguide:config:example$generated/isis.viewer.restfulobjects.adoc[]
== Wicket Viewer
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.viewer.wicket.adoc[]
@@ -181,11 +170,10 @@
include::refguide:config:example$generated/isis.viewer.wicket.adoc[]
== Testing
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.testing.adoc[]
@@ -195,11 +183,10 @@
include::refguide:config:example$generated/isis.testing.adoc[]
== Value Types
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.value-types.adoc[]
@@ -211,11 +198,10 @@ ifdef::env-this-stuff-is-currently-disabled[]
== Subdomains
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.subdomains.adoc[]
@@ -224,11 +210,10 @@
include::refguide:config:example$generated/isis.subdomains.adoc[]
== Mappings
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.mappings.adoc[]
@@ -239,11 +224,10 @@ endif::[]
== Extensions
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.extensions.adoc[]
@@ -255,11 +239,10 @@ ifdef::env-this-stuff-is-currently-disabled[]
== Incubator
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.incubator.adoc[]
@@ -271,11 +254,10 @@ endif::[]
== Legacy
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/isis.legacy.adoc[]
@@ -289,11 +271,10 @@ These configuration options are defined by 3rd party
libraries (dependency of th
=== RestEasy
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/resteasy.adoc[]
@@ -306,11 +287,10 @@ include::refguide:config:example$generated/resteasy.adoc[]
== Other
-[cols="2a,2a,3a", options="header"]
+[cols="3a,2a,5a", options="header"]
|===
|Property
-|Value +
-(default value)
+|Default
|Description
include::refguide:config:example$generated/Other.adoc[]
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 57f9749..b50e1b9 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -101,9 +101,14 @@ public class IsisConfiguration {
this.environment = environment;
}
- @Inject @Named("isis-settings") private Map<String, String> isisSettings;
- public Map<String, String> getAsMap() { return
Collections.unmodifiableMap(isisSettings); }
-
+ /**
+ *
+ */
+ @Inject @Named("as-map")
+ private Map<String, String> asMap;
+ public Map<String, String> getAsMap() { return
Collections.unmodifiableMap(asMap); }
+
+
private final Security security = new Security();
@Data
public static class Security {
@@ -1682,7 +1687,7 @@ public class IsisConfiguration {
/**
- * Name of a class that implements
<tt>org.datanucleus.store.connection.DecryptionProvider</tt>
+ * Name of a class that implements
<code>org.datanucleus.store.connection.DecryptionProvider</code>
* and should only be specified if the password is
encrypted in the persistence properties.
*
* <p>
diff --git a/scripts/generateConfigDocs.groovy
b/scripts/generateConfigDocs.groovy
index 4807640..73643e4 100644
--- a/scripts/generateConfigDocs.groovy
+++ b/scripts/generateConfigDocs.groovy
@@ -270,6 +270,7 @@ static String toAsciidoc(String str) {
System.out.print(".");
str = str.replaceAll( /\{@link[ ]+?([^}]+?)[ ]+?([^}]+?)}/, '$2')
str = str.replaceAll( /\{@link (?:(?:[^}]|[.])+[.])*([^}]+)}/, '``$1``')
+ str = str.replaceAll( /<tt>(?:(?:[^<]|[.])+[.])*([^<]+)<\/tt>/, '``$1``')
str = str.replaceAll( /<code>(?:(?:[^<]|[.])+[.])*([^<]+)<\/code>/,
'``$1``')
str = str.replaceAll( /@apiNote -/, 'TIP:')
str = str.replaceAll( /@apiNote/, 'TIP:')
