From c3d5d10bfcec7aae5cc75b63c5d298e631361c11 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Fri, 10 Jul 2020 10:54:35 +0200 Subject: [PATCH 1/4] made fast path faster. - small optimizations on the fast path of PageServlet - better initial size for StringBuilders; resize won't be needed for most keys. - replaced String append with char append for single char Strings; should be easier to inline --- .../ui/rendering/util/cache/PlanetCache.java | 10 +++---- .../ui/rendering/util/cache/SaltCache.java | 4 +-- .../rendering/util/cache/SiteWideCache.java | 26 +++++++++---------- .../rendering/util/cache/WeblogFeedCache.java | 14 +++++----- .../rendering/util/cache/WeblogPageCache.java | 14 +++++----- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java index 070b1f2e47..f2c0860152 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java @@ -52,7 +52,7 @@ public final class PlanetCache { private long timeout = RollerConstants.FIFTEEN_MIN_IN_MS; // reference to our singleton instance - private static PlanetCache singletonInstance = new PlanetCache(); + private static final PlanetCache singletonInstance = new PlanetCache(); private PlanetCache() { @@ -194,17 +194,17 @@ public String generateKey(PlanetRequest planetRequest) { StringBuilder key = new StringBuilder(); - key.append(CACHE_ID).append(":"); + key.append(CACHE_ID).append(':'); key.append(planetRequest.getContext()); - key.append("/"); + key.append('/'); key.append(planetRequest.getType()); if(planetRequest.getFlavor() != null) { - key.append("/").append(planetRequest.getFlavor()); + key.append('/').append(planetRequest.getFlavor()); } // add language - key.append("/").append(planetRequest.getLanguage()); + key.append('/').append(planetRequest.getLanguage()); if(planetRequest.getFlavor() != null) { // add excerpts diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java index 3a4a88f83d..1fa3deccb8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java @@ -45,9 +45,9 @@ public final class SaltCache { private Cache contentCache = null; // reference to our singleton instance - private static SaltCache singletonInstance = new SaltCache(); + private static final SaltCache singletonInstance = new SaltCache(); - private SaltCache() { + private SaltCache() { Map cacheProps = new HashMap(); cacheProps.put("id", CACHE_ID); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java index 5d18c52157..68139ae5a7 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java @@ -67,7 +67,7 @@ public final class SiteWideCache implements CacheHandler { private ExpiringCacheEntry lastUpdateTime = null; // reference to our singleton instance - private static SiteWideCache singletonInstance = new SiteWideCache(); + private static final SiteWideCache singletonInstance = new SiteWideCache(); private SiteWideCache() { @@ -193,9 +193,9 @@ public Date getLastModified() { */ public String generateKey(WeblogPageRequest pageRequest) { - StringBuilder key = new StringBuilder(); + StringBuilder key = new StringBuilder(128); - key.append(CACHE_ID).append(":"); + key.append(CACHE_ID).append(':'); key.append("page/"); key.append(pageRequest.getWeblogHandle()); @@ -216,7 +216,7 @@ public String generateKey(WeblogPageRequest pageRequest) { } if(pageRequest.getWeblogDate() != null) { - key.append("/").append(pageRequest.getWeblogDate()); + key.append('/').append(pageRequest.getWeblogDate()); } if(pageRequest.getWeblogCategoryName() != null) { @@ -228,7 +228,7 @@ public String generateKey(WeblogPageRequest pageRequest) { // ignored } - key.append("/").append(cat); + key.append('/').append(cat); } if("tags".equals(pageRequest.getContext())) { @@ -242,7 +242,7 @@ public String generateKey(WeblogPageRequest pageRequest) { } if(pageRequest.getLocale() != null) { - key.append("/").append(pageRequest.getLocale()); + key.append('/').append(pageRequest.getLocale()); } // add page number when applicable @@ -283,14 +283,14 @@ public String generateKey(WeblogPageRequest pageRequest) { */ public String generateKey(WeblogFeedRequest feedRequest) { - StringBuilder key = new StringBuilder(); + StringBuilder key = new StringBuilder(128); - key.append(CACHE_ID).append(":"); + key.append(CACHE_ID).append(':'); key.append("feed/"); key.append(feedRequest.getWeblogHandle()); - key.append("/").append(feedRequest.getType()); - key.append("/").append(feedRequest.getFormat()); + key.append('/').append(feedRequest.getType()); + key.append('/').append(feedRequest.getFormat()); if (feedRequest.getTerm() != null) { key.append("/search/").append(feedRequest.getTerm()); @@ -304,11 +304,11 @@ public String generateKey(WeblogFeedRequest feedRequest) { // should never happen, utf-8 is always supported } - key.append("/").append(cat); + key.append('/').append(cat); } if(feedRequest.getLocale() != null) { - key.append("/").append(feedRequest.getLocale()); + key.append('/').append(feedRequest.getLocale()); } if(feedRequest.isExcerpts()) { @@ -421,7 +421,7 @@ private String paramsToString(Map map) { for (Map.Entry entry : map.entrySet()) { if(entry.getValue() != null) { - string.append(",").append(entry.getKey()).append("=").append(entry.getValue()[0]); + string.append(',').append(entry.getKey()).append('=').append(entry.getValue()[0]); } } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java index 1ba9c84720..8fb3462d8b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java @@ -51,7 +51,7 @@ public final class WeblogFeedCache { private Cache contentCache = null; // reference to our singleton instance - private static WeblogFeedCache singletonInstance = new WeblogFeedCache(); + private static final WeblogFeedCache singletonInstance = new WeblogFeedCache(); private WeblogFeedCache() { @@ -162,13 +162,13 @@ public void clear() { */ public String generateKey(WeblogFeedRequest feedRequest) { - StringBuilder key = new StringBuilder(); + StringBuilder key = new StringBuilder(128); - key.append(this.CACHE_ID).append(":"); + key.append(this.CACHE_ID).append(':'); key.append(feedRequest.getWeblogHandle()); - key.append("/").append(feedRequest.getType()); - key.append("/").append(feedRequest.getFormat()); + key.append('/').append(feedRequest.getType()); + key.append('/').append(feedRequest.getFormat()); if (feedRequest.getTerm() != null) { key.append("/search/").append(feedRequest.getTerm()); @@ -182,7 +182,7 @@ public String generateKey(WeblogFeedRequest feedRequest) { // should never happen, utf-8 is always supported } - key.append("/").append(cat); + key.append('/').append(cat); } if(feedRequest.getTags() != null && feedRequest.getTags().size() > 0) { @@ -192,7 +192,7 @@ public String generateKey(WeblogFeedRequest feedRequest) { } if(feedRequest.getLocale() != null) { - key.append("/").append(feedRequest.getLocale()); + key.append('/').append(feedRequest.getLocale()); } if(feedRequest.isExcerpts()) { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java index 0c689b25df..8bedffb854 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java @@ -51,7 +51,7 @@ public final class WeblogPageCache { private Cache contentCache = null; // reference to our singleton instance - private static WeblogPageCache singletonInstance = new WeblogPageCache(); + private static final WeblogPageCache singletonInstance = new WeblogPageCache(); private WeblogPageCache() { @@ -166,9 +166,9 @@ public void clear() { */ public String generateKey(WeblogPageRequest pageRequest) { - StringBuilder key = new StringBuilder(); + StringBuilder key = new StringBuilder(128); - key.append(this.CACHE_ID).append(":"); + key.append(this.CACHE_ID).append(':'); key.append(pageRequest.getWeblogHandle()); if(pageRequest.getWeblogAnchor() != null) { @@ -189,7 +189,7 @@ public String generateKey(WeblogPageRequest pageRequest) { } if(pageRequest.getWeblogDate() != null) { - key.append("/").append(pageRequest.getWeblogDate()); + key.append('/').append(pageRequest.getWeblogDate()); } if(pageRequest.getWeblogCategoryName() != null) { @@ -201,7 +201,7 @@ public String generateKey(WeblogPageRequest pageRequest) { // ignored } - key.append("/").append(cat); + key.append('/').append(cat); } if("tags".equals(pageRequest.getContext())) { @@ -215,7 +215,7 @@ public String generateKey(WeblogPageRequest pageRequest) { } if(pageRequest.getLocale() != null) { - key.append("/").append(pageRequest.getLocale()); + key.append('/').append(pageRequest.getLocale()); } // add page number when applicable @@ -251,7 +251,7 @@ private String paramsToString(Map map) { for (Map.Entry entry : map.entrySet()) { if(entry.getKey() != null) { - string.append(",").append(entry.getKey()).append("=").append(entry.getValue()[0]); + string.append(',').append(entry.getKey()).append('=').append(entry.getValue()[0]); } } From 233ba6434b40da63c9b12c060f9ccd0c73f8a292 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Sun, 19 Jul 2020 08:15:31 +0200 Subject: [PATCH 2/4] updated lucene and rome dependencies to latest version. cleaned up some exclusions which didn't do anything anymore. --- app/pom.xml | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index f6670154e5..7275ee2903 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -48,12 +48,12 @@ limitations under the License. 2.7.7 4.2.3 2.12.1 - 8.5.1 + 8.6.0 20100527 3.2.3 2.17 1.0b3 - 1.13.1 + 1.15.0 1.7.30 5.2.7.RELEASE 5.3.3.RELEASE @@ -95,6 +95,12 @@ limitations under the License. mail ${java-mail.version} provided + + + javax.activation + activation + + @@ -178,12 +184,6 @@ limitations under the License. org.apache.velocity velocity-engine-core ${velocity.version} - - - commons-collections - commons-collections - - @@ -427,12 +427,6 @@ limitations under the License. org.springframework spring-web ${spring.version} - - - aopalliance - aopalliance - - @@ -473,12 +467,6 @@ limitations under the License. org.springframework.security spring-security-taglibs ${spring.security.version} - - - org.springframework - spring-web - - @@ -500,6 +488,12 @@ limitations under the License. guice ${guice.version} no_aop + + + aopalliance + aopalliance + + From 1ad852905def4e4de117f64c72ad2cc0706bf8a0 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Thu, 6 Aug 2020 14:13:51 +0200 Subject: [PATCH 3/4] fixed bug: custom stylesheet is never set to the StylesheetEdit.jsp action. - commit 48e9708 only implemented isSharedTheme() branch - added else branch for custom themes - used the opportunity clean the method up --- .../ui/struts2/editor/StylesheetEdit.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java index 68da44ec52..cb50e00bd8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java @@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.WeblogManager; -import org.apache.roller.weblogger.business.Weblogger; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.themes.SharedTheme; import org.apache.roller.weblogger.business.themes.ThemeManager; @@ -31,7 +30,6 @@ import org.apache.roller.weblogger.pojos.ThemeTemplate.ComponentType; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.cache.CacheManager; -import org.apache.struts2.convention.annotation.AllowedMethods; import java.util.Date; @@ -66,24 +64,29 @@ public void myPrepare() { sharedThemeStylesheet = false; - WeblogManager weblogManager = WebloggerFactory.getWeblogger().getWeblogManager(); - ThemeManager themeManager = WebloggerFactory.getWeblogger().getThemeManager(); + try { + ThemeTemplate stylesheet; - if ( isSharedTheme() ) { - try { + if ( isSharedTheme() ) { + ThemeManager themeManager = WebloggerFactory.getWeblogger().getThemeManager(); SharedTheme themeName = themeManager.getTheme(getActionWeblog().getEditorTheme()); + sharedThemeStylesheet = themeName.getStylesheet() != null; - ThemeTemplate themeStylesheet = themeName.getStylesheet(); + stylesheet = themeName.getStylesheet(); + } else { // custom theme + stylesheet = getActionWeblog().getTheme().getStylesheet(); + } - WeblogTemplate weblogStylesheet = - weblogManager.getTemplateByLink(getActionWeblog(), themeStylesheet.getLink()); + if(stylesheet == null) { + throw new WebloggerException("no stylesheet found"); + } - setTemplate( weblogStylesheet ); + WeblogManager weblogManager = WebloggerFactory.getWeblogger().getWeblogManager(); + setTemplate(weblogManager.getTemplateByLink(getActionWeblog(), stylesheet.getLink())); - } catch (WebloggerException ex) { - log.error("Error looking up shared theme name on weblog - " + getActionWeblog().getHandle(), ex); - } + } catch (WebloggerException ex) { + log.error("Error looking up stylesheet on weblog - " + getActionWeblog().getHandle(), ex); } } From 8475fdaed28dfdb21e5c94f5d5cb41f4caef3f5d Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Wed, 16 Sep 2020 15:46:56 +0200 Subject: [PATCH 4/4] updated dependencies + added commons-text to fix deprecation of lang3.StringEscapeUtils. --- app/pom.xml | 26 ++++++++++++++----- .../business/fetcher/RomeFeedFetcher.java | 2 +- .../plugins/entry/ObfuscateEmailPlugin.java | 2 +- .../business/plugins/entry/SmileysPlugin.java | 2 +- .../roller/weblogger/pojos/WeblogEntry.java | 2 +- .../wrapper/WeblogEntryCommentWrapper.java | 2 +- .../pojos/wrapper/WeblogWrapper.java | 2 +- .../model/SearchResultsFeedModel.java | 4 +-- .../rendering/model/SearchResultsModel.java | 2 +- .../ui/rendering/model/UtilitiesModel.java | 4 +-- .../util/WeblogEntryCommentForm.java | 2 +- .../ui/struts2/ajax/CommentDataServlet.java | 4 +-- .../weblogger/ui/struts2/util/UIAction.java | 2 +- .../roller/weblogger/util/Trackback.java | 2 +- .../roller/weblogger/util/Utilities.java | 2 +- .../opensearch/OpenSearchServlet.java | 18 ++++++------- app/src/main/webapp/WEB-INF/security.xml | 2 +- 17 files changed, 46 insertions(+), 34 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index 7275ee2903..fc76577fc1 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -40,23 +40,23 @@ limitations under the License. 1.2 1.7.8 1.10.8 - 8.0.1 - 1.6 + 9.0-beta + 1.7 1.9.4 3.1 - 1.14 + 1.15 2.7.7 4.2.3 - 2.12.1 - 8.6.0 + 2.13.3 + 8.6.2 20100527 3.2.3 2.17 1.0b3 1.15.0 1.7.30 - 5.2.7.RELEASE - 5.3.3.RELEASE + 5.2.9.RELEASE + 5.4.0 2.5.22 2.2 1.5 @@ -216,6 +216,12 @@ limitations under the License. org.apache.struts struts2-core ${struts.version} + + + org.apache.logging.log4j + log4j-api + + @@ -368,6 +374,12 @@ limitations under the License. commons-codec ${commons-codec.version} + + + org.apache.commons + commons-text + 1.9 + xml-security diff --git a/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java b/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java index 36084910be..e1e9d233c4 100644 --- a/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java +++ b/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java @@ -37,7 +37,7 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java index 3895789bf3..aa173d0835 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java @@ -18,7 +18,7 @@ package org.apache.roller.weblogger.business.plugins.entry; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.WebloggerException; diff --git a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java index b4e71e2c9f..e127782b22 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java @@ -22,7 +22,7 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.WebloggerException; diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java index a9f6f3113f..ac8b6a199c 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java @@ -37,7 +37,7 @@ import java.util.StringTokenizer; import java.util.TreeSet; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java index 275bdd5b1d..639b31b53b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java @@ -19,7 +19,7 @@ package org.apache.roller.weblogger.pojos.wrapper; import java.sql.Timestamp; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.plugins.PluginManager; diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java index 0b74d629ff..c329baa2ca 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java @@ -18,7 +18,7 @@ package org.apache.roller.weblogger.pojos.wrapper; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.pojos.TagStat; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java index a9a65c88d4..89eefd274a 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.lucene.document.Document; @@ -240,7 +240,7 @@ public WeblogWrapper getWeblog() { public String getTerm() { String query =feedRequest.getTerm() ; return (query == null) - ? "" : StringEscapeUtils.escapeXml(Utilities.escapeHTML(query)); + ? "" : StringEscapeUtils.escapeXml11(Utilities.escapeHTML(query)); } public int getHits() { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java index 1796b3cbc4..8515ca7c05 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java @@ -27,7 +27,7 @@ import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.lucene.document.Document; import org.apache.lucene.search.ScoreDoc; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java index 83e338bd62..ef332243b1 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java @@ -24,7 +24,7 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -253,7 +253,7 @@ public String unescapeHTML(String str) { } public String escapeXML(String str) { - return StringEscapeUtils.escapeXml(str); + return StringEscapeUtils.escapeXml11(str); } public String unescapeXML(String str) { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java index 06531f882e..95e30fb81a 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java @@ -18,7 +18,7 @@ package org.apache.roller.weblogger.ui.rendering.util; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.roller.weblogger.pojos.WeblogEntryComment; import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java index af5eacf8d1..59db62bd7f 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java @@ -23,8 +23,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.StringEscapeUtils; +import org.apache.commons.text.WordUtils; import org.apache.roller.weblogger.business.Weblogger; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.WeblogEntryManager; diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java index 9fdc74e3d9..918a7f142e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java @@ -19,7 +19,7 @@ package org.apache.roller.weblogger.ui.struts2.util; import com.opensymphony.xwork2.ActionSupport; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.config.WebloggerConfig; diff --git a/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java b/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java index 4cfb8f107a..38e81b4e27 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java @@ -30,7 +30,7 @@ import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java b/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java index 617aab71bf..2c471aa58d 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java @@ -28,7 +28,7 @@ import javax.mail.internet.InternetAddress; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java b/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java index 39646a3737..9d31a97dfd 100644 --- a/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java +++ b/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.business.WebloggerFactory; @@ -79,24 +79,24 @@ public void doGet( } catch (WebloggerException ex) { throw new ServletException("ERROR: fetching specified weblog"); } - searchPage = StringEscapeUtils.escapeXml( + searchPage = StringEscapeUtils.escapeXml11( strat.getWeblogSearchPageURLTemplate(weblog)); - searchFeed = StringEscapeUtils.escapeXml( + searchFeed = StringEscapeUtils.escapeXml11( strat.getWeblogSearchFeedURLTemplate(weblog)); boolean siteWide = WebloggerRuntimeConfig.isSiteWideWeblog(handle); if (siteWide) { - shortName = "[Search Descriptor] " + StringEscapeUtils.escapeXml( + shortName = "[Search Descriptor] " + StringEscapeUtils.escapeXml11( WebloggerRuntimeConfig.getProperty("site.shortName")); - description = StringEscapeUtils.escapeXml( + description = StringEscapeUtils.escapeXml11( WebloggerRuntimeConfig.getProperty("site.description")); - contact = StringEscapeUtils.escapeXml( + contact = StringEscapeUtils.escapeXml11( WebloggerRuntimeConfig.getProperty("site.adminemail")); } else { - shortName = StringEscapeUtils.escapeXml(weblog.getName()); - description = StringEscapeUtils.escapeXml(weblog.getTagline()); - contact = StringEscapeUtils.escapeXml(weblog.getEmailAddress()); + shortName = StringEscapeUtils.escapeXml11(weblog.getName()); + description = StringEscapeUtils.escapeXml11(weblog.getTagline()); + contact = StringEscapeUtils.escapeXml11(weblog.getEmailAddress()); } response.setContentType("application/opensearchdescription+xml"); diff --git a/app/src/main/webapp/WEB-INF/security.xml b/app/src/main/webapp/WEB-INF/security.xml index 08e7c620b2..72a6d0fae3 100644 --- a/app/src/main/webapp/WEB-INF/security.xml +++ b/app/src/main/webapp/WEB-INF/security.xml @@ -22,7 +22,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-5.3.xsd"> + http://www.springframework.org/schema/security/spring-security-5.4.xsd">