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:42 UTC
[isis] branch master updated (80bde79 -> 33e71c6)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 80bde79 ISIS-2062: improves the home page (?)
new 9f62f77 ISIS-2062: updates docs
new 33e71c6 ISIS-2264: relaxing some validation for demo app.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../adoc/modules/applib-ant/examples/annotation/Nature.java | 11 +++++++++--
.../main/adoc/modules/config/examples/generated/resteasy.adoc | 10 ----------
.../java/org/apache/isis/core/config/IsisConfiguration.java | 2 +-
examples/demo/src/main/resources/application.yml | 2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
[isis] 02/02: ISIS-2264: relaxing some validation for demo app.
Posted by da...@apache.org.
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 33e71c6fa9d0ec1b9ddff14dbbfc4c6d884049e3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 21 17:39:10 2020 +0000
ISIS-2264: relaxing some validation for demo app.
---
.../src/main/java/org/apache/isis/core/config/IsisConfiguration.java | 2 +-
examples/demo/src/main/resources/application.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 fc0cf62..cf0a7fa 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
@@ -2457,7 +2457,7 @@ public class IsisConfiguration {
* {@link #getName() name} and/or {@link #getImage() image}.
* </p>
*/
- @javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?/([^/]+/)*$")
+ @javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?.*$")
private String url;
/**
* URL of an organisation or individual to give credit to, appearing as text in the footer.
diff --git a/examples/demo/src/main/resources/application.yml b/examples/demo/src/main/resources/application.yml
index 6922ea8..35eea94 100644
--- a/examples/demo/src/main/resources/application.yml
+++ b/examples/demo/src/main/resources/application.yml
@@ -66,7 +66,7 @@ isis:
credit:
- url: http://isis.apache.org
- image: /images/apache-isis/logo-48x48.png
+ image: images/apache-isis/logo-48x48.png
name: Apache Isis
themes:
[isis] 01/02: ISIS-2062: updates docs
Posted by da...@apache.org.
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
|
|