You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2020/08/01 21:16:59 UTC
[roller] 01/01: Merge pull request #65 from apache/banned-words
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 93c7526792ddd13a53b16f19679cc8b36e039388
Merge: 7d90ac3 c9247d2
Author: David M. Johnson <sn...@users.noreply.github.com>
AuthorDate: Sat Aug 1 17:16:51 2020 -0400
Merge pull request #65 from apache/banned-words
Remove all references to term "blacklist"
.../org/apache/roller/weblogger/TestUtils.java | 2 +-
.../org/apache/roller/weblogger/pojos/Weblog.java | 12 +-
.../weblogger/pojos/wrapper/WeblogWrapper.java | 4 +-
...r.java => BannedwordslistCommentValidator.java} | 12 +-
.../ui/rendering/servlets/CommentServlet.java | 2 +-
.../ui/rendering/servlets/PageServlet.java | 6 +-
.../weblogger/ui/struts2/editor/WeblogConfig.java | 10 +-
.../ui/struts2/editor/WeblogConfigBean.java | 14 +-
.../util/{Blacklist.java => Bannedwordslist.java} | 160 ++++++++++-----------
...istChecker.java => BannedwordslistChecker.java} | 54 +++----
.../main/resources/ApplicationResources.properties | 10 +-
.../resources/ApplicationResources_de.properties | 8 +-
.../resources/ApplicationResources_es.properties | 4 +-
.../resources/ApplicationResources_fr.properties | 8 +-
.../resources/ApplicationResources_ja.properties | 8 +-
.../resources/ApplicationResources_ko.properties | 8 +-
.../ApplicationResources_zh_CN.properties | 4 +-
.../{blacklist.txt => bannedwordslist.txt} | 2 +-
.../roller/weblogger/config/roller.properties | 14 +-
.../roller/weblogger/config/runtimeConfigDefs.xml | 2 +-
.../apache/roller/weblogger/pojos/Weblog.orm.xml | 4 +-
app/src/main/resources/sql/createdb.vm | 2 +-
.../webapp/WEB-INF/jsps/editor/WeblogConfig.jsp | 2 +-
.../roller/weblogger/business/WeblogTest.java | 2 +-
.../ui/rendering/util/CommentValidatorTest.java | 4 +-
...BlacklistTest.java => BannedwordslistTest.java} | 42 +++---
app/src/test/resources/blacklist.txt | 4 +-
docs/roller-user-guide.adoc | 24 ++--
28 files changed, 211 insertions(+), 217 deletions(-)