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/01/09 18:25:50 UTC

[isis] 11/11: ISIS-2261: sync adoc

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 6865b1a3d702c991fdd2dd5944c15b311053e545
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 9 18:23:46 2020 +0000

    ISIS-2261: sync adoc
---
 .../modules/applib-cm/examples/util/schema/CommonDtoUtils.java   | 2 +-
 .../src/main/doc/modules/config/examples/generated/Other.adoc    | 3 +--
 .../doc/modules/config/examples/generated/isis.reflector.adoc    | 2 +-
 .../config/examples/generated/isis.reflector.validator.adoc      | 5 +++++
 .../config/examples/generated/isis.viewer.restfulobjects.adoc    | 2 +-
 .../src/main/doc/modules/config/examples/generated/resteasy.adoc | 9 ---------
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java b/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
index 179c420..4bb592d 100644
--- a/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
+++ b/core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
@@ -67,7 +67,7 @@ public final class CommonDtoUtils {
     public static final Function<ParamDto, ValueType> PARAM_DTO_TO_TYPE = ParamDto::getType;
 
     // -- asValueType
-    private final static Map<Class<?>, ValueType> valueTypeByClass =
+    public final static Map<Class<?>, ValueType> valueTypeByClass =
             _Maps.unmodifiableEntries(
                     entry(String.class, ValueType.STRING),
                     entry(byte.class, ValueType.BYTE),
diff --git a/core/config/src/main/doc/modules/config/examples/generated/Other.adoc b/core/config/src/main/doc/modules/config/examples/generated/Other.adoc
index 42a7348..b132868 100644
--- a/core/config/src/main/doc/modules/config/examples/generated/Other.adoc
+++ b/core/config/src/main/doc/modules/config/examples/generated/Other.adoc
@@ -8,8 +8,7 @@
 
 | isis.locale
 | 
-|  Optional: set to override {@link Locale#getDefault()}  +
-{@code null} is allowed
+|  Set to override {@link Locale#getDefault()}
 
 | isis.objects.editing
 | 
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc
index dd2c13a..2d512c2 100644
--- a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc
@@ -18,7 +18,7 @@ mode
 | isis.reflector.introspector. +
 parallelize
 |  true
-|  Whether to perform introspection and metamodel validation in parallel.
+|  Whether to perform introspection in parallel.
 
 | isis.reflector.introspector. +
 validate-incrementally
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc
index 0b4cde1..365bfe9 100644
--- a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc
@@ -69,6 +69,11 @@ no-params-only
 | 
 
 | isis.reflector.validator. +
+parallelize
+|  true
+|  Whether to perform metamodel validation in parallel.
+
+| isis.reflector.validator. +
 mixins-only
 |  true
 | 
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
index 907692f..8c68489 100644
--- a/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
@@ -3,7 +3,7 @@ base-uri
 | 
 |  If left unset (the default), then the RO viewer will use the {@link javax.ws.rs.core.UriInfo} injected using  @link javax.ws.rs.core.Context}) to figure out the base Uri (used to render `href</code>s).  +
  This will be correct much of the time, but will almost certainly be wrong if there is a reverse proxy.   +
- If set, eg `https://dev.myapp.com</code>, then this value will be used instead. 
+ If set, eg `https://dev.myapp.com/</code>, then this value will be used instead. 
 
 | isis.viewer.restfulobjects. +
 gsoc2013.legacy-param-details
diff --git a/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc b/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc
index 8a8ac8b..644481d 100644
--- a/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc
+++ b/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc
@@ -6,15 +6,6 @@
 | 
 | 
 
-| resteasy.jaxrs.app. +
-registration
-| 
-| 
-
-| resteasy.jaxrs.default-path
-|  /restful
-|  Note that this is used rather than `resteasy.servlet.mapping.prefix</code> because there is _NO</i> implementation of {@link javax.ws.rs.core.Application}, so we rely on it being automatically created.
-
 | resteasy.resteasy-settings
 | 
 |