Comment out @AllowedActions annotations because (they're not yet working) and we list allowed actions in struts.xml.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/5a62d705 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/5a62d705 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/5a62d705 Branch: refs/heads/bootstrap-ui Commit: 5a62d7053fad0e968b51d9ac6e8fe65ae88b4a6d Parents: 9a597e2 Author: Dave Johnson <[email protected]> Authored: Sun Oct 15 16:42:09 2017 -0400 Committer: Dave Johnson <[email protected]> Committed: Sun Oct 15 16:42:09 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java | 2 +- .../java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java | 2 +- .../org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java | 2 +- .../roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java | 2 +- .../apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java | 2 +- .../java/org/apache/roller/weblogger/ui/struts2/core/Install.java | 2 +- .../java/org/apache/roller/weblogger/ui/struts2/core/Login.java | 2 +- .../java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java | 2 +- .../apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java | 2 +- .../java/org/apache/roller/weblogger/ui/struts2/core/Profile.java | 2 +- .../java/org/apache/roller/weblogger/ui/struts2/core/Register.java | 2 +- .../java/org/apache/roller/weblogger/ui/struts2/core/Setup.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/Categories.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/Comments.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/Entries.java | 2 +- .../roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java | 2 +- .../roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java | 2 +- .../roller/weblogger/ui/struts2/editor/MediaFileImageDim.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/MediaFileView.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/MemberResign.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/Members.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/MembersInvite.java | 2 +- .../java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/Templates.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java | 2 +- .../org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java | 2 +- .../apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java | 2 +- app/src/main/resources/struts.xml | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java index 02f847e..afa97cf 100644 --- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java +++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java @@ -42,7 +42,7 @@ import org.apache.struts2.interceptor.ParameterAware; * * Handles editing of planet global runtime properties. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class PlanetConfig extends PlanetUIAction implements ParameterAware { private static Log log = LogFactory.getLog(PlanetConfig.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java index 89f35d6..cc06ca9 100644 --- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java +++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java @@ -30,7 +30,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Manage planet groups. */ -@AllowedMethods({"execute","save","delete"}) +// TODO: make this work @AllowedMethods({"execute","save","delete"}) public class PlanetGroups extends PlanetUIAction { private static Log log = LogFactory.getLog(PlanetGroups.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java index 4216bf1..899eaa2 100644 --- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java +++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java @@ -36,7 +36,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Manage planet group subscriptions, default group is "all". */ -@AllowedMethods({"execute","save","delete"}) +// TODO: make this work @AllowedMethods({"execute","save","delete"}) public class PlanetSubscriptions extends PlanetUIAction { private static final Log LOGGER = LogFactory.getLog(PlanetSubscriptions.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java index 83fc3ce..e75f266 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java @@ -30,7 +30,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Action for displaying rendering cache info. */ -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class CacheInfo extends UIAction { // map of stats to display http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java index 53d4def..750a8f1 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java @@ -48,7 +48,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; /** * Action for managing global set of comments. */ -@AllowedMethods({"query","delete","update"}) +// TODO: make this work @AllowedMethods({"query","delete","update"}) public class GlobalCommentManagement extends UIAction implements ServletRequestAware { private static Log log = LogFactory.getLog(GlobalCommentManagement.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java ---------------------------------------------------------------------- diff --git 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 index 39c3a0b..da71a41 100644 --- 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 @@ -47,7 +47,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; /** * 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); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java index f55e58e..1b5d13c 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEdit.java @@ -31,7 +31,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Add or modify a common ping target. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class PingTargetEdit extends UIAction { private static Log log = LogFactory.getLog(PingTargetEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java index e012fa9..fa7529a 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargets.java @@ -34,7 +34,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Admin action for managing global ping targets. */ -@AllowedMethods({"execute","enable","disable","delete","deleteConfirm"}) +// TODO: make this work @AllowedMethods({"execute","enable","disable","delete","deleteConfirm"}) public class PingTargets extends UIAction { private static Log log = LogFactory.getLog(PingTargets.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java index 837c213..63613a5 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java @@ -31,7 +31,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Action which displays user admin search page. */ -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class UserAdmin extends UIAction { public UserAdmin() { http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java index 8c20c88..afdc522 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java @@ -46,7 +46,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Action that allows an admin to modify a users profile. */ -@AllowedMethods({"execute","save","firstSave"}) +// TODO: make this work @AllowedMethods({"execute","save","firstSave"}) public class UserEdit extends UIAction { private static Log log = LogFactory.getLog(UserEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java index 0770fba..8795442 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java @@ -42,7 +42,7 @@ import java.util.List; /** * Allows user to create a new website. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class CreateWeblog extends UIAction { private static Log log = LogFactory.getLog(CreateWeblog.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java index a12af32..e67cc85 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java @@ -38,7 +38,7 @@ import org.springframework.beans.factory.access.BootstrapException; /** * Walk user through install process. */ -@AllowedMethods({"execute","create","update","bootstrap"}) +// TODO: make this work @AllowedMethods({"execute","create","update","bootstrap"}) public class Install extends UIAction { private static Log log = LogFactory.getLog(Install.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java index 2e322fd..f0fbe76 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java @@ -34,7 +34,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; * * @see org.apache.roller.weblogger.ui.struts2.core.Register */ -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class Login extends UIAction { private String error = null; http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java index 95fdef2..9378018 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java @@ -35,7 +35,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Allows user to view and pick from list of his/her websites. */ -@AllowedMethods({"execute","accept","decline"}) +// TODO: make this work @AllowedMethods({"execute","accept","decline"}) public class MainMenu extends UIAction { private static Log log = LogFactory.getLog(MainMenu.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java index 3c261eb..f36e07b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java @@ -30,7 +30,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Allow user to authorized OAuth access to his/her account. */ -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class OAuthAuthorize extends UIAction implements ServletRequestAware { private static Log log = LogFactory.getLog(OAuthAuthorize.class); private String appDesc = null; http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java index d2e9ae8..6b6fa51 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java @@ -33,7 +33,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Allows user to view his/her OAuth consumer key and secret. */ -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class OAuthKeys extends UIAction { private static Log log = LogFactory.getLog(OAuthKeys.class); private OAuthConsumer userConsumer; http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java index 1de249e..37e01d5 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java @@ -35,7 +35,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Allows user to edit his/her profile. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class Profile extends UIAction { private static Log log = LogFactory.getLog(Profile.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java index 259f309..f3b906c 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java @@ -50,7 +50,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; * * @see org.apache.roller.weblogger.ui.struts2.core.Login */ -@AllowedMethods({"execute","save","activate"}) +// TODO: make this work @AllowedMethods({"execute","save","activate"}) public class Register extends UIAction implements ServletRequestAware { private static Log log = LogFactory.getLog(Register.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java index db3340c..0cd64fb 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java @@ -34,7 +34,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Page used to display Roller install instructions. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class Setup extends UIAction { private static final Log LOG = LogFactory.getLog(Setup.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java index 6e2b38f..852ec72 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java @@ -34,7 +34,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Edit a new or existing bookmark (blogroll item). */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class BookmarkEdit extends UIAction { private static Log log = LogFactory.getLog(BookmarkEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java index b0b9dd7..f695072 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java @@ -38,7 +38,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * List bookmarks and folders and allow for moving them around and deleting them. */ -@AllowedMethods({"execute","delete","deleteFolder","move","view","folderCreated"}) +// TODO: make this work @AllowedMethods({"execute","delete","deleteFolder","move","view","folderCreated"}) public class Bookmarks extends UIAction { private static Log log = LogFactory.getLog(Bookmarks.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java index 6718aea..b225cc2 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java @@ -37,7 +37,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Import opml file into bookmarks folder. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public final class BookmarksImport extends UIAction { private static Log log = LogFactory.getLog(BookmarksImport.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java index a0c010b..dd9389f 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java @@ -33,7 +33,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Manage weblog categories. */ -@AllowedMethods({"execute","move"}) +// TODO: make this work @AllowedMethods({"execute","move"}) public class Categories extends UIAction { private static Log log = LogFactory.getLog(Categories.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java index 7b01e5c..9d2c517 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java @@ -37,7 +37,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Edit a new or existing weblog category. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class CategoryEdit extends UIAction { private static Log log = LogFactory.getLog(CategoryEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java index b71108b..206e89b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java @@ -38,7 +38,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Remove a category. */ -@AllowedMethods({"execute","remove","cancel"}) +// TODO: make this work @AllowedMethods({"execute","remove","cancel"}) public class CategoryRemove extends UIAction { private static Log log = LogFactory.getLog(CategoryRemove.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java index 5ff453a..10c663a 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java @@ -52,7 +52,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Action for managing weblog comments. */ -@AllowedMethods({"execute","query","delete","update"}) +// TODO: make this work @AllowedMethods({"execute","query","delete","update"}) public class Comments extends UIAction { private static final long serialVersionUID = -104973988372024709L; http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java index 1b33c9c..9f15e2d 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java @@ -42,7 +42,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * A list view of entries in a weblog. */ -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class Entries extends UIAction { private static Log log = LogFactory.getLog(Entries.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java index a45e482..02a3677 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java @@ -30,7 +30,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; * Prepares creation of a new weblog entry with an embedded pointer to a media file. */ @SuppressWarnings("serial") -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class EntryAddWithMediaFile extends MediaFileBase { private static Log log = LogFactory.getLog(EntryAddWithMediaFile.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java index 3724203..9ffcb2e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java @@ -63,7 +63,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Edit a new or existing entry. */ -@AllowedMethods({"execute","firstSave","saveDraft","publish","entryEdit","entryAdd"}) +// TODO: make this work @AllowedMethods({"execute","firstSave","saveDraft","publish","entryEdit","entryAdd"}) public final class EntryEdit extends UIAction { private static Log log = LogFactory.getLog(EntryEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java index 0ad06fa..64266ed 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java @@ -36,7 +36,7 @@ import java.util.List; /** * Remove a weblog entry. */ -@AllowedMethods({"execute","remove"}) +// TODO: make this work @AllowedMethods({"execute","remove"}) public class EntryRemove extends UIAction { private static Log log = LogFactory.getLog(EntryRemove.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java ---------------------------------------------------------------------- diff --git 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 index b2a8084..141c1c2 100644 --- 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 @@ -34,7 +34,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Edit a new or existing folder. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class FolderEdit extends UIAction { private static Log log = LogFactory.getLog(FolderEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java index 110534e..8b57dd9 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java @@ -34,7 +34,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; * Allows user to perform maintenance operations such as flushing the page cache * or re-indexing the search index. */ -@AllowedMethods({"execute","index","flushCache","reset"}) +// TODO: make this work @AllowedMethods({"execute","index","flushCache","reset"}) public class Maintenance extends UIAction { private static Log log = LogFactory.getLog(Maintenance.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java index ccb575e..dc75df8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java @@ -43,7 +43,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; * Adds a new media file. */ @SuppressWarnings("serial") -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class MediaFileAdd extends MediaFileBase { private static Log log = LogFactory.getLog(MediaFileAdd.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java index b273513..f6045d4 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java @@ -36,7 +36,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; * Edits metadata for a media file. */ @SuppressWarnings("serial") -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class MediaFileEdit extends MediaFileBase { private static Log log = LogFactory.getLog(MediaFileEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java index fb82257..4e90654 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java @@ -40,7 +40,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; * Browse media files action. */ @SuppressWarnings("serial") -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class MediaFileImageChooser extends MediaFileBase { private static Log log = LogFactory.getLog(MediaFileImageChooser.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java index 2451050..df5d2e7 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java @@ -30,7 +30,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; * Action class for choosing image dimensions. */ @SuppressWarnings("serial") -@AllowedMethods({"execute"}) +// TODO: make this work @AllowedMethods({"execute"}) public class MediaFileImageDim extends MediaFileBase { private static Log log = LogFactory.getLog(MediaFileImageDim.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java index 88be6cb..62644c0 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java @@ -44,7 +44,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; * View media files. */ @SuppressWarnings("serial") -@AllowedMethods({"execute","view","search","delete","deleteSelected","deleteFolder","includeInGallery","moveSelected"}) +// TODO: make this work @AllowedMethods({"execute","view","search","delete","deleteSelected","deleteFolder","includeInGallery","moveSelected"}) public class MediaFileView extends MediaFileBase { private static Log log = LogFactory.getLog(MediaFileView.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java index 4c8bbba..9f01f31 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java @@ -32,7 +32,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Action for resigning from a weblog. */ -@AllowedMethods({"execute","resign"}) +// TODO: make this work @AllowedMethods({"execute","resign"}) public class MemberResign extends UIAction { private static Log log = LogFactory.getLog(MemberResign.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java index 93e4b10..ee89d9a 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java @@ -41,7 +41,7 @@ import org.apache.struts2.interceptor.ParameterAware; * TODO: fix bug in UserManager which doesn't remove permissions from the * website.permissions collection when a permission is deleted. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class Members extends UIAction implements ParameterAware { private static Log log = LogFactory.getLog(Members.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java index 5efbb4e..46104b8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java @@ -38,7 +38,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; * * TODO: handle 'disabled' result */ -@AllowedMethods({"execute","save","cancel"}) +// TODO: make this work @AllowedMethods({"execute","save","cancel"}) public class MembersInvite extends UIAction { private static Log log = LogFactory.getLog(MembersInvite.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java index 6623725..737a649 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java @@ -44,7 +44,7 @@ import org.apache.roller.weblogger.ui.struts2.util.UIAction; /** * Actions for setting up automatic ping configuration for a weblog. */ -@AllowedMethods({"execute","enable","disable","pingNow"}) +// TODO: make this work @AllowedMethods({"execute","enable","disable","pingNow"}) public class Pings extends UIAction { private static Log log = LogFactory.getLog(Pings.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java index af920b1..a206b05 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java @@ -42,7 +42,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Action which handles editing for a weblog stylesheet override template. */ -@AllowedMethods({"execute","move","delete","revert"}) +// TODO: make this work @AllowedMethods({"execute","move","delete","revert"}) public class StylesheetEdit extends UIAction { private static final long serialVersionUID = 4657591015852311907L; http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java index 1863bd2..19d34ff 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java @@ -38,7 +38,7 @@ import java.util.Map; /** * Action which handles editing for a single WeblogTemplate. */ -@AllowedMethods({"execute","move"}) +// TODO: make this work @AllowedMethods({"execute","move"}) public class TemplateEdit extends UIAction { private static Log log = LogFactory.getLog(TemplateEdit.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java index f62f6c3..4f9a82b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java @@ -34,7 +34,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Remove a template. */ -@AllowedMethods({"execute","remove","cancel"}) +// TODO: make this work @AllowedMethods({"execute","remove","cancel"}) public class TemplateRemove extends UIAction { private static Log log = LogFactory.getLog(TemplateRemove.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java index 27de33f..4793e11 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java @@ -43,7 +43,7 @@ import java.util.Map; /** * Templates listing page. */ -@AllowedMethods({"execute","add"}) +// TODO: make this work @AllowedMethods({"execute","add"}) public class Templates extends UIAction { private static Log log = LogFactory.getLog(Templates.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java index a1ef952..7fd3e26 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java @@ -37,7 +37,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Remove templates. */ -@AllowedMethods({"execute","remove","cancel"}) +// TODO: make this work @AllowedMethods({"execute","remove","cancel"}) public class TemplatesRemove extends UIAction { private static final long serialVersionUID = 895186156151331087L; http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java index 330cb8b..c603fdb 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java @@ -42,7 +42,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Action for controlling theme selection. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class ThemeEdit extends UIAction { private static final long serialVersionUID = 4644653507344432426L; http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java index 335ef17..bcc9f57 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java @@ -43,7 +43,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; /** * Action for modifying weblog configuration. */ -@AllowedMethods({"execute","save"}) +// TODO: make this work @AllowedMethods({"execute","save"}) public class WeblogConfig extends UIAction { private static Log log = LogFactory.getLog(WeblogConfig.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java index 829f4dd..b41a9ca 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java @@ -29,7 +29,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; /** * Action for removing a weblog. */ -@AllowedMethods({"execute","remove"}) +// TODO: make this work @AllowedMethods({"execute","remove"}) public class WeblogRemove extends UIAction { private static Log log = LogFactory.getLog(WeblogRemove.class); http://git-wip-us.apache.org/repos/asf/roller/blob/5a62d705/app/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml index a7c9f54..7732de9 100644 --- a/app/src/main/resources/struts.xml +++ b/app/src/main/resources/struts.xml @@ -83,7 +83,7 @@ decline, execute </global-allowed-methods> - + <!-- Simple actions which basically just replace the global-forwards from the old struts 1 config. this is the only way to do it in struts 2 --> <action name="home">
