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:06 UTC
[05/35] roller git commit: [ROL-2113] move to Struts 2.5.x and remove
DMI usage.
http://git-wip-us.apache.org/repos/asf/roller/blob/b3a8128c/app/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml
index abe78ee..bbd435d 100644
--- a/app/src/main/resources/struts.xml
+++ b/app/src/main/resources/struts.xml
@@ -3,10 +3,10 @@
"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
"http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
-
+
<!-- Weblogger default package -->
- <package name="weblogger" namespace="/roller-ui" extends="struts-default" strict-method-invocation="false">
-
+ <package name="weblogger" namespace="/roller-ui" extends="struts-default">
+
<!-- Define Tiles result type -->
<result-types>
<result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
@@ -72,11 +72,16 @@
<!-- use our own interceptor stack which extends the default stack -->
<default-interceptor-ref name="rollerStack"/>
-
<!-- results made available to all actions -->
<global-results>
<result name="access-denied" type="tiles">.denied</result>
</global-results>
+
+ <global-allowed-methods>
+ activate,
+ 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 -->
@@ -103,63 +108,87 @@
<result type="tiles">.Login</result>
</action>
- <action name="register!*" method="{1}"
+ <action name="register"
class="org.apache.roller.weblogger.ui.struts2.core.Register">
<result name="input" type="tiles">.Register</result>
<result name="disabled" type="tiles">.GenericError</result>
<result name="success" type="tiles">.Welcome</result>
</action>
- <action name="profile!*" method="{1}"
+ <action name="profile"
class="org.apache.roller.weblogger.ui.struts2.core.Profile">
<result name="input" type="tiles">.Profile</result>
<result name="cancel" type="redirectAction">menu</result>
<result name="success" type="tiles">.Profile</result>
</action>
- <action name="oauthKeys!*" method="{1}"
+ <action name="oauthKeys"
class="org.apache.roller.weblogger.ui.struts2.core.OAuthKeys">
<result name="success" type="tiles">.OAuthKeys</result>
</action>
- <action name="oauthAuthorize!*" method="{1}"
+ <action name="oauthAuthorize"
class="org.apache.roller.weblogger.ui.struts2.core.OAuthAuthorize">
<result name="success" type="tiles">.OAuthAuthorize</result>
</action>
- <action name="createWeblog!*" method="{1}"
+ <action name="createWeblog"
class="org.apache.roller.weblogger.ui.struts2.core.CreateWeblog">
<result name="input" type="tiles">.CreateWeblog</result>
<result name="disabled" type="tiles">.GenericError</result>
<result name="success" type="chain">menu</result>
</action>
- <action name="menu!*" method="{1}"
+ <action name="menu"
class="org.apache.roller.weblogger.ui.struts2.core.MainMenu">
<result type="tiles">.MainMenu</result>
</action>
-
+
</package>
<!-- Weblogger install/bootstrap actions -->
- <package name="weblogger-install" namespace="/roller-ui/install" extends="weblogger" strict-method-invocation="false">
+ <package name="weblogger-install" namespace="/roller-ui/install" extends="weblogger" >
+
+ <global-allowed-methods>
+ execute,
+ create,
+ update,
+ bootstrap
+ </global-allowed-methods>
+
<action name="install"
class="org.apache.roller.weblogger.ui.struts2.core.Install">
<result name="database_error" type="tiles">.DatabaseError</result>
<result name="create_database" type="tiles">.CreateDatabase</result>
<result name="upgrade_database" type="tiles">.UpgradeDatabase</result>
<result name="bootstrap" type="tiles">.Bootstrap</result>
- <result name="success" type="chain">home</result>
+ <result name="success" type="chain">
+ <param name="actionName">home</param>
+ <param name="namespace">weblogger</param>
+ </result>
</action>
</package>
<!-- Weblogger Admin UI (includes planet) -->
- <package name="weblogger-admin" namespace="/roller-ui/admin" extends="weblogger" strict-method-invocation="false">
-
- <action name="globalConfig!*" method="{1}"
+ <package name="weblogger-admin" namespace="/roller-ui/admin" extends="weblogger" >
+
+ <global-allowed-methods>
+ disable,
+ delete,
+ deleteConfirm,
+ enable,
+ execute,
+ firstSave,
+ save,
+ query,
+ delete,
+ update
+ </global-allowed-methods>
+
+ <action name="globalConfig"
class="org.apache.roller.weblogger.ui.struts2.admin.GlobalConfig">
<result name="success" type="tiles">.GlobalConfig</result>
</action>
@@ -171,7 +200,7 @@
<result name="input" type="tiles">.UserAdmin</result>
</action>
- <action name="createUser!*" method="{1}"
+ <action name="createUser"
class="org.apache.roller.weblogger.ui.struts2.admin.UserEdit">
<param name="actionName">createUser</param>
<param name="pageTitle">userAdmin.title.createNewUser</param>
@@ -182,7 +211,7 @@
</result>
</action>
- <action name="modifyUser!*" method="{1}"
+ <action name="modifyUser"
class="org.apache.roller.weblogger.ui.struts2.admin.UserEdit">
<param name="actionName">modifyUser</param>
<param name="pageTitle">userAdmin.title.editUser</param>
@@ -193,18 +222,18 @@
</result>
</action>
- <action name="globalCommentManagement!*" method="{1}"
+ <action name="globalCommentManagement"
class="org.apache.roller.weblogger.ui.struts2.admin.GlobalCommentManagement">
<result name="list" type="tiles">.GlobalCommentManagement</result>
</action>
- <action name="commonPingTargets!*" method="{1}"
+ <action name="commonPingTargets"
class="org.apache.roller.weblogger.ui.struts2.admin.PingTargets">
<result name="list" type="tiles">.PingTargets</result>
<result name="confirm" type="tiles">.PingTargetConfirm</result>
</action>
- <action name="commonPingTargetAdd!*" method="{1}"
+ <action name="commonPingTargetAdd"
class="org.apache.roller.weblogger.ui.struts2.admin.PingTargetEdit">
<param name="actionName">commonPingTargetAdd</param>
<param name="pageTitle">pingTarget.addTarget</param>
@@ -212,7 +241,7 @@
<result name="success" type="chain">commonPingTargets</result>
</action>
- <action name="commonPingTargetEdit!*" method="{1}"
+ <action name="commonPingTargetEdit"
class="org.apache.roller.weblogger.ui.struts2.admin.PingTargetEdit">
<param name="actionName">commonPingTargetEdit</param>
<param name="pageTitle">pingTarget.editTarget</param>
@@ -221,23 +250,23 @@
<result name="error" type="chain">commonPingTargets</result>
</action>
- <action name="cacheInfo!*" method="{1}"
+ <action name="cacheInfo"
class="org.apache.roller.weblogger.ui.struts2.admin.CacheInfo">
<result name="success" type="tiles">.CacheInfo</result>
</action>
- <action name="planetConfig!*" method="{1}"
+ <action name="planetConfig"
class="org.apache.roller.weblogger.planet.ui.PlanetConfig">
<result name="input" type="tiles">.PlanetConfig</result>
</action>
- <action name="planetSubscriptions!*" method="{1}"
+ <action name="planetSubscriptions"
class="org.apache.roller.weblogger.planet.ui.PlanetSubscriptions">
<result name="list" type="tiles">.PlanetSubscriptions</result>
</action>
- <action name="planetGroups!*" method="{1}"
+ <action name="planetGroups"
class="org.apache.roller.weblogger.planet.ui.PlanetGroups">
<result name="list" type="tiles">.PlanetGroups</result>
</action>
@@ -245,9 +274,34 @@
<!-- Weblogger Authoring UI -->
- <package name="weblogger-authoring" namespace="/roller-ui/authoring" extends="weblogger" strict-method-invocation="false">
+ <package name="weblogger-authoring" namespace="/roller-ui/authoring" extends="weblogger" >
+
+ <global-allowed-methods>
+ add,
+ cancel,
+ execute,
+ delete,
+ deleteConfirm,
+ deleteFolder,
+ deleteSelected,
+ entryAdd,
+ entryEdit,
+ firstSave,
+ folderCreated,
+ includeInGallery,
+ moveSelected,
+ publish,
+ query,
+ remove,
+ revert,
+ save,
+ saveDraft,
+ search,
+ update,
+ view
+ </global-allowed-methods>
- <action name="mediaFileAdd!*" method="{1}"
+ <action name="mediaFileAdd"
class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileAdd">
<result name="input" type="tiles">.MediaFileAdd</result>
<result name="success" type="tiles">.MediaFileAddSuccess</result>
@@ -258,36 +312,36 @@
</result>
</action>
- <action name="mediaFileEdit!*" method="{1}"
+ <action name="mediaFileEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileEdit">
<result name="input" type="tiles">.MediaFileEdit</result>
<result name="success" type="tiles">.MediaFileEditSuccess</result>
</action>
- <action name="mediaFileAddExternalInclude!*" method="{1}"
+ <action name="mediaFileAddExternalInclude"
class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileEdit">
<result name="input" type="tiles">.MediaFileAddExternalInclude</result>
<result name="success" type="tiles">.MediaFileAddExternalInclude</result>
<result name="error" type="tiles">.MediaFileAddExternalInclude</result>
</action>
- <action name="mediaFileView!*" method="{1}"
+ <action name="mediaFileView"
class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileView">
<result name="success" type="tiles">.MediaFileView</result>
<result name="success.json" type="dispatcher">/WEB-INF/jsps/editor/MediaFileViewLight.jsp</result>
</action>
- <action name="mediaFileImageDim!*" method="{1}"
+ <action name="mediaFileImageDim"
class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileImageDim">
<result name="success" type="tiles">.MediaFileImageDimension</result>
</action>
- <action name="entryAddWithMediaFile!*" method="{1}"
+ <action name="entryAddWithMediaFile"
class="org.apache.roller.weblogger.ui.struts2.editor.EntryAddWithMediaFile">
<result name="success" type="chain">entryAdd</result>
</action>
- <action name="entryAdd!*" method="{1}"
+ <action name="entryAdd"
class="org.apache.roller.weblogger.ui.struts2.editor.EntryEdit">
<param name="actionName">entryAdd</param>
<param name="pageTitle">weblogEdit.title.newEntry</param>
@@ -299,24 +353,30 @@
</result>
</action>
- <action name="entryEdit!*" method="{1}"
+ <action name="entryEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.EntryEdit">
<param name="actionName">entryEdit</param>
<param name="pageTitle">weblogEdit.title.editEntry</param>
<result name="input" type="tiles">.EntryEdit</result>
- <result name="error" type="chain">menu</result>
+ <result name="error" type="chain">
+ <param name="actionName">menu</param>
+ <param name="namespace">weblogger</param>
+ </result>
</action>
- <action name="entryRemove!*" method="{1}"
+ <action name="entryRemove"
class="org.apache.roller.weblogger.ui.struts2.editor.EntryRemove">
<param name="actionName">entryRemove</param>
<result name="input" type="tiles">.EntryRemove</result>
- <result name="error" type="chain">menu</result>
+ <result name="error" type="chain">
+ <param name="actionName">menu</param>
+ <param name="namespace">weblogger</param>
+ </result>
<result name="success" type="chain">entryAdd</result>
</action>
<!-- Below activated by Entries.jsp and EntryRemove.jsp, kept separate from
- entryRemove!* above as return pages are different, both in the confirm delete
+ entryRemove above as return pages are different, both in the confirm delete
and cancel delete scenarios.
Note the different actionName parameters. The actionName is used to determine
@@ -325,11 +385,14 @@
to return to the appropriate pages based on the actionName. See Struts2
StaticParametersInterceptor javadoc for more info on static parameters.
-->
- <action name="entryRemoveViaList!*" method="{1}"
+ <action name="entryRemoveViaList"
class="org.apache.roller.weblogger.ui.struts2.editor.EntryRemove">
<param name="actionName">entryRemoveViaList</param>
<result name="input" type="tiles">.EntryRemove</result>
- <result name="error" type="chain">menu</result>
+ <result name="error" type="chain">
+ <param name="actionName">menu</param>
+ <param name="namespace">weblogger</param>
+ </result>
<result name="success" type="chain">entries</result>
</action>
@@ -338,17 +401,17 @@
<result name="list" type="tiles">.Entries</result>
</action>
- <action name="comments!*" method="{1}"
+ <action name="comments"
class="org.apache.roller.weblogger.ui.struts2.editor.Comments">
<result name="list" type="tiles">.Comments</result>
</action>
- <action name="categories!*" method="{1}"
+ <action name="categories"
class="org.apache.roller.weblogger.ui.struts2.editor.Categories">
<result name="list" type="tiles">.Categories</result>
</action>
- <action name="categoryAdd!*" method="{1}"
+ <action name="categoryAdd"
class="org.apache.roller.weblogger.ui.struts2.editor.CategoryEdit">
<param name="actionName">categoryAdd</param>
<param name="pageTitle">categoryForm.add.title</param>
@@ -357,7 +420,7 @@
<result name="error" type="chain">categories</result>
</action>
- <action name="categoryEdit!*" method="{1}"
+ <action name="categoryEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.CategoryEdit">
<param name="actionName">categoryEdit</param>
<param name="pageTitle">categoryForm.edit.title</param>
@@ -369,7 +432,7 @@
</result>
</action>
- <action name="categoryRemove!*" method="{1}"
+ <action name="categoryRemove"
class="org.apache.roller.weblogger.ui.struts2.editor.CategoryRemove">
<result name="input" type="tiles">.CategoryRemove</result>
<result name="cancel" type="redirectAction">
@@ -379,12 +442,12 @@
<result name="success" type="chain">categories</result>
</action>
- <action name="bookmarks!*" method="{1}"
+ <action name="bookmarks"
class="org.apache.roller.weblogger.ui.struts2.editor.Bookmarks">
<result name="list" type="tiles">.Bookmarks</result>
</action>
- <action name="bookmarkAdd!*" method="{1}"
+ <action name="bookmarkAdd"
class="org.apache.roller.weblogger.ui.struts2.editor.BookmarkEdit">
<param name="actionName">bookmarkAdd</param>
<param name="pageTitle">bookmarkForm.add.title</param>
@@ -393,7 +456,7 @@
<result name="error" type="chain">bookmarks</result>
</action>
- <action name="bookmarkEdit!*" method="{1}"
+ <action name="bookmarkEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.BookmarkEdit">
<param name="actionName">bookmarkEdit</param>
<param name="pageTitle">bookmarkForm.edit.title</param>
@@ -407,13 +470,13 @@
<result name="error" type="chain">bookmarkEdit</result>
</action>
- <action name="bookmarksImport!*" method="{1}"
+ <action name="bookmarksImport"
class="org.apache.roller.weblogger.ui.struts2.editor.BookmarksImport">
<result name="input" type="tiles">.BookmarksImport</result>
<result name="success" type="chain">bookmarks</result>
</action>
- <action name="folderAdd!*" method="{1}"
+ <action name="folderAdd"
class="org.apache.roller.weblogger.ui.struts2.editor.FolderEdit">
<param name="actionName">folderAdd</param>
<param name="pageTitle">folderForm.add.title</param>
@@ -427,7 +490,7 @@
<result name="error" type="chain">bookmarks</result>
</action>
- <action name="folderEdit!*" method="{1}"
+ <action name="folderEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.FolderEdit">
<param name="actionName">folderEdit</param>
<param name="pageTitle">folderForm.edit.title</param>
@@ -441,39 +504,42 @@
<result name="error" type="chain">bookmarks</result>
</action>
- <action name="weblogConfig!*" method="{1}"
+ <action name="weblogConfig"
class="org.apache.roller.weblogger.ui.struts2.editor.WeblogConfig">
<result name="input" type="tiles">.WeblogConfig</result>
</action>
- <action name="weblogRemove!*" method="{1}"
+ <action name="weblogRemove"
class="org.apache.roller.weblogger.ui.struts2.editor.WeblogRemove">
<result name="confirm" type="tiles">.WeblogRemoveConfirm</result>
- <result name="success" type="chain">menu</result>
+ <result name="success" type="chain">
+ <param name="actionName">menu</param>
+ <param name="namespace">weblogger</param>
+ </result>
</action>
- <action name="themeEdit!*" method="{1}"
+ <action name="themeEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.ThemeEdit">
<result name="input" type="tiles">.ThemeEdit</result>
</action>
- <action name="stylesheetEdit!*" method="{1}"
+ <action name="stylesheetEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.StylesheetEdit">
<result name="input" type="tiles">.StylesheetEdit</result>
</action>
- <action name="templates!*" method="{1}"
+ <action name="templates"
class="org.apache.roller.weblogger.ui.struts2.editor.Templates">
<result name="list" type="tiles">.Templates</result>
</action>
- <action name="templateEdit!*" method="{1}"
+ <action name="templateEdit"
class="org.apache.roller.weblogger.ui.struts2.editor.TemplateEdit">
<result name="list" type="chain">templates</result>
<result name="input" type="tiles">.TemplateEdit</result>
</action>
- <action name="templateRemove!*" method="{1}"
+ <action name="templateRemove"
class="org.apache.roller.weblogger.ui.struts2.editor.TemplateRemove">
<result name="confirm" type="tiles">.TemplateRemove</result>
<result name="cancel" type="redirectAction">
@@ -483,7 +549,7 @@
<result name="success" type="chain">templates</result>
</action>
- <action name="templatesRemove!*" method="{1}"
+ <action name="templatesRemove"
class="org.apache.roller.weblogger.ui.struts2.editor.TemplatesRemove">
<result name="input" type="tiles">.TemplatesRemove</result>
<result name="confirm" type="tiles">.TemplatesRemove</result>
@@ -495,12 +561,12 @@
<result name="error" type="chain">templates</result>
</action>
- <action name="members!*" method="{1}"
+ <action name="members"
class="org.apache.roller.weblogger.ui.struts2.editor.Members">
<result name="list" type="tiles">.Members</result>
</action>
- <action name="invite!*" method="{1}"
+ <action name="invite"
class="org.apache.roller.weblogger.ui.struts2.editor.MembersInvite">
<result name="input" type="tiles">.MembersInvite</result>
<result name="disabled" type="tiles">.disabled</result>
@@ -511,19 +577,25 @@
</result>
</action>
- <action name="memberResign!*" method="{1}"
+ <action name="memberResign"
class="org.apache.roller.weblogger.ui.struts2.editor.MemberResign">
<result name="input" type="tiles">.MemberResign</result>
- <result name="error" type="chain">menu</result>
- <result name="success" type="chain">menu</result>
+ <result name="error" type="chain">
+ <param name="actionName">menu</param>
+ <param name="namespace">weblogger</param>
+ </result>
+ <result name="success" type="chain">
+ <param name="actionName">menu</param>
+ <param name="namespace">weblogger</param>
+ </result>
</action>
- <action name="pings!*" method="{1}"
+ <action name="pings"
class="org.apache.roller.weblogger.ui.struts2.editor.Pings">
<result name="list" type="tiles">.Pings</result>
</action>
- <action name="maintenance!*" method="{1}"
+ <action name="maintenance"
class="org.apache.roller.weblogger.ui.struts2.editor.Maintenance">
<result name="success" type="tiles">.Maintenance</result>
</action>
@@ -532,9 +604,13 @@
<!-- Weblogger Authoring UI - overlay pages-->
- <package name="weblogger-authoring-overlay" namespace="/roller-ui/authoring/overlay" extends="weblogger-authoring" strict-method-invocation="false">
+ <package name="weblogger-authoring-overlay" namespace="/roller-ui/authoring/overlay" extends="weblogger-authoring" >
+
+ <global-allowed-methods>
+ execute,save,
+ </global-allowed-methods>
- <action name="mediaFileAdd!*" method="{1}"
+ <action name="mediaFileAdd"
class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileAdd">
<param name="overlayMode">true</param>
<result name="input" type="tiles">.MediaFileAddInclude</result>
@@ -542,7 +618,7 @@
<result name="error" type="tiles">.MediaFileAddInclude</result>
</action>
- <action name="mediaFileImageChooser!*" method="{1}"
+ <action name="mediaFileImageChooser"
class="org.apache.roller.weblogger.ui.struts2.editor.MediaFileImageChooser">
<param name="overlayMode">true</param>
<result name="input" type="tiles">.MediaFileImageChooser</result>
http://git-wip-us.apache.org/repos/asf/roller/blob/b3a8128c/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
index 76e83d7..eb565f8 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
@@ -20,7 +20,7 @@
<%-- PROMPT: Welcome... you have no blog --%>
<s:if test="existingPermissions.isEmpty && pendingPermissions.isEmpty">
<p><s:text name="yourWebsites.prompt.noBlog" />
- <a href="<s:url action="createWeblog"/>"><s:text name="yourWebsites.createOne" /></a></p>
+ <a id="createWeblogLink" href="<s:url action="createWeblog"/>"><s:text name="yourWebsites.createOne" /></a></p>
</s:if>
<%-- PROMPT: You have invitation(s) --%>
http://git-wip-us.apache.org/repos/asf/roller/blob/b3a8128c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5334269..1f64534 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -35,6 +52,7 @@
<modules>
<module>app</module>
+ <!-- <module>it-selenium</module> -->
</modules>
<build>