This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 7d90ac3 Merge pull request #62 from adityasharma7/ROL-2156
add 96b226f Remove all references to term "blacklist" with more
descriptive "banned-words list" terminology.
add c9247d2 Remove all references to term "blacklist" with more
descriptive "banned-words list" terminology.
new 93c7526 Merge pull request #65 from apache/banned-words
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
rename
app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/{BlacklistCommentValidator.java
=> BannedwordslistCommentValidator.java} (77%)
rename app/src/main/java/org/apache/roller/weblogger/util/{Blacklist.java =>
Bannedwordslist.java} (71%)
rename
app/src/main/java/org/apache/roller/weblogger/util/{BlacklistChecker.java =>
BannedwordslistChecker.java} (53%)
rename app/src/main/resources/{blacklist.txt => bannedwordslist.txt} (94%)
rename app/src/test/java/org/apache/roller/weblogger/util/{BlacklistTest.java
=> BannedwordslistTest.java} (58%)
