[isis] branch master updated: ISIS-2444: minor doc fixes

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new e89376c  ISIS-2444: minor doc fixes
e89376c is described below

commit e89376c7b8a8009ad3e932cbb72523619a54335f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Feb 2 07:15:48 2021 +0100

    ISIS-2444: minor doc fixes
---
 tooling/cli/adoc/modules/tooling-cli/pages/about.adoc            | 6 +++---
 .../jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java        | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tooling/cli/adoc/modules/tooling-cli/pages/about.adoc b/tooling/cli/adoc/modules/tooling-cli/pages/about.adoc
index 4a4800a..e3fad70 100644
--- a/tooling/cli/adoc/modules/tooling-cli/pages/about.adoc
+++ b/tooling/cli/adoc/modules/tooling-cli/pages/about.adoc
@@ -157,7 +157,7 @@ For example,
 ----
 global:
   ...
-  sections:                                                               # <.>
+  sections:
     ...
     Persistence: org.apache.isis.persistence
     JDO: "org.apache.isis.persistence:isis-persistence-jdo.*"
@@ -167,7 +167,7 @@ global:
 
 The `overview` command will render "Persistence" section at level 2 (because its pattern is only for a `groupId`), and then the "JDO" and "JPA" sections underneath at level 3 (because there patterns also include an `artifactId`).
 
-In this way, sections can be defined that create a hierarchy.
+This way, sections can be defined that create a hierarchy.
 
 
 === Usage
@@ -228,7 +228,7 @@ The `index` command is usually invoked as follows:
 java -jar tooling/cli/target/isis-tooling-cli.jar \
     -p . \
     -o antora/components/system/modules/generated \
-    overview
+    index
 ----
 
 where :
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 2fbca25..c25281f 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -44,8 +44,15 @@ import lombok.val;
 
 /**
  * WebModule that provides the RestfulObjects Viewer.
+ * 
+ * @since 2.0 {@index}
+ *
+ * @implNote CDI feels responsible to resolve injection points for any Servlet or Filter
+ * we register programmatically on the ServletContext.
+ * As long as injection points are considered to be resolved by Spring, we can workaround this fact:
+ * By replacing annotations {@code @Inject} with {@code @Autowire} for any Servlet or Filter,
+ * that get contributed by a WebModule, these will be ignored by CDI.
  *
- * @since 1.x {@index}
  */
 @Service
 @Named("isis.viewer.ro.WebModuleJaxrsRestEasy4")