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 2017/11/06 22:17:36 UTC
[35/35] roller git commit: Merge tag 'roller-5.2.0'
Merge tag 'roller-5.2.0'
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/25a9bc7f
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/25a9bc7f
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/25a9bc7f
Branch: refs/heads/master
Commit: 25a9bc7fb4fab505f770ead07fb26634c5465def
Parents: 349276a 2d19f5a
Author: Dave Johnson <sn...@gmail.com>
Authored: Mon Nov 6 17:16:44 2017 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Mon Nov 6 17:16:44 2017 -0500
----------------------------------------------------------------------
.gitignore | 2 +-
NOTICE.txt | 2 +-
README.md | 54 +++
README.txt | 49 ---
app/pom.xml | 332 +++++++++++--------
.../roller/planet/business/PlanetManager.java | 7 +-
.../business/jpa/JPAPlanetManagerImpl.java | 20 +-
.../weblogger/planet/ui/PlanetConfig.java | 2 +
.../weblogger/planet/ui/PlanetGroups.java | 48 ++-
.../planet/ui/PlanetSubscriptions.java | 2 +
.../weblogger/ui/struts2/admin/CacheInfo.java | 2 +
.../struts2/admin/GlobalCommentManagement.java | 2 +
.../ui/struts2/admin/GlobalConfig.java | 2 +
.../ui/struts2/admin/PingTargetEdit.java | 2 +
.../weblogger/ui/struts2/admin/PingTargets.java | 2 +
.../weblogger/ui/struts2/admin/UserAdmin.java | 2 +
.../weblogger/ui/struts2/admin/UserEdit.java | 2 +
.../weblogger/ui/struts2/core/CreateWeblog.java | 2 +
.../weblogger/ui/struts2/core/Install.java | 2 +
.../roller/weblogger/ui/struts2/core/Login.java | 2 +
.../weblogger/ui/struts2/core/MainMenu.java | 2 +
.../ui/struts2/core/OAuthAuthorize.java | 2 +
.../weblogger/ui/struts2/core/OAuthKeys.java | 2 +
.../weblogger/ui/struts2/core/Profile.java | 2 +
.../weblogger/ui/struts2/core/Register.java | 2 +
.../roller/weblogger/ui/struts2/core/Setup.java | 2 +
.../ui/struts2/editor/BookmarkEdit.java | 2 +
.../weblogger/ui/struts2/editor/Bookmarks.java | 2 +
.../ui/struts2/editor/BookmarksImport.java | 2 +
.../weblogger/ui/struts2/editor/Categories.java | 2 +
.../ui/struts2/editor/CategoryEdit.java | 2 +
.../ui/struts2/editor/CategoryRemove.java | 2 +
.../weblogger/ui/struts2/editor/Comments.java | 2 +
.../weblogger/ui/struts2/editor/Entries.java | 2 +
.../struts2/editor/EntryAddWithMediaFile.java | 2 +
.../weblogger/ui/struts2/editor/EntryEdit.java | 2 +
.../ui/struts2/editor/EntryRemove.java | 2 +
.../weblogger/ui/struts2/editor/FolderEdit.java | 2 +
.../ui/struts2/editor/Maintenance.java | 2 +
.../ui/struts2/editor/MediaFileAdd.java | 2 +
.../ui/struts2/editor/MediaFileEdit.java | 2 +
.../struts2/editor/MediaFileImageChooser.java | 2 +
.../ui/struts2/editor/MediaFileImageDim.java | 2 +
.../ui/struts2/editor/MediaFileView.java | 2 +
.../ui/struts2/editor/MemberResign.java | 2 +
.../weblogger/ui/struts2/editor/Members.java | 2 +
.../ui/struts2/editor/MembersInvite.java | 2 +
.../weblogger/ui/struts2/editor/Pings.java | 2 +
.../ui/struts2/editor/StylesheetEdit.java | 2 +
.../ui/struts2/editor/TemplateEdit.java | 2 +
.../ui/struts2/editor/TemplateRemove.java | 2 +
.../weblogger/ui/struts2/editor/Templates.java | 2 +
.../ui/struts2/editor/TemplatesRemove.java | 2 +
.../weblogger/ui/struts2/editor/ThemeEdit.java | 2 +
.../ui/struts2/editor/WeblogConfig.java | 2 +
.../ui/struts2/editor/WeblogRemove.java | 2 +
.../roller/weblogger/util/PasswordUtility.java | 2 +-
.../roller-version.properties | 5 +
.../resources/ApplicationResources.properties | 2 +
app/src/main/resources/log4j2.xml | 32 ++
.../roller/weblogger/config/roller.properties | 2 +-
.../main/resources/roller-version.properties | 5 -
.../main/resources/sql/510-to-520-migration.vm | 2 +-
app/src/main/resources/struts.xml | 234 ++++++++-----
.../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp | 4 +-
.../webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 12 +-
app/src/main/webapp/WEB-INF/jsps/core/Login.jsp | 2 -
.../main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 2 +-
.../webapp/WEB-INF/jsps/editor/EntrySidebar.jsp | 2 +-
.../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp | 4 +-
.../WEB-INF/jsps/editor/MediaFileEdit.jsp | 23 +-
.../WEB-INF/jsps/editor/MediaFileView.jsp | 2 +-
assembly-release/pom.xml | 4 +-
assembly-release/sign-release.sh | 14 +-
assembly-release/src/main/assembly/source.xml | 18 +-
assembly-release/src/main/assembly/standard.xml | 2 +-
.../groovy/examples/rollerapi/createtestdata.gy | 34 +-
.../scripting/groovy/examples/rollerapi/groovy | 14 +-
.../groovy/examples/rollerapi/listusers.gy | 8 +-
.../examples/rollerapi/roller-custom.properties | 8 +-
docs/roller-install-guide.odt | Bin 1623069 -> 1618019 bytes
docs/roller-template-guide.odt | Bin 245040 -> 238805 bytes
docs/roller-user-guide.odt | Bin 2744390 -> 2740075 bytes
it-selenium/pom.xml | 44 ++-
.../roller/selenium/AbstractRollerPage.java | 29 +-
.../roller/selenium/InitialLoginTestIT.java | 5 +-
.../roller/selenium/core/CreateWeblogPage.java | 4 +-
.../apache/roller/selenium/core/LoginPage.java | 4 +-
.../roller/selenium/core/MainMenuPage.java | 6 +-
.../roller/selenium/core/RegisterPage.java | 13 +-
.../apache/roller/selenium/core/SetupPage.java | 9 +-
.../roller/selenium/core/WelcomePage.java | 5 +-
.../roller/selenium/editor/EntryAddPage.java | 3 +-
.../roller/selenium/editor/EntryEditPage.java | 3 +-
.../roller/selenium/view/BlogHomePage.java | 3 +-
.../selenium/view/SingleBlogEntryPage.java | 2 +-
.../test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 28 +-
98 files changed, 805 insertions(+), 402 deletions(-)
----------------------------------------------------------------------