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:44 UTC

[isis] 02/02: ISIS-2264: relaxing some validation for demo app.

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: