This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit a2d289a4ea492554dc057b93226e728b42d80ee0
Author: David M. Johnson <snoopd...@apache.org>
AuthorDate: Sat Apr 5 09:45:32 2025 -0400
Replace references to favicon.ico with the new favicon.svg
---
app/src/main/resources/log4j2.xml | 3 ++-
.../main/resources/org/apache/roller/planet/config/planet.properties | 2 +-
.../resources/org/apache/roller/weblogger/config/roller.properties | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp | 2 +-
app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 2 +-
app/src/main/webapp/themes/frontpage/_header.vm | 2 +-
12 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/app/src/main/resources/log4j2.xml
b/app/src/main/resources/log4j2.xml
index d7ab8ccbb..293fc12fb 100644
--- a/app/src/main/resources/log4j2.xml
+++ b/app/src/main/resources/log4j2.xml
@@ -80,7 +80,8 @@ limitations under the License.
<Logger name="com.opensymphony" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
<Logger name="com.rometools" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
<Logger name="org.webjars" level="info"
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
-
+ <Logger
name="org.apache.roller.weblogger.ui.core.filters.ValidateSaltFilter"
level="debug" additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
+
<!-- server.log catches everything that hasn't been logged yet-->
<Root level="info">
<!--<AppenderRef ref="server"/> -->
diff --git
a/app/src/main/resources/org/apache/roller/planet/config/planet.properties
b/app/src/main/resources/org/apache/roller/planet/config/planet.properties
index 541f07161..580631e73 100644
--- a/app/src/main/resources/org/apache/roller/planet/config/planet.properties
+++ b/app/src/main/resources/org/apache/roller/planet/config/planet.properties
@@ -92,7 +92,7 @@ rendering.userRequestMappers=
# Url path elements which can NEVER be considered a weblog url
# each represents a url at the application root, i.e. /<elem>/*
rendering.multiPlanetMapper.rollerProtectedUrls=\
-planet-ui,index.jsp,favicon.ico,robots.txt
+planet-ui,index.jsp,favicon.svg,robots.txt
# Set of user defined protected urls. These are added to the set above.
rendering.multiPlanetMapper.userProtectedUrls=
diff --git
a/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
b/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
index 119bd9a78..d73e7f9ca 100644
---
a/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
+++
b/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
@@ -429,7 +429,7 @@ rendering.userRequestMappers=
# each represents a url at the application root, i.e. /<elem>/*
rendering.weblogMapper.rollerProtectedUrls=\
roller-ui,roller-services,images,theme,themes,CommentAuthenticatorServlet,\
-index.jsp,favicon.ico,robots.txt,\
+index.jsp,favicon.svg,robots.txt,\
page,flavor,rss,atom,language,search,comments,rsd,resource,planetrss
# Set of user defined protected urls. These are added to the set above.
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
index 0ce7edcc6..df836038d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
@@ -21,7 +21,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<title><s:text name="error" /></title>
<tiles:insertAttribute name="head" />
<style>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
index 059a985f4..a73bad889 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
@@ -21,7 +21,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<title><s:property value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
<style>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
index 94cb7c721..1e69ebc66 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-loginpage.jsp
@@ -22,7 +22,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
<style>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
index 6750d79bb..145bbcb67 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
@@ -21,7 +21,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
index 7d99207fa..1da57d2df 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp
@@ -21,7 +21,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<tiles:insertAttribute name="head" />
<style>
<tiles:insertAttribute name="styles" />
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
index f123444d0..1b7227e6e 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp
@@ -21,7 +21,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
<style>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
index 55d81130c..9219b4980 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
@@ -22,7 +22,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
<style>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
index 7a028acfb..8d5556f7a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
@@ -22,7 +22,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.svg"
type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle"/></title>
<tiles:insertAttribute name="head"/>
<style>
diff --git a/app/src/main/webapp/themes/frontpage/_header.vm
b/app/src/main/webapp/themes/frontpage/_header.vm
index 676434b0a..d946743c1 100644
--- a/app/src/main/webapp/themes/frontpage/_header.vm
+++ b/app/src/main/webapp/themes/frontpage/_header.vm
@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Security-Policy" content="default-src 'none';
script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src *;
base-uri 'self'; connect-src 'self'; form-action 'self'; frame-ancestors
'none'">
<title>$model.weblog.name</title>
- <link href="$url.absoluteSite/favicon.ico" rel="shortcut icon"
type="image/x-icon" />
+ <link href="$url.absoluteSite/favicon.svg" rel="shortcut icon"
type="image/x-icon" />
#showAutodiscoveryLinks($model.weblog)
<style>
#includeTemplate($model.weblog "_css")
