This is an automated email from the ASF dual-hosted git repository.
mraible pushed a change to branch external-login-placeholder-6.1.x
in repository https://gitbox.apache.org/repos/asf/roller.git
from 97851146f Don't match the external-login placeholder as a password
add f59b841a2 Reject the external-login placeholder as a chosen password
and never match an empty one
add 8d09fb58a Release the persistence session for every request
add 875ef06bb Merge pull request #307 from
apache/persistence-session-filter-first-6.1.x
add 312be749b Limit the size and download time of feeds fetched by the
planet aggregator
add 0b497e138 Merge pull request #326 from apache/planet-fetch-limits-6.1.x
add befa5e24a Serve a media file only at its own weblog's address
add 8e71ad23e Merge pull request #329 from
apache/media-file-own-weblog-6.1.x
add 3812728dd Escape user names, commenter details and tag names where
they are output
add 2f52062f8 Merge pull request #330 from
apache/escape-user-display-names-6.1.x
add 2537a6d14 Merge remote-tracking branch 'origin/roller-6.1.x' into
external-login-placeholder-6.1.x
No new revisions were added by this update.
Summary of changes:
app/pom.xml | 7 +
.../planet/business/fetcher/RomeFeedFetcher.java | 132 ++++++++++++-
.../weblogger/pojos/wrapper/UserWrapper.java | 25 ++-
.../pojos/wrapper/WeblogEntryCommentWrapper.java | 36 +++-
.../ui/core/security/CustomUserRegistry.java | 2 +-
.../ExternalLoginAwarePasswordEncoder.java | 30 ++-
.../rendering/servlets/MediaResourceServlet.java | 11 ++
.../weblogger/ui/struts2/admin/UserEdit.java | 5 +
.../ui/struts2/ajax/CommentDataServlet.java | 7 +-
.../weblogger/ui/struts2/ajax/UserDataServlet.java | 2 +
.../roller/weblogger/ui/struts2/core/Profile.java | 5 +
.../roller/weblogger/ui/struts2/core/Register.java | 9 +-
.../org/apache/roller/weblogger/util/MailUtil.java | 9 +-
.../apache/roller/weblogger/util/Utilities.java | 49 +++--
.../webservices/tagdata/TagDataServlet.java | 7 +-
.../main/resources/ApplicationResources.properties | 1 +
.../roller/weblogger/config/roller.properties | 5 +
.../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp | 20 +-
.../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp | 8 +-
.../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp | 6 +-
.../main/webapp/WEB-INF/jsps/editor/Comments.jsp | 4 +-
app/src/main/webapp/WEB-INF/velocity/feeds.vm | 4 +-
app/src/main/webapp/WEB-INF/web.xml | 19 +-
.../fetcher/RomeFeedFetcherLimitsTest.java | 190 +++++++++++++++++++
.../weblogger/pojos/wrapper/UserWrapperTest.java | 67 +++++++
.../wrapper/WeblogEntryCommentWrapperTest.java | 70 +++++++
.../ui/core/ExternalLoginPlaceholderTest.java | 208 +++++++++++++++++++++
.../weblogger/ui/core/filters/FilterOrderTest.java | 49 +++++
...vletTest.java => MediaResourceServletTest.java} | 107 +++++------
.../rendering/velocity/FeedAuthorEscapingTest.java | 163 ++++++++++++++++
.../ui/struts2/ajax/CommentDataServletTest.java | 43 +++++
.../ui/struts2/ajax/UserDataServletTest.java | 24 ++-
.../core/ExternalLoginMarkerPasswordTest.java | 203 ++++++++++++++++++++
.../ui/struts2/util/JspOutputEncodingTest.java | 20 ++
.../util/MailUtilCommentNotificationTest.java | 100 ++++++++++
.../roller/weblogger/util/UtilitiesTest.java | 35 +++-
.../webservices/tagdata/TagDataServletTest.java | 122 ++++++++++++
37 files changed, 1675 insertions(+), 129 deletions(-)
create mode 100644
app/src/test/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcherLimitsTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapperTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/core/ExternalLoginPlaceholderTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/core/filters/FilterOrderTest.java
copy
app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/{ResourceServletTest.java
=> MediaResourceServletTest.java} (55%)
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/velocity/FeedAuthorEscapingTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/core/ExternalLoginMarkerPasswordTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/util/MailUtilCommentNotificationTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServletTest.java