This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 0eae94bf49e2559bd4134832a68d470085815b50 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Tue Dec 13 22:00:03 2016 +0100 refs #1308: Update struts to 2.5.5 --- pollen-services/pom.xml | 5 ++-- pollen-ui-struts2/pom.xml | 5 ---- .../interceptors/PollenFileUploadInterceptor.java | 2 +- .../results/PollenServletActionRedirectResult.java | 2 +- .../org/chorem/pollen/ui/results/package-info.java | 4 +-- pollen-ui-struts2/src/main/resources/struts.xml | 11 ++++---- .../main/webapp/WEB-INF/jsp/admin/pollsList.jsp | 2 +- .../main/webapp/WEB-INF/jsp/admin/usersList.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 22 ++++++++-------- .../webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 8 +++--- .../webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 12 ++++----- .../WEB-INF/jsp/poll/displayPersonToList.jsp | 10 ++++---- .../WEB-INF/jsp/poll/displayPollComments.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 8 +++--- .../webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 20 +++++++-------- .../WEB-INF/jsp/poll/displayVotingListPersons.jsp | 12 ++++----- .../WEB-INF/jsp/poll/personListToVotingList.jsp | 6 ++--- .../src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp | 10 ++++---- .../src/main/webapp/WEB-INF/jsp/poll/result.jsp | 12 ++++----- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 20 +++++++-------- .../src/main/webapp/WEB-INF/jsp/pollListHelper.jsp | 30 +++++++++++----------- .../main/webapp/WEB-INF/jsp/user/createdList.jsp | 2 +- .../main/webapp/WEB-INF/jsp/user/favoriteList.jsp | 6 ++--- .../main/webapp/WEB-INF/jsp/user/favoriteLists.jsp | 4 +-- .../main/webapp/WEB-INF/jsp/user/invitedList.jsp | 2 +- .../webapp/WEB-INF/jsp/user/participatedList.jsp | 2 +- pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml | 12 +++------ pom.xml | 14 +--------- 28 files changed, 112 insertions(+), 135 deletions(-) diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index d95234f..e27a93f 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -29,9 +29,10 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 3a0c8e2..85893b2 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -111,11 +111,6 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> - - <dependency> <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java index 6e5270e..30b2cfa 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.interceptors; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.ValidationAware; +import com.opensymphony.xwork2.interceptor.ValidationAware; import com.opensymphony.xwork2.util.LocalizedTextUtil; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java index 294ca50..dafe6ec 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java @@ -51,9 +51,9 @@ import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.Dispatcher; -import org.apache.struts2.dispatcher.ServletActionRedirectResult; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; +import org.apache.struts2.result.ServletActionRedirectResult; import org.apache.struts2.views.util.UrlHelper; import javax.servlet.http.HttpServletRequest; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java index d03fea8..4ee28c4 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java @@ -2,7 +2,7 @@ * Base Package for the results used in ui module. * * @author tchemit <chemit@codelutin.com> - * @see StrutsResultSupport + * @see org.apache.struts2.result.StrutsResultSupport */ package org.chorem.pollen.ui.results; /* @@ -27,5 +27,3 @@ package org.chorem.pollen.ui.results; * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ - -import org.apache.struts2.dispatcher.StrutsResultSupport; \ No newline at end of file diff --git a/pollen-ui-struts2/src/main/resources/struts.xml b/pollen-ui-struts2/src/main/resources/struts.xml index dce4f72..d1a7617 100644 --- a/pollen-ui-struts2/src/main/resources/struts.xml +++ b/pollen-ui-struts2/src/main/resources/struts.xml @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + Copyright (C) 2009 - 2016 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -22,10 +22,9 @@ #L% --> - <!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" - "http://struts.apache.org/dtds/struts-2.3.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> <struts> @@ -62,7 +61,7 @@ <result-types> <result-type name="redirectToHome" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="namespace">/</param> <param name="actionName">home</param> </result-type> @@ -71,7 +70,7 @@ class="org.chorem.pollen.ui.results.PollenServletActionRedirectResult"/> <result-type name="redirect2" - class="org.apache.struts2.dispatcher.ServletRedirectResult"> + class="org.apache.struts2.result.ServletRedirectResult"> <param name="location">${redirectUrl}</param> <param name="prependServletContext">false</param> </result-type> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp index b854020..862c2bc 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp @@ -34,7 +34,7 @@ <s:text name="pollen.title.pollsList"/> </h1> -<s:url id="loadUrl" action="getPolls" namespace="/json" escapeAmp="false"/> +<s:url var="loadUrl" action="getPolls" namespace="/json" escapeAmp="false"/> <sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="data" sortable="true" pager="true" pagerButtons="true" pagerInput="true" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp index 4622f20..e858ccc 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp @@ -36,7 +36,7 @@ <s:text name="pollen.title.usersList"/> </h1> -<s:url id="loadUsers" action="getUsers" namespace="/json" escapeAmp="false"/> +<s:url var="loadUsers" action="getUsers" namespace="/json" escapeAmp="false"/> <s:set var="user" value="%{#session.pollenSession.userAccount}"/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp index 50658ef..ede98b3 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp @@ -30,15 +30,15 @@ <hr/> <s:fielderror fieldName="poll.choices" id="poll_choices_error"/> -<s:set id='deleteTitle'><s:text +<s:set var='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> -<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> -<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<s:set var='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set var='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> <div id="choicesTEXT" class="choices"> <s:iterator value="textChoices" status="status" var="choice"> - <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> - <s:set name="prefix">textChoice_<s:property + <s:set var="choiceNumber"><s:property value="%{#status.index}"/></s:set> + <s:set var="prefix">textChoice_<s:property value="%{#choiceNumber}"/></s:set> <div id='choicesTEXT_<s:property value="choiceNumber"/>' class="ui-state-default choicesDiv"> <%--<div id='choicesTEXT_<s:property value="choiceNumber"/>'>--%> @@ -74,8 +74,8 @@ </div> <div id="choicesDATE" class="choices"> <s:iterator value="dateChoices" status="status" var="choice"> - <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> - <s:set name="prefix">dateChoice_<s:property + <s:set var="choiceNumber"><s:property value="%{#status.index}"/></s:set> + <s:set var="prefix">dateChoice_<s:property value="%{#choiceNumber}"/></s:set> <div id='choicesDATE_<s:property value="choiceNumber"/>' class="ui-state-default choicesDiv"> @@ -115,8 +115,8 @@ </div> <div id="choicesIMAGE" class="choices"> <s:iterator value="imageChoices" status="status" var="choice"> - <s:set name="choiceNumber"><s:property value="%{#status.index}"/></s:set> - <s:set name="prefix">imageChoice_<s:property + <s:set var="choiceNumber"><s:property value="%{#status.index}"/></s:set> + <s:set var="prefix">imageChoice_<s:property value="%{#choiceNumber}"/></s:set> <div id='choicesIMAGE_<s:property value="choiceNumber"/>' class="ui-state-default"> @@ -139,7 +139,7 @@ <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" value="%{#choice.location}" label='' theme="simple"/> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + <s:url var="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="true"> <s:param name="choiceTokenId" value="%{getImageChoiceName(#choice)}"/> @@ -155,7 +155,7 @@ </s:if> <s:else> <%--New image--%> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + <s:url var="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="false" value="/img/7ter.jpg"/> <img name="<s:property value="#prefix"/>.thumb" alt="<s:text name='pollen.image.not.loaded'/>" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp index db4b6ed..ac988a5 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp @@ -24,10 +24,10 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:set name="prefix">dateChoice_<s:property value="choiceNumber"/></s:set> -<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> -<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> -<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<s:set var="prefix">dateChoice_<s:property value="choiceNumber"/></s:set> +<s:set var='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set var='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set var='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> <div id='choicesDATE_<s:property value="choiceNumber"/>' class="ui-state-default choicesDiv"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp index 8bb9d91..e03e09b 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp @@ -23,11 +23,11 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:set name="prefix">imageChoice_<s:property value="choiceNumber"/></s:set> -<s:set name="prefix2">imageChoice[<s:property value="choiceNumber"/>]</s:set> -<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> -<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> -<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<s:set var="prefix">imageChoice_<s:property value="choiceNumber"/></s:set> +<s:set var="prefix2">imageChoice[<s:property value="choiceNumber"/>]</s:set> +<s:set var='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set var='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set var='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> <div id='choicesIMAGE_<s:property value="choiceNumber"/>' class="ui-state-default"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> @@ -39,7 +39,7 @@ theme="simple" value=''/> </div> <div class="fright"> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + <s:url var="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="false" value="/img/7ter.jpg"/> <img name="<s:property value="#prefix"/>.thumb" alt="<s:text name='pollen.image.not.loaded'/>" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp index 27f7fa9..02cb888 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp @@ -24,17 +24,17 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sp" uri="/nuiton-tags" %> -<s:set name="personPrefix">votingList<s:property +<s:set var="personPrefix">votingList<s:property value="votingListType"/>_<s:property value="votingListNumber"/>PersonToList_<s:property value="personToListNumber"/> </s:set> -<s:set name="personToList" value="%{personToList}"/> +<s:set var="personToList" value="%{personToList}"/> -<s:set id='deletePersonTitle'> +<s:set var='deletePersonTitle'> <s:text name="pollen.action.pollPersonToListDelete"/> </s:set> -<s:div id='%{#personPrefix}' cssClass="personToList"> +<div id='<s:property value="%{#personPrefix}" />' class="personToList"> <s:hidden key='%{#personPrefix}.topiaId' value='%{#personToList.topiaId}' label=''/> <s:hidden key='%{#personPrefix}.accountId' @@ -75,4 +75,4 @@ </s:if> <div class="cleanBoth"></div> -</s:div> +</div> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp index 08db14d..ddab8e9 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp @@ -50,7 +50,7 @@ <div id="Pagination" class="pagination"></div> <div id="commentsDiv"> <s:iterator value="comments" var="comment" status="status"> - <s:set name="comment" value="%{#comment}"/> + <s:set var="comment" value="%{#comment}"/> <%@include file="displayPollComment.jsp" %> </s:iterator> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp index a193a79..7cbfa1d 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp @@ -23,10 +23,10 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:set name="prefix">textChoice_<s:property value="choiceNumber"/></s:set> -<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> -<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> -<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<s:set var="prefix">textChoice_<s:property value="choiceNumber"/></s:set> +<s:set var='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set var='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set var='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> <div id='choicesTEXT_<s:property value="choiceNumber"/>' class="ui-state-default choicesDiv"> <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp index 92357fb..c4a4443 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp @@ -24,16 +24,16 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sp" uri="/nuiton-tags" %> -<s:set name="prefix">votingList<s:property value="votingListType"/>_<s:property +<s:set var="prefix">votingList<s:property value="votingListType"/>_<s:property value="votingListNumber"/></s:set> -<s:set name="votingList" value="%{votingList}"/> -<s:set name="votingListType" value="%{votingListType}"/> +<s:set var="votingList" value="%{votingList}"/> +<s:set var="votingListType" value="%{votingListType}"/> -<s:set id='deleteVotingListTitle'> +<s:set var='deleteVotingListTitle'> <s:text name="pollen.action.pollVotingListDelete"/> </s:set> -<s:div id='%{#prefix}' cssClass="votingList"> +<div id='<s:property value="%{#prefix}" />' class="votingList"> <fieldset class="ui-widget-content ui-corner-all"> <sp:fielderror fieldName="%{#prefix}"/> @@ -68,17 +68,17 @@ <div class="cleanBoth"></div> <s:hidden key='%{#prefix}.topiaId' value='%{#votingList.topiaId}' label=''/> - <s:div id='%{#prefix}PersonToList'> + <div id='<s:property value="%{#prefix}" />PersonToList'> <%--<%@include file="displayVotingListPersons.jsp" %>--%> <s:iterator value="%{#votingList.pollAccountPersonToList}" status="pstatus" var="personToList"> - <s:set name="personToListNumber"><s:property value="%{#pstatus.index}"/></s:set> - <s:set name="personPrefix"><s:property value="%{#prefix}"/>PersonToList_<s:property + <s:set var="personToListNumber"><s:property value="%{#pstatus.index}"/></s:set> + <s:set var="personPrefix"><s:property value="%{#prefix}"/>PersonToList_<s:property value="%{#personToListNumber}"/></s:set> <%@include file="displayPersonToList.jsp" %> </s:iterator> - </s:div> + </div> <hr/> <div class="cleanBoth" align="center"> <s:submit id='%{#prefix}_addPersonToList' @@ -96,4 +96,4 @@ </div> </fieldset> <br/> -</s:div> +</div> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp index c43a5f3..112ab77 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp @@ -23,19 +23,19 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:set name="prefix">votingList<s:property value="votingListType"/>_<s:property +<s:set var="prefix">votingList<s:property value="votingListType"/>_<s:property value="votingListNumber"/></s:set> -<s:set name="votingList" value="%{votingList}"/> -<s:set name="votingListType" value="%{votingListType}"/> -<s:set name="startNumber" value="%{startNumber}"/> +<s:set var="votingList" value="%{votingList}"/> +<s:set var="votingListType" value="%{votingListType}"/> +<s:set var="startNumber" value="%{startNumber}"/> <s:iterator value="%{#votingList.pollAccountPersonToList}" status="pstatus" var="personToList"> - <s:set name="personToListNumber"> + <s:set var="personToListNumber"> <s:property value="%{#pstatus.index + #startNumber}"/> </s:set> - <s:set name="personPrefix"> + <s:set var="personPrefix"> <s:property value="%{#prefix}"/>PersonToList_<s:property value="%{#personToListNumber}"/></s:set> <%@include file="displayPersonToList.jsp" %> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp index 2148510..b8dcbe2 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp @@ -21,7 +21,7 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:set name="prefix">votingList_<s:property value="votingListNumber"/></s:set> +<s:set var="prefix">votingList_<s:property value="votingListNumber"/></s:set> <script type="text/javascript"> jQuery(document).ready(function () { @@ -32,6 +32,6 @@ }); </script> -<s:div id='personToList_%{votingListNumber}'> +<div id='personToList_${votingListNumber}'> <%--Where to load personToList--%> -</s:div> +</div> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp index 6b50683..46f07e9 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp @@ -88,7 +88,7 @@ <script type="text/javascript" src='<s:url value="/js/jquery.tipTip.minified.js"/>'></script> -<s:url id='errorImg' value='/img/exclamation.png'/> +<s:url var='errorImg' value='/img/exclamation.png'/> <title> <s:if test="edit"> @@ -307,9 +307,9 @@ <div id="pollTypeRESTRICTED" class="pollType"> <s:iterator value="restrictedVotingList" status="status" var="votingList"> - <s:set name="votingListNumber"><s:property + <s:set var="votingListNumber"><s:property value="%{#status.index}"/></s:set> - <s:set name="votingListType">RESTRICTED</s:set> + <s:set var="votingListType">RESTRICTED</s:set> <%@include file="displayVotingList.jsp" %> </s:iterator> </div> @@ -318,9 +318,9 @@ <div id="votingListGROUP"> <s:iterator value="groupVotingList" status="status" var="votingList"> - <s:set name="votingListNumber"><s:property + <s:set var="votingListNumber"><s:property value="%{#status.index}"/></s:set> - <s:set name="votingListType">GROUP</s:set> + <s:set var="votingListType">GROUP</s:set> <%@include file="displayVotingList.jsp" %> </s:iterator> </div> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp index 39b657d..829c01d 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp @@ -78,8 +78,8 @@ <h1 class="titleVoteCounting"><s:property value="poll.title"/></h1> <%-- Informations sur le sondage --%> -<s:set name="showVoteUrl" value="true"/> -<s:set name="showResultUrl" value="false"/> +<s:set var="showVoteUrl" value="true"/> +<s:set var="showResultUrl" value="false"/> <%@include file="pollInformation.jsp" %> <h4> @@ -90,7 +90,7 @@ <h4><s:property value="victoryMessage"/> <br/> <s:iterator value="pollResult.topRanking" var="result"> - <s:set name="choiceName" value="%{getChoiceName(#result.choiceId)}"/> + <s:set var="choiceName" value="%{getChoiceName(#result.choiceId)}"/> <s:if test="textType"> <s:property value="%{#choiceName}"/> </s:if> @@ -98,13 +98,13 @@ <s:property value="%{getResultAsDate(#choiceName)}"/> </s:elseif> <s:elseif test="imageType"> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + <s:url var="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="false"> <s:param name="choiceId" value="%{#choiceName}"/> <s:param name="pollId" value="poll.pollId"/> <s:param name="thumb" value="false"/> </s:url> - <s:url id="imageUrlThumb" namespace="/io" action="getPollChoiceImage" + <s:url var="imageUrlThumb" namespace="/io" action="getPollChoiceImage" escapeAmp="false"> <s:param name="choiceId" value="%{#choiceName}"/> <s:param name="pollId" value="poll.pollId"/> @@ -163,7 +163,7 @@ <div> <s:iterator value="groupIds" var="groupId" status="status"> <hr/> - <s:set name="groupName" value="%{getGroupName(#groupId)}"/> + <s:set var="groupName" value="%{getGroupName(#groupId)}"/> <img id='chart_Group_<s:property value="#status.index"/>' alt="<s:property value='%{#groupName}'/>" title="<s:property value='%{#groupName}'/>"/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp index 2533634..23b2737 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp @@ -39,13 +39,13 @@ <script type="text/javascript" src="<s:url value='/js/jquery.lightbox-0.5.js' />"></script> -<s:set id='deleteCommentTitle'> +<s:set var='deleteCommentTitle'> <s:text name="pollen.title.delete.pollComment"/> </s:set> -<s:set id='deleteCommentVote'> +<s:set var='deleteCommentVote'> <s:text name="pollen.title.delete.pollVote"/> </s:set> -<s:set id='deleteCommentChoice'> +<s:set var='deleteCommentChoice'> <s:text name="pollen.title.delete.pollChoice"/> </s:set> @@ -115,9 +115,9 @@ <h1 class="titleVote"><s:property value="poll.title"/></h1> <!-- Informations sur le sondage --> -<s:set name="showVoteUrl" value="false"/> -<s:set name="showResultUrl" value="true"/> -<s:set name="showVoteVisibility" value="true"/> +<s:set var="showVoteUrl" value="false"/> +<s:set var="showResultUrl" value="true"/> +<s:set var="showVoteVisibility" value="true"/> <%@include file="pollInformation.jsp" %> <div id="pollZone"> @@ -205,13 +205,13 @@ <s:if test="imageType"> <s:iterator value="poll.choice" var="choice"> - <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" + <s:url var="imageUrl" namespace="/io" action="getPollChoiceImage" escapeAmp="false"> <s:param name="choiceId" value="%{getImageChoiceName(#choice)}"/> <s:param name="pollId" value="poll.pollId"/> <s:param name="thumb" value="false"/> </s:url> - <s:url id="imageUrlThumb" namespace="/io" action="getPollChoiceImage" + <s:url var="imageUrlThumb" namespace="/io" action="getPollChoiceImage" escapeAmp="false"> <s:param name="choiceId" value="%{getImageChoiceName(#choice)}"/> <s:param name="pollId" value="poll.pollId"/> @@ -252,7 +252,7 @@ value="%{pollAccount.votingId}" theme="simple"/> </th> </s:else> - <s:set name="template" value="%{choiceFragment}"/> + <s:set var="template" value="%{choiceFragment}"/> <s:iterator value="poll.choice" var="choice" status="status"> <th> <jsp:include page="${template}"/> @@ -293,7 +293,7 @@ </s:if> </td> <s:iterator value="poll.choice" var="choice"> - <s:set name="currentVoteChoice" + <s:set var="currentVoteChoice" value="%{#vote.getChoiceVoteToChoice(#choice)}"/> <%--s:if test="poll.anonymous"> <td class="anonymous">?</td> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp index 4adbe4c..8b06b67 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp @@ -27,26 +27,26 @@ <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> -<s:url id="loadUrl" action="getPolls" namespace="/json"/> +<s:url var="loadUrl" action="getPolls" namespace="/json"/> -<s:url id="voteUrl" action="votefor/" namespace="/poll"/> -<s:url id='voteImg' value='/img/vote.png'/> -<s:set id='voteTitle'><s:text name="pollen.action.pollVote"/></s:set> -<s:set id='accessVoteTitle'><s:text name="pollen.action.pollAccessVote"/></s:set> +<s:url var="voteUrl" action="votefor/" namespace="/poll"/> +<s:url var='voteImg' value='/img/vote.png'/> +<s:set var='voteTitle'><s:text name="pollen.action.pollVote"/></s:set> +<s:set var='accessVoteTitle'><s:text name="pollen.action.pollAccessVote"/></s:set> -<s:url id='blankImg' value='/img/blank.png'/> +<s:url var='blankImg' value='/img/blank.png'/> -<s:url id="summaryUrl" action="summary/" namespace="/poll"/> -<s:url id='summaryImg' value='/img/edit.png'/> -<s:set id='summaryTitle'><s:text name="pollen.action.pollSummary"/></s:set> +<s:url var="summaryUrl" action="summary/" namespace="/poll"/> +<s:url var='summaryImg' value='/img/edit.png'/> +<s:set var='summaryTitle'><s:text name="pollen.action.pollSummary"/></s:set> -<s:url id="resultUrl" action="results/" namespace="/poll"/> -<s:url id='resultImg' value='/img/count.png'/> -<s:set id='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> +<s:url var="resultUrl" action="results/" namespace="/poll"/> +<s:url var='resultImg' value='/img/count.png'/> +<s:set var='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> -<s:url id="deleteUrl" action="confirmDeletePoll/" namespace="/poll"/> -<s:url id='deleteImg' value='/img/delete.png'/> -<s:set id='deleteTitle'><s:text name="pollen.action.pollDelete"/></s:set> +<s:url var="deleteUrl" action="confirmDeletePoll/" namespace="/poll"/> +<s:url var='deleteImg' value='/img/delete.png'/> +<s:set var='deleteTitle'><s:text name="pollen.action.pollDelete"/></s:set> <script type="text/javascript"> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp index 9d7640e..4de6a9e 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp @@ -52,7 +52,7 @@ <h4><s:text name="pollen.title.pollsCreatedList.legend"/></h4> -<s:url id="loadUrl" action="getCreatedPolls" namespace="/json" +<s:url var="loadUrl" action="getCreatedPolls" namespace="/json" escapeAmp="false"/> <sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="data" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp index a074adb..cc39f07 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp @@ -30,16 +30,16 @@ <script type="text/javascript" src="<s:url value='/js/favoriteList.js' />"></script> -<s:url id="loadPollAccounts" action="getFavoriteListPollAccounts" +<s:url var="loadPollAccounts" action="getFavoriteListPollAccounts" namespace="/json" escapeAmp="false"> <s:param name="favoriteListId" value="%{favoriteList.topiaId}"/> </s:url> -<%--<s:url id="editPollAccounts" action="editPollAccount" namespace="/user">--%> +<%--<s:url var="editPollAccounts" action="editPollAccount" namespace="/user">--%> <%--<s:param name="favoriteListId" value="%{favoriteList.topiaId}"/>--%> <%--</s:url>--%> -<s:url id="editFavoriteList" action="editFavoriteList" namespace="/user"> +<s:url var="editFavoriteList" action="editFavoriteList" namespace="/user"> <s:param name="favoriteListId" value="%{favoriteList.topiaId}"/> </s:url> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp index a59381f..40b36d2 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp @@ -41,7 +41,7 @@ <s:text name="pollen.title.favoriteLists"/> </h1> -<s:url id="loadFavoriteLists" action="getFavoriteLists" namespace="/json"/> +<s:url var="loadFavoriteLists" action="getFavoriteLists" namespace="/json"/> <script type="text/javascript"> @@ -59,7 +59,7 @@ }); </script> -<s:set name='csvHelp'> +<s:set var='csvHelp'> <div><s:text name='pollen.common.favoriteList.csvImport.help'/> <br/> <pre style="background-color: #ffffff;color: #000000;"> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp index 42c3126..1604360 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp @@ -36,7 +36,7 @@ <h4><s:text name="pollen.title.pollsInvitedList.legend"/></h4> -<s:url id="loadInvitedUrl" action="getInvitedPolls" +<s:url var="loadInvitedUrl" action="getInvitedPolls" namespace="/json" escapeAmp="false"/> <sjg:grid dataType="json" href="%{loadInvitedUrl}" gridModel="data" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp index a946748..a71f440 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp @@ -36,7 +36,7 @@ <h4><s:text name="pollen.title.pollsParticipatedList.legend"/></h4> -<s:url id="loadParticipatedUrl" action="getParticipatedPolls" +<s:url var="loadParticipatedUrl" action="getParticipatedPolls" namespace="/json" escapeAmp="false"/> <sjg:grid dataType="json" href="%{loadParticipatedUrl}" gridModel="data" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml b/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml index a3c1ff4..e534d86 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + Copyright (C) 2009 - 2016 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -28,7 +28,6 @@ <display-name>Pollen</display-name> - <filter> <filter-name>topiaTransaction</filter-name> <filter-class>org.chorem.pollen.ui.PollenTopiaTransactionFilter</filter-class> @@ -36,10 +35,9 @@ <filter> <filter-name>struts-prepare</filter-name> - <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter - </filter-class> + <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class> </filter> + <filter> <filter-name>ShiroFilter</filter-name> <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> @@ -52,9 +50,7 @@ <filter> <filter-name>struts-execute</filter-name> - <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter - </filter-class> + <filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class> </filter> <filter-mapping> diff --git a/pom.xml b/pom.xml index 93aa673..03d537a 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ <h2Version>1.3.176</h2Version> <postgresqlVersion>9.4-1205-jdbc41</postgresqlVersion> - <struts2Version>2.3.24.1</struts2Version> + <struts2Version>2.5.5</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> <log4jVersion>2.7</log4jVersion> @@ -422,18 +422,6 @@ <version>${struts2Version}</version> </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${struts2Version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.