Merge branch 'roller-5.2.0' into bootstrap-ui # Conflicts: # app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/312f0f72 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/312f0f72 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/312f0f72 Branch: refs/heads/bootstrap-ui Commit: 312f0f7273f82fb02e53c9ec905c13774bb9c6ec Parents: 129af05 8a46131 Author: Dave Johnson <[email protected]> Authored: Sat Oct 21 18:13:12 2017 -0400 Committer: Dave Johnson <[email protected]> Committed: Sat Oct 21 18:13:12 2017 -0400 ---------------------------------------------------------------------- app/pom.xml | 19 ++++---- .../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-version.properties | 5 ++ .../resources/ApplicationResources.properties | 2 + app/src/main/resources/log4j2.xml | 2 +- .../main/resources/roller-version.properties | 5 -- app/src/main/resources/struts.xml | 13 ++++-- .../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp | 4 +- .../WEB-INF/jsps/editor/MediaFileView.jsp | 2 +- assembly-release/sign-release.sh | 10 ++-- assembly-release/src/main/assembly/source.xml | 18 +++++--- 61 files changed, 148 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java ---------------------------------------------------------------------- diff --cc app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java index b730b2d,da71a41..010601a --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java @@@ -46,23 -47,23 +46,23 @@@ import org.apache.struts2.interceptor.S /** * Action which handles editing of global configuration. */ - @AllowedMethods({"execute","save"}) + // TODO: make this work @AllowedMethods({"execute","save"}) public class GlobalConfig extends UIAction implements ParameterAware, ServletRequestAware { - + private static Log log = LogFactory.getLog(GlobalConfig.class); - + // the request parameters private Map<String, String[]> params = Collections.emptyMap(); - + // map of config properties private Map<String, RuntimeConfigProperty> properties = Collections.emptyMap(); - + // the runtime config def used to populate the display private ConfigDef globalConfigDef = null; - + // list of comment plugins private List<WeblogEntryCommentPlugin> pluginsList = Collections.emptyList(); - + // comment plugins that are enabled. this is what the html form submits to private String[] commentPlugins = new String[0]; http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java ---------------------------------------------------------------------- diff --cc app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java index d947e49,141c1c2..8e0da96 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java @@@ -37,9 -34,9 +37,9 @@@ import javax.servlet.http.HttpServletRe /** * Edit a new or existing folder. */ - @AllowedMethods({"execute","save"}) + // TODO: make this work @AllowedMethods({"execute","save"}) -public class FolderEdit extends UIAction { - +public class FolderEdit extends UIAction implements ServletResponseAware { + private static Log log = LogFactory.getLog(FolderEdit.class); // bean for managing form data http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/resources/ApplicationResources.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/resources/struts.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/312f0f72/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp ----------------------------------------------------------------------
