You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/12/23 17:15:51 UTC
[juneau] branch master updated: UI should not rely on config file.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new fbf30ca UI should not rely on config file.
fbf30ca is described below
commit fbf30ca3d48651bd23db6e7817af5d79f381e045
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sun Dec 23 12:15:39 2018 -0500
UI should not rely on config file.
---
.../juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg | 1 +
.../juneau-examples-rest-springboot/src/main/resources/juneau.cfg | 1 +
.../juneau-my-jetty-microservice/my-jetty-microservice.cfg | 1 +
.../juneau-my-springboot-microservice/src/main/resources/juneau.cfg | 1 +
.../src/main/java/org/apache/juneau/rest/BasicRestConfig.java | 6 ++----
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg b/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg
index c63e3ba..1ed0651 100755
--- a/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg
+++ b/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg
@@ -60,6 +60,7 @@ headerLink = http://juneau.apache.org
footerIcon = servlet:/htdocs/images/asf.png
footerLink = http://www.apache.org
favicon = $C{REST/headerIcon}
+head = <link rel='icon' href='$U{$C{REST/favicon}}'/>
header =
<a href='$U{$C{REST/headerLink}}'>
<img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/>
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
index 2d368dd..98e4574 100755
--- a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
+++ b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
@@ -37,6 +37,7 @@ headerLink = http://juneau.apache.org
footerIcon = servlet:/htdocs/images/asf.png
footerLink = http://www.apache.org
favicon = $C{REST/headerIcon}
+head = <link rel='icon' href='$U{$C{REST/favicon}}'/>
header =
<a href='$U{$C{REST/headerLink}}'>
<img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/>
diff --git a/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg b/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
index 10e488f..a23e103 100755
--- a/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
+++ b/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
@@ -62,6 +62,7 @@ headerLink = http://juneau.apache.org
footerIcon = servlet:/htdocs/images/asf.png
footerLink = http://www.apache.org
favicon = $C{REST/headerIcon}
+head = <link rel='icon' href='$U{$C{REST/favicon}}'/>
header =
<a href='$U{$C{REST/headerLink}}'>
<img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/>
diff --git a/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
index 852fb94..857df5e 100755
--- a/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
+++ b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
@@ -37,6 +37,7 @@ headerLink = http://juneau.apache.org
footerIcon = servlet:/htdocs/images/asf.png
footerLink = http://www.apache.org
favicon = $C{REST/headerIcon}
+head = <link rel='icon' href='$U{$C{REST/favicon}}'/>
header =
<a href='$U{$C{REST/headerLink}}'>
<img src='$U{$C{REST/headerIcon}}' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
index a0e625c..45863cd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
@@ -94,9 +94,7 @@ import org.apache.juneau.xmlschema.XmlSchemaDocSerializer;
// Default contents to add to the <head> section of the HTML page.
// Use it to add a favicon link to the page.
- head={
- "<link rel='icon' href='$U{$C{REST/favicon}}'/>"
- },
+ head="$C{REST/head}",
// No default page footer contents.
// Can be overridden from external config file.
@@ -112,6 +110,6 @@ import org.apache.juneau.xmlschema.XmlSchemaDocSerializer;
// These are static files that are served up by the servlet under the specified sub-paths.
// For example, "/servletPath/htdocs/javadoc.css" resolves to the file "[servlet-package]/htdocs/javadoc.css"
// By default, we define static files through the external configuration file.
- staticFiles="$C{REST/staticFiles}"
+ staticFiles="$C{REST/staticFiles,htdocs:htdocs}"
)
public interface BasicRestConfig {}