[ROL-2111] Upgrade to Struts 2.5.10.1.
diff --git a/app/pom.xml b/app/pom.xml
index ef4bad1..eec883a 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -252,13 +252,13 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>2.3.16.3</version>
+ <version>2.5.10.1</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
- <version>2.3.16.3</version>
+ <version>2.5.10.1</version>
</dependency>
<dependency>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
index b9cdae3..6344232 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
@@ -20,14 +20,14 @@
<p class="subtitle"><s:text name="cacheInfo.subtitle" />
<p><s:text name="cacheInfo.prompt" />
-<s:iterator id="cache" value="stats">
+<s:iterator var="cache" value="stats">
<s:if test="#cache != null && !#cache.value.isEmpty">
<table cellspacing="3" border="1">
<tr>
<th colspan="2"><s:property value="#cache.key"/></th>
</tr>
- <s:iterator id="prop" value="#cache.value">
+ <s:iterator var="prop" value="#cache.value">
<tr>
<td><s:property value="#prop.key"/></td>
<td><s:property value="#prop.value"/></td>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
index 6856b6b..7ec9c39 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
@@ -25,13 +25,13 @@
<table class="formtableNoDesc">
- <s:iterator id="dg" value="globalConfigDef.displayGroups">
+ <s:iterator var="dg" value="globalConfigDef.displayGroups">
<tr>
<td colspan="3"><h2><s:text name="%{#dg.key}" /></h2></td>
</tr>
- <s:iterator id="pd" value="#dg.propertyDefs">
+ <s:iterator var="pd" value="#dg.propertyDefs">
<tr>
<td class="label"><s:text name="%{#pd.key}" /></td>
@@ -48,7 +48,7 @@
<select name='<s:property value="#pd.name"/>'>
<option value=''>
<s:text name="configForm.none" />
- </option> <s:iterator id="weblog" value="weblogs">
+ </option> <s:iterator var="weblog" value="weblogs">
<option value='<s:property value="#weblog.handle"/>'
<s:if test='properties[#pd.name].value == #weblog.handle'>selected='true'</s:if> >
<s:property value="#weblog.name"/>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp
index e67225e..94c20f6 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/PingTargets.jsp
@@ -35,7 +35,7 @@
</tr>
<%-- Listing of current common targets --%>
-<s:iterator id="pingTarget" value="pingTargets" status="rowstatus">
+<s:iterator var="pingTarget" value="pingTargets" status="rowstatus">
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
index cf42e44..c9a6607 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
@@ -27,13 +27,13 @@
<table class="formtableNoDesc">
- <s:iterator id="dg" value="globalConfigDef.displayGroups">
+ <s:iterator var="dg" value="globalConfigDef.displayGroups">
<tr>
<td colspan="3"><h2><s:text name="%{#dg.key}" /></h2></td>
</tr>
- <s:iterator id="pd" value="#dg.propertyDefs">
+ <s:iterator var="pd" value="#dg.propertyDefs">
<tr>
<td class="label"><s:text name="%{#pd.key}" /></td>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
index d6107ac..420cbd0 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
@@ -88,7 +88,7 @@
</th>
</tr>
-<s:iterator id="group" value="groups" status="rowstatus">
+<s:iterator var="group" value="groups" status="rowstatus">
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
index a16e54e..32b9e41 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
@@ -72,7 +72,7 @@
<s:text name="generic.delete" />
</th>
</tr>
- <s:iterator id="sub" value="subscriptions" status="rowstatus">
+ <s:iterator var="sub" value="subscriptions" status="rowstatus">
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
</s:if>
@@ -85,7 +85,7 @@
</td>
<td class="rollertable">
- <s:set name="feedURL" value="#sub.feedURL" />
+ <s:set var="feedURL" value="#sub.feedURL" />
${fn:substring(feedURL, 0, 100)}
</td>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
index 1e8ec2a..f822594 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
@@ -43,7 +43,7 @@
<s:if test="authMethod != 'LDAP'">
<p class="subtitle"><s:text name="userAdmin.subtitle.userCreation" /></p>
<s:text name="userAdmin.prompt.orYouCan" />
- <s:url action="createUser" id="createUser" />
+ <s:url action="createUser" var="createUser" />
<a href="<s:property value="createUser" />">
<s:text name="userAdmin.prompt.createANewUser" />
</a>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
index cc5b1eb..79b08ef 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
@@ -148,7 +148,7 @@
<s:if test="permissions != null && !permissions.isEmpty() > 0">
<p><s:text name="userAdmin.userMemberOf" />:</p>
<table class="rollertable" style="width: 80%">
- <s:iterator id="perms" value="permissions">
+ <s:iterator var="perms" value="permissions">
<tr>
<td width="%30">
<a href='<s:property value="#perms.weblog.absoluteURL" />'>
@@ -156,7 +156,7 @@
</a>
</td>
<td width="%15">
- <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry">
+ <s:url action="entryAdd" namespace="/roller-ui/authoring" var="newEntry">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/page_white_edit.png"/>' />
@@ -164,7 +164,7 @@
<s:text name="userAdmin.newEntry" /></a>
</td>
<td width="%15">
- <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries">
+ <s:url action="entries" namespace="/roller-ui/authoring" var="editEntries">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/page_white_edit.png"/>' />
@@ -172,7 +172,7 @@
<s:text name="userAdmin.editEntries" /></a>
</td>
<td width="%15">
- <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
+ <s:url action="weblogConfig" namespace="/roller-ui/authoring" var="manageWeblog">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/page_white_edit.png"/>' />
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp b/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
index bf9914d..738e0ba 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
@@ -34,6 +34,8 @@
}
%>
+<p>L'utilisateur a été invité avec succés</p>
+
<s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
<p><s:text name="loginPage.openIdPrompt" /></p>
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 6b10819..76e83d7 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
@@ -27,19 +27,19 @@
<s:elseif test="! pendingPermissions.isEmpty">
<p><s:text name="yourWebsites.invitationsPrompt" /></p>
- <s:iterator id="invite" value="pendingPermissions">
+ <s:iterator var="invite" value="pendingPermissions">
<s:text name="yourWebsites.youAreInvited" >
<s:param value="#invite.weblog.handle" />
</s:text>
- <s:url action="menu!accept" id="acceptInvite">
+ <s:url action="menu!accept" var="acceptInvite">
<s:param name="inviteId" value="#invite.weblog.id" />
</s:url>
<a href='<s:property value="acceptInvite" />'>
<s:text name="yourWebsites.accept" />
</a>
|
- <s:url action="menu!decline" id="declineInvite">
+ <s:url action="menu!decline" var="declineInvite">
<s:param name="inviteId" value="#invite.weblog.id" />
</s:url>
<a href='<s:property value="declineInvite" />'>
@@ -57,7 +57,7 @@
<%-- if we have weblogs, then loop through and list them --%>
<s:if test="! existingPermissions.isEmpty">
- <s:iterator id="perms" value="existingPermissions">
+ <s:iterator var="perms" value="existingPermissions">
<div class="yourWeblogBox">
@@ -85,7 +85,7 @@
<tr>
<td class="mm_subtable_label"><s:text name='generic.description' /></td>
- <td><s:property value="#perms.weblog.about" escape="false" /></td>
+ <td><s:property value="#perms.weblog.about" escapeHtml="false" /></td>
</tr>
<tr>
@@ -104,7 +104,7 @@
<td class="mm_table_actions" width="20%" align="left" >
- <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry">
+ <s:url action="entryAdd" namespace="/roller-ui/authoring" var="newEntry">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/table_edit.png"/>' />
@@ -113,7 +113,7 @@
<%-- Show Entries link with count for users above LIMITED permission --%>
<s:if test='!(#perms.hasAction("edit_draft"))'>
- <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries">
+ <s:url action="entries" namespace="/roller-ui/authoring" var="editEntries">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/table_multiple.png"/>' />
@@ -123,7 +123,7 @@
<%-- Show Comments link with count for users above LIMITED permission --%>
<s:if test='!(#perms.hasAction("edit_draft"))'>
- <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments">
+ <s:url action="comments" namespace="/roller-ui/authoring" var="manageComments">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/page_white_edit.png"/>' />
@@ -137,12 +137,12 @@
<%-- And only show theme option if custom themes are enabled --%>
<s:if test="getProp('themes.customtheme.allowed')">
<s:if test="#perms.weblog.editorTheme == 'custom'">
- <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:url action="templates" namespace="/roller-ui/authoring" var="weblogTheme">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
</s:if>
<s:else>
- <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:url action="themeEdit" namespace="/roller-ui/authoring" var="weblogTheme">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
</s:else>
@@ -152,7 +152,7 @@
<br />
</s:if>
- <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
+ <s:url action="weblogConfig" namespace="/roller-ui/authoring" var="manageWeblog">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<img src='<s:url value="/images/cog.png"/>' />
@@ -164,7 +164,7 @@
<%-- don't allow last admin to resign from blog --%>
<s:if test='!(#perms.hasAction("admin") && #perms.weblog.adminUserCount == 1)'>
<img src='<c:url value="/images/delete.png"/>' />
- <s:url action="memberResign" namespace="/roller-ui/authoring" id="resignWeblog">
+ <s:url action="memberResign" namespace="/roller-ui/authoring" var="resignWeblog">
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
<a href='<s:property value="resignWeblog" />'>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index a16e2ca..c275381 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -98,7 +98,7 @@
<s:if test="folder.bookmarks.size > 0">
<%-- Bookmarks --%>
- <s:iterator id="bookmark" value="folder.bookmarks" status="rowstatus">
+ <s:iterator var="bookmark" value="folder.bookmarks" status="rowstatus">
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
index 2c56a93..ed9c43f 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
@@ -58,7 +58,7 @@
<s:if test="AllCategories != null && !AllCategories.isEmpty">
<%-- Categories --%>
- <s:iterator id="category" value="AllCategories" status="rowstatus">
+ <s:iterator var="category" value="AllCategories" status="rowstatus">
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
index 41543cb..929d72e 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
@@ -250,7 +250,7 @@
<%-- Loop through comments --%>
<%-- ========================================================= --%>
- <s:iterator id="comment" value="pager.items" status="rowstatus">
+ <s:iterator var="comment" value="pager.items" status="rowstatus">
<tr>
<s:if test="actionName == 'comments'">
<td>
@@ -333,7 +333,7 @@
<s:if test="#comment.content.length() > 1000">
<div class="bot" id="comment-<s:property value="#comment.id"/>">
<str:truncateNicely upper="1000" appendToEnd="...">
- <s:property value="#comment.content" escape="true" />
+ <s:property value="#comment.content" escapeHtml="true" />
</str:truncateNicely>
</div>
<div id="link-<s:property value="#comment.id"/>">
@@ -341,7 +341,7 @@
</div>
</s:if>
<s:else>
- <span width="200px" id="comment-<s:property value="#comment.id"/>"><s:property value="#comment.content" escape="true" /></span>
+ <span width="200px" id="comment-<s:property value="#comment.id"/>"><s:property value="#comment.content" escapeHtml="true" /></span>
</s:else>
</div>
<s:if test="actionName == 'comments'">
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
index 2aa9d38..eac0689 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
@@ -129,7 +129,7 @@
</th>
</tr>
-<s:iterator id="post" value="pager.items">
+<s:iterator var="post" value="pager.items">
<%-- <td> with style if comment is spam or pending --%>
<s:if test="#post.status.name() == 'DRAFT'">
<tr class="draftentry">
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
index 45c5224..7d00385 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
@@ -280,7 +280,7 @@
<s:param name="weblog" value="actionWeblog.handle" />
<s:param name="removeId" value="%{entry.id}" />
</s:url>
- <input type="button" value="<s:text name='weblogEdit.deleteEntry'/>" onclick="window.location='<s:property value="removeUrl" escape="false" />'" />
+ <input type="button" value="<s:text name='weblogEdit.deleteEntry'/>" onclick="window.location='<s:property value="removeUrl" escapeHtml="false" />'" />
</span>
</s:if>
</div>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
index 39b7428..58649a7 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
@@ -42,11 +42,11 @@
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.pendingEntries" /></h3>
- <s:set name="pendingEntries" value="recentPendingEntries" />
+ <s:set var="pendingEntries" value="recentPendingEntries" />
<s:if test="#pendingEntries.isEmpty">
<span><s:text name="generic.none" /></span>
</s:if>
- <s:iterator id="post" value="#pendingEntries">
+ <s:iterator var="post" value="#pendingEntries">
<span class="entryEditSidebarLink">
<s:url var="editUrl" action="entryEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
@@ -62,11 +62,11 @@
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.draftEntries" /></h3>
- <s:set name="draftEntries" value="recentDraftEntries" />
+ <s:set var="draftEntries" value="recentDraftEntries" />
<s:if test="#draftEntries.isEmpty">
<span><s:text name="generic.none" /></span>
</s:if>
- <s:iterator id="post" value="#draftEntries">
+ <s:iterator var="post" value="#draftEntries">
<span class="entryEditSidebarLink">
<s:url var="editUrl" action="entryEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
@@ -84,11 +84,11 @@
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.publishedEntries" /></h3>
- <s:set name="pubEntries" value="recentPublishedEntries" />
+ <s:set var="pubEntries" value="recentPublishedEntries" />
<s:if test="#pubEntries.isEmpty">
<span><s:text name="generic.none" /></span>
</s:if>
- <s:iterator id="post" value="#pubEntries">
+ <s:iterator var="post" value="#pubEntries">
<span class="entryEditSidebarLink">
<s:url var="editUrl" action="entryEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
@@ -104,11 +104,11 @@
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.scheduledEntries" /></h3>
- <s:set name="schedEntries" value="recentScheduledEntries" />
+ <s:set var="schedEntries" value="recentScheduledEntries" />
<s:if test="#schedEntries.isEmpty">
<span><s:text name="generic.none" /></span>
</s:if>
- <s:iterator id="post" value="#schedEntries">
+ <s:iterator var="post" value="#schedEntries">
<span class="entryEditSidebarLink">
<s:url var="editUrl" action="entryEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
index 0cd7914..af0bbd6 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
@@ -67,7 +67,7 @@
<p class="subtitle">
<s:text name="mediaFileView.folderName"/> /
- <s:iterator id="directory" value="currentDirectoryHierarchy">
+ <s:iterator var="directory" value="currentDirectoryHierarchy">
<s:url var="getDirectoryByPathUrl" action="mediaFileImageChooser">
<s:param name="directoryName" value="#directory.key" />
<s:param name="weblog" value="%{actionWeblog.handle}" />
@@ -117,7 +117,7 @@
<%-- List media directories first --%>
- <s:iterator id="directory" value="allDirectories">
+ <s:iterator var="directory" value="allDirectories">
<li class="align-images"
onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
<div class="mediaObject">
@@ -136,7 +136,7 @@
<%-- List media files next --%>
<s:if test="childFiles.size() > 0">
- <s:iterator id="mediaFile" value="childFiles">
+ <s:iterator var="mediaFile" value="childFiles">
<li class="align-images"
onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
index 6375d81..f80a084 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
@@ -32,7 +32,7 @@
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="directoryName" value="%{directoryName}" />
</s:url>
- <a href='<s:property escape="false" value="%{mediaFileAddURL}" />'
+ <a href='<s:property escapeHtml="false" value="%{mediaFileAddURL}" />'
<s:if test="actionName.equals('mediaFileAdd')">style='font-weight:bold;'</s:if> >
<s:text name="mediaFileSidebar.add" />
</a>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
index 4c784ea..eb90e11 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
@@ -273,7 +273,7 @@
<%-- List media files --%>
- <s:iterator id="mediaFile" value="childFiles">
+ <s:iterator var="mediaFile" value="childFiles">
<li class="align-images"
onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
@@ -323,7 +323,7 @@
<%-- SEARCH RESULTS --%>
- <s:iterator id="mediaFile" value="pager.items">
+ <s:iterator var="mediaFile" value="pager.items">
<li class="align-images"
onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileViewLight.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileViewLight.jsp
index d46a30a..7c5b42b 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileViewLight.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileViewLight.jsp
@@ -2,10 +2,10 @@
{
"Result":
[
- <s:iterator id="directory" value="childDirectories" status="dirStatus">
+ <s:iterator var="directory" value="childDirectories" status="dirStatus">
{"label":"<s:property value="#directory.name" />","key":"<s:property value="#directory.id" />","type":"dir"}<s:if test="(!#dirStatus.last) || (#dirStatus.last && childFiles.size() > 0)">,</s:if>
</s:iterator>
- <s:iterator id="mediaFile" value="childFiles" status="fileStatus">
+ <s:iterator var="mediaFile" value="childFiles" status="fileStatus">
{"label":"<s:property value="#mediaFile.name" />","key":"<s:property value="#mediaFile.id" />","type":"file"}<s:if test="!#fileStatus.last">,</s:if>
</s:iterator>
]
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
index d5f758a..c444634 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
@@ -68,7 +68,7 @@
<s:text name="memberPermissions.remove" />
</th>
</tr>
- <s:iterator id="perm" value="weblogPermissions" status="rowstatus">
+ <s:iterator var="perm" value="weblogPermissions" status="rowstatus">
<s:if test="#perm.pending">
<tr class="rollertable_pending">
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
index 7a3c77a..4e36873 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
@@ -27,7 +27,7 @@
<hr size="1" noshade="noshade" />
<img src='<s:url value="/images/email_edit.png"/>' alt="mail-icon" align="bottom" />
- <s:url action="invite" id="inviteUrl">
+ <s:url action="invite" var="inviteUrl">
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
<a href='<s:property value="#inviteUrl" />'>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
index 67f0bdd..0dd6994 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
@@ -44,7 +44,7 @@
</tr>
<%-- Table of current common targets with actions --%>
-<s:iterator id="pingTarget" value="commonPingTargets" status="rowstatus">
+<s:iterator var="pingTarget" value="commonPingTargets" status="rowstatus">
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
index d0b4571..4d699fd 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
@@ -46,7 +46,7 @@
<th width="10"><s:text name="pagesForm.remove" /></th>
<th width="5"><input type="checkbox" onclick="toggleFunction(this.checked,'idSelections');"/></th>
</tr>
- <s:iterator id="p" value="templates" status="rowstatus">
+ <s:iterator var="p" value="templates" status="rowstatus">
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
</s:if>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
index 9edfaac..febeb95 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp
@@ -35,7 +35,7 @@
<s:hidden name="ids" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
- <s:iterator id="p" value="templates" status="rowstatus">
+ <s:iterator var="p" value="templates" status="rowstatus">
<p>
<s:text name="pageRemove.pageId" /> = [<s:property value="#p.id" />]
<s:text name="pageRemove.pageName" /> = [<s:property value="#p.name" />]
diff --git a/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp b/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
index fbef230..2520111 100644
--- a/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
@@ -15,8 +15,10 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
--%>
-<% response.setContentType("text/html; charset=UTF-8"); %>
-<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<meta charset="UTF-8">
+<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
+<% response.setContentType("text/html;charset=UTF-8"); %>
+<%@ page language="java" contentType="text/html;charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
index 3928e07..d75f34f 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
@@ -17,14 +17,14 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<s:set name="tabMenu" value="menu"/>
+<s:set var="tabMenu" value="menu"/>
<s:if test="#tabMenu != null">
<table class="menuTabTable" cellspacing="0" >
<tr>
-<s:iterator id="tab" value="#tabMenu.tabs" >
+<s:iterator var="tab" value="#tabMenu.tabs" >
<s:if test="#tab.selected">
- <s:set name="selectedTab" value="#tab" />
+ <s:set var="selectedTab" value="#tab" />
<td class="menuTabSelected">
</s:if>
<s:else>
@@ -44,7 +44,7 @@
<table class="menuItemTable" cellspacing="0" >
<tr>
<td class="padleft">
- <s:iterator id="tabItem" value="#selectedTab.items" status="stat">
+ <s:iterator var="tabItem" value="#selectedTab.items" status="stat">
<s:if test="!#stat.first">|</s:if>
<s:if test="#tabItem.selected">
<a class="menuItemSelected" href="<s:url action="%{#tabItem.action}"><s:param name="weblog" value="actionWeblog.handle"/></s:url>"><s:text name="%{#tabItem.key}" /></a>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
index 5e54d5c..f881191 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
@@ -28,12 +28,12 @@
<s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
<div id="errors" class="errors">
<ul>
- <s:iterator id="actionError" value="actionErrors">
- <li><s:property value="#actionError" escape="false" /></li>
+ <s:iterator var="actionError" value="actionErrors">
+ <li><s:property value="#actionError" escapeHtml="false" /></li>
</s:iterator>
- <s:iterator id="fieldErrorName" value="fieldErrors.keySet()">
- <s:iterator id="fieldErrorValue" value="fieldErrors[#fieldErrorName]">
- <li><s:property value="#fieldErrorValue" escape="false" /></li>
+ <s:iterator var="fieldErrorName" value="fieldErrors.keySet()">
+ <s:iterator var="fieldErrorValue" value="fieldErrors[#fieldErrorName]">
+ <li><s:property value="#fieldErrorValue" escapeHtml="false" /></li>
</s:iterator>
</s:iterator>
</ul>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
index 0c9b148..1299132 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<!doctype html>
+<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
diff --git a/app/src/main/webapp/WEB-INF/web.xml b/app/src/main/webapp/WEB-INF/web.xml
index bd61a6d..c4fc2b3 100644
--- a/app/src/main/webapp/WEB-INF/web.xml
+++ b/app/src/main/webapp/WEB-INF/web.xml
@@ -18,7 +18,7 @@
<filter>
<filter-name>struts2</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
</filter>
<filter>
