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/21 17:39:43 UTC
[isis] 01/02: ISIS-2062: updates docs
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 9f62f772ae1f7f523ec0d19d74bc4d958e64dfbb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 21 17:19:14 2020 +0000
ISIS-2062: updates docs
---
.../adoc/modules/applib-ant/examples/annotation/Nature.java | 11 +++++++++--
.../main/adoc/modules/config/examples/generated/resteasy.adoc | 10 ----------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Nature.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Nature.java
index fcb6fc1..df64918 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Nature.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Nature.java
@@ -103,10 +103,17 @@ public enum Nature {
VIEW_MODEL,
/**
- * An object that acts as a mix-in to some other object, contributing behaviour and/or derived state based on the
+ * An object that acts as a mix-in to some other object, contributing behavior and/or derived state based on the
* domain object.
*
* @see Mixin
*/
- MIXIN
+ MIXIN,
+
+ /**
+ * An object that is entirely managed by the underlying IoC container.
+ * @apiNote EXPERIMENTAL
+ */
+ BEAN,
+
}
diff --git a/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc b/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
index 615a658..644481d 100644
--- a/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
+++ b/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
@@ -6,16 +6,6 @@
|
|
-| resteasy.jaxrs.app. +
-registration
-|
-|
-
-| resteasy.jaxrs.default-path
-| /restful
-| Note that this is used rather than `resteasy.servlet.mapping.prefix` because there is _NO_ implementation of `javax.ws.rs.core.Application`, so we rely on it being automatically created.
-
-
| resteasy.resteasy-settings
|
|