This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch roller-6.0.x in repository https://gitbox.apache.org/repos/asf/roller.git
commit 5e045807e5875b57affb4a02fbd2c90cae383354 Merge: 6ecfd22 a8e34f6 Author: David M. Johnson <[email protected]> AuthorDate: Fri Nov 22 17:51:53 2019 -0500 Merge branch 'roller-6.0.x' of https://github.com/apache/roller into roller-6.0.x app/pom.xml | 2 +- app/src/main/java/org/apache/roller/RollerException.java | 3 +++ .../apache/roller/weblogger/business/PreviewURLStrategy.java | 1 + .../roller/weblogger/business/jpa/JPAWebloggerImpl.java | 4 +++- .../roller/weblogger/business/pings/PingQueueTask.java | 1 + .../weblogger/business/runnable/ContinuousWorkerThread.java | 1 + .../weblogger/business/runnable/ResetHitCountsTask.java | 1 + .../roller/weblogger/business/runnable/WorkerThread.java | 1 + .../business/search/operations/WriteToIndexOperation.java | 1 + .../roller/weblogger/planet/business/PlanetURLStrategy.java | 4 ++++ .../roller/weblogger/planet/tasks/SyncWebsitesTask.java | 1 + .../org/apache/roller/weblogger/planet/ui/PlanetConfig.java | 4 +++- .../apache/roller/weblogger/planet/ui/PlanetGroupSubs.java | 1 + .../org/apache/roller/weblogger/planet/ui/PlanetGroups.java | 1 + .../org/apache/roller/weblogger/pojos/GlobalPermission.java | 1 + .../org/apache/roller/weblogger/pojos/WeblogPermission.java | 1 + .../apache/roller/weblogger/ui/core/CmaRollerContext.java | 1 + .../org/apache/roller/weblogger/ui/core/RollerContext.java | 2 ++ .../org/apache/roller/weblogger/ui/core/RollerSession.java | 7 +++++-- .../roller/weblogger/ui/core/filters/BootstrapFilter.java | 4 +++- .../roller/weblogger/ui/core/filters/CharEncodingFilter.java | 2 ++ .../apache/roller/weblogger/ui/core/filters/DebugFilter.java | 4 ++-- .../apache/roller/weblogger/ui/core/filters/IPBanFilter.java | 3 ++- .../apache/roller/weblogger/ui/core/filters/InitFilter.java | 2 ++ .../roller/weblogger/ui/core/filters/LoadSaltFilter.java | 4 ++-- .../weblogger/ui/core/filters/PersistenceSessionFilter.java | 2 ++ .../weblogger/ui/core/filters/RoleAssignmentFilter.java | 4 +++- .../roller/weblogger/ui/core/filters/ValidateSaltFilter.java | 2 ++ .../weblogger/ui/core/security/RollerRememberMeServices.java | 1 + .../ui/core/tags/calendar/BigWeblogCalendarModel.java | 3 +++ .../roller/weblogger/ui/core/tags/calendar/CalendarTag.java | 4 +++- .../weblogger/ui/rendering/filters/RequestMappingFilter.java | 4 +++- .../roller/weblogger/ui/rendering/model/FeedModel.java | 6 ++++++ .../weblogger/ui/rendering/model/PreviewPageModel.java | 4 ++++ .../roller/weblogger/ui/rendering/model/PreviewURLModel.java | 2 ++ .../weblogger/ui/rendering/model/SearchResultsModel.java | 5 +++++ .../roller/weblogger/ui/rendering/pagers/CommentsPager.java | 1 + .../weblogger/ui/rendering/pagers/MediaFilesPager.java | 1 + .../weblogger/ui/rendering/pagers/PlanetEntriesPager.java | 3 ++- .../ui/rendering/pagers/SearchResultsFeedPager.java | 5 +++++ .../roller/weblogger/ui/rendering/pagers/UsersPager.java | 3 +++ .../weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java | 12 +++++++++++- .../ui/rendering/pagers/WeblogEntriesLatestPager.java | 1 + .../ui/rendering/pagers/WeblogEntriesListPager.java | 1 + .../ui/rendering/pagers/WeblogEntriesMonthPager.java | 12 +++++++++++- .../ui/rendering/pagers/WeblogEntriesPermalinkPager.java | 6 ++++++ .../ui/rendering/pagers/WeblogEntriesPreviewPager.java | 1 + .../roller/weblogger/ui/rendering/pagers/WeblogsPager.java | 3 +++ .../ui/rendering/servlets/CommentAuthenticatorServlet.java | 3 +++ .../roller/weblogger/ui/rendering/servlets/FeedServlet.java | 2 ++ .../ui/rendering/servlets/MediaResourceServlet.java | 2 ++ .../roller/weblogger/ui/rendering/servlets/PageServlet.java | 3 +++ .../weblogger/ui/rendering/servlets/PlanetFeedServlet.java | 2 ++ .../ui/rendering/servlets/PreviewResourceServlet.java | 2 ++ .../weblogger/ui/rendering/servlets/PreviewServlet.java | 2 ++ .../roller/weblogger/ui/rendering/servlets/RSDServlet.java | 2 ++ .../weblogger/ui/rendering/servlets/ResourceServlet.java | 2 ++ .../weblogger/ui/rendering/servlets/SearchServlet.java | 2 ++ .../weblogger/ui/rendering/servlets/TrackbackServlet.java | 3 +++ .../ui/rendering/util/WeblogMediaResourceRequest.java | 1 + .../weblogger/ui/rendering/util/WeblogPreviewRequest.java | 5 +++++ .../ui/rendering/util/WeblogPreviewResourceRequest.java | 2 ++ .../weblogger/ui/rendering/util/WeblogResourceRequest.java | 1 + .../apache/roller/weblogger/ui/struts2/admin/CacheInfo.java | 4 ++++ .../weblogger/ui/struts2/admin/GlobalCommentManagement.java | 3 +++ .../roller/weblogger/ui/struts2/admin/PingTargetEdit.java | 3 +++ .../roller/weblogger/ui/struts2/admin/PingTargets.java | 3 +++ .../apache/roller/weblogger/ui/struts2/admin/UserAdmin.java | 5 ++++- .../apache/roller/weblogger/ui/struts2/admin/UserEdit.java | 4 ++++ .../roller/weblogger/ui/struts2/ajax/CommentDataServlet.java | 5 ++++- .../roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java | 2 ++ .../roller/weblogger/ui/struts2/ajax/UserDataServlet.java | 1 + .../roller/weblogger/ui/struts2/core/CreateWeblog.java | 2 ++ .../org/apache/roller/weblogger/ui/struts2/core/Install.java | 4 ++++ .../org/apache/roller/weblogger/ui/struts2/core/Login.java | 3 +++ .../apache/roller/weblogger/ui/struts2/core/MainMenu.java | 2 ++ .../apache/roller/weblogger/ui/struts2/core/OAuthKeys.java | 2 ++ .../org/apache/roller/weblogger/ui/struts2/core/Profile.java | 2 ++ .../apache/roller/weblogger/ui/struts2/core/Register.java | 3 +++ .../org/apache/roller/weblogger/ui/struts2/core/Setup.java | 1 + .../roller/weblogger/ui/struts2/editor/BookmarkEdit.java | 2 ++ .../apache/roller/weblogger/ui/struts2/editor/Bookmarks.java | 2 ++ .../roller/weblogger/ui/struts2/editor/BookmarksImport.java | 1 + .../roller/weblogger/ui/struts2/editor/Categories.java | 1 + .../roller/weblogger/ui/struts2/editor/CategoryEdit.java | 2 ++ .../roller/weblogger/ui/struts2/editor/CategoryRemove.java | 3 +++ .../apache/roller/weblogger/ui/struts2/editor/Comments.java | 1 + .../apache/roller/weblogger/ui/struts2/editor/Entries.java | 1 + .../weblogger/ui/struts2/editor/EntryAddWithMediaFile.java | 3 +++ .../apache/roller/weblogger/ui/struts2/editor/EntryEdit.java | 2 ++ .../roller/weblogger/ui/struts2/editor/EntryRemove.java | 2 ++ .../roller/weblogger/ui/struts2/editor/FolderEdit.java | 2 ++ .../roller/weblogger/ui/struts2/editor/Maintenance.java | 1 + .../roller/weblogger/ui/struts2/editor/MediaFileAdd.java | 2 ++ .../roller/weblogger/ui/struts2/editor/MediaFileEdit.java | 2 ++ .../weblogger/ui/struts2/editor/MediaFileImageChooser.java | 2 ++ .../weblogger/ui/struts2/editor/MediaFileImageDim.java | 1 + .../roller/weblogger/ui/struts2/editor/MediaFileView.java | 2 ++ .../roller/weblogger/ui/struts2/editor/MemberResign.java | 2 ++ .../apache/roller/weblogger/ui/struts2/editor/Members.java | 1 + .../roller/weblogger/ui/struts2/editor/MembersInvite.java | 2 ++ .../org/apache/roller/weblogger/ui/struts2/editor/Pings.java | 2 ++ .../roller/weblogger/ui/struts2/editor/StylesheetEdit.java | 1 + .../roller/weblogger/ui/struts2/editor/TemplateEdit.java | 2 ++ .../roller/weblogger/ui/struts2/editor/TemplateRemove.java | 3 +++ .../apache/roller/weblogger/ui/struts2/editor/Templates.java | 1 + .../apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java | 2 ++ .../roller/weblogger/ui/struts2/editor/WeblogConfig.java | 2 ++ .../roller/weblogger/ui/struts2/editor/WeblogRemove.java | 1 + .../apache/roller/weblogger/ui/tags/StringTagSupport.java | 1 + .../apache/roller/weblogger/ui/tags/TruncateNicelyTag.java | 1 + .../org/apache/roller/weblogger/ui/tags/WordWrapTag.java | 1 + .../java/org/apache/roller/weblogger/util/LRUCache2.java | 1 + .../org/apache/roller/weblogger/util/LinkbackExtractor.java | 5 +++++ .../org/apache/roller/weblogger/util/cache/LRUCacheImpl.java | 1 + .../weblogger/webservices/opensearch/OpenSearchServlet.java | 1 + .../roller/weblogger/webservices/tagdata/TagDataServlet.java | 2 ++ 117 files changed, 271 insertions(+), 19 deletions(-)
