This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 00ac42e32ec5d56cd1f2abd841e409c38529086e Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 20 15:58:22 2019 +0100 Update struts from 2.3.x to 2.5.x --- echobase-ui/pom.xml | 4 ---- .../java/fr/ifremer/echobase/ui/actions/user/Login.java | 2 +- .../src/main/resources/config/struts-dbeditor.xml | 6 +++--- .../resources/config/struts-embeddedApplication.xml | 4 ++-- .../src/main/resources/config/struts-exportAtlantos.xml | 4 ++-- .../src/main/resources/config/struts-exportCoser.xml | 4 ++-- .../src/main/resources/config/struts-exportDb.xml | 4 ++-- .../src/main/resources/config/struts-exportQuery.xml | 10 +++++----- .../src/main/resources/config/struts-importData.xml | 4 ++-- .../src/main/resources/config/struts-importDb.xml | 4 ++-- .../src/main/resources/config/struts-removeData.xml | 4 ++-- .../src/main/resources/config/struts-spatial.xml | 4 ++-- echobase-ui/src/main/resources/config/struts-user.xml | 4 ++-- .../src/main/resources/config/struts-workingDb.xml | 8 ++++---- echobase-ui/src/main/resources/struts.xml | 6 +++--- echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp | 8 ++++---- .../src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 8 ++++---- .../webapp/WEB-INF/jsp/embeddedApplication/result.jsp | 2 +- .../main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp | 2 +- .../main/webapp/WEB-INF/jsp/exportCoser/configure.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/exportDb/result.jsp | 2 +- .../WEB-INF/jsp/exportQuery/exportQueryResult.jsp | 2 +- .../main/webapp/WEB-INF/jsp/removeData/importLogs.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/user/userList.jsp | 8 ++++---- .../src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 4 ++-- .../main/webapp/WEB-INF/jsp/workingDb/modifications.jsp | 2 +- echobase-ui/src/main/webapp/WEB-INF/web.xml | 4 ++-- pom.xml | 17 +++-------------- 29 files changed, 61 insertions(+), 76 deletions(-) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index a3d98ac4..aef18e9b 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -250,10 +250,6 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java index d9e38fa5..64e87e2f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.user; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.interceptor.I18nInterceptor; +import org.apache.struts2.interceptor.I18nInterceptor; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.UserService; import fr.ifremer.echobase.ui.EchoBaseSession; diff --git a/echobase-ui/src/main/resources/config/struts-dbeditor.xml b/echobase-ui/src/main/resources/config/struts-dbeditor.xml index bba646d1..b57882bd 100644 --- a/echobase-ui/src/main/resources/config/struts-dbeditor.xml +++ b/echobase-ui/src/main/resources/config/struts-dbeditor.xml @@ -21,8 +21,8 @@ --> <!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> @@ -30,7 +30,7 @@ <result-types> <result-type name="redirectToDbEditor" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="namespace">/dbeditor</param> <param name="actionName">dbeditor</param> <param name="entityType">${entityType}</param> diff --git a/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml b/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml index dfb04cd4..f4c88d01 100644 --- a/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml +++ b/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml @@ -19,8 +19,8 @@ --> <!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> diff --git a/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml b/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml index 98ea8f5a..64080a38 100644 --- a/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml +++ b/echobase-ui/src/main/resources/config/struts-exportAtlantos.xml @@ -18,8 +18,8 @@ #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> diff --git a/echobase-ui/src/main/resources/config/struts-exportCoser.xml b/echobase-ui/src/main/resources/config/struts-exportCoser.xml index ee925724..ad1a15b6 100644 --- a/echobase-ui/src/main/resources/config/struts-exportCoser.xml +++ b/echobase-ui/src/main/resources/config/struts-exportCoser.xml @@ -18,8 +18,8 @@ #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> diff --git a/echobase-ui/src/main/resources/config/struts-exportDb.xml b/echobase-ui/src/main/resources/config/struts-exportDb.xml index 2176d530..1c29822b 100644 --- a/echobase-ui/src/main/resources/config/struts-exportDb.xml +++ b/echobase-ui/src/main/resources/config/struts-exportDb.xml @@ -18,8 +18,8 @@ #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> diff --git a/echobase-ui/src/main/resources/config/struts-exportQuery.xml b/echobase-ui/src/main/resources/config/struts-exportQuery.xml index 5cead5ea..f6c13365 100644 --- a/echobase-ui/src/main/resources/config/struts-exportQuery.xml +++ b/echobase-ui/src/main/resources/config/struts-exportQuery.xml @@ -19,8 +19,8 @@ --> <!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> @@ -29,18 +29,18 @@ <result-types> <result-type name="redirectToList" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">list</param> <param name="namespace">exportQuery</param> </result-type> <result-type name="redirectToEdit" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">edit</param> <param name="namespace">exportQuery</param> <param name="query.topiaId">${query.topiaId}</param> </result-type> <result-type name="showList" - class="org.apache.struts2.dispatcher.ServletDispatcherResult"> + class="org.apache.struts2.result.ServletDispatcherResult"> <param name="location">/WEB-INF/jsp/exportQuery/exportQuery.jsp</param> <param name="query.topiaId">${query.topiaId}</param> </result-type> diff --git a/echobase-ui/src/main/resources/config/struts-importData.xml b/echobase-ui/src/main/resources/config/struts-importData.xml index 92ced7c0..9f06d7f7 100644 --- a/echobase-ui/src/main/resources/config/struts-importData.xml +++ b/echobase-ui/src/main/resources/config/struts-importData.xml @@ -20,8 +20,8 @@ #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> diff --git a/echobase-ui/src/main/resources/config/struts-importDb.xml b/echobase-ui/src/main/resources/config/struts-importDb.xml index 5057e3a5..76c71324 100644 --- a/echobase-ui/src/main/resources/config/struts-importDb.xml +++ b/echobase-ui/src/main/resources/config/struts-importDb.xml @@ -18,8 +18,8 @@ #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> diff --git a/echobase-ui/src/main/resources/config/struts-removeData.xml b/echobase-ui/src/main/resources/config/struts-removeData.xml index 191c50fd..71e53958 100644 --- a/echobase-ui/src/main/resources/config/struts-removeData.xml +++ b/echobase-ui/src/main/resources/config/struts-removeData.xml @@ -17,8 +17,8 @@ #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> diff --git a/echobase-ui/src/main/resources/config/struts-spatial.xml b/echobase-ui/src/main/resources/config/struts-spatial.xml index d4f20729..e966f917 100644 --- a/echobase-ui/src/main/resources/config/struts-spatial.xml +++ b/echobase-ui/src/main/resources/config/struts-spatial.xml @@ -18,8 +18,8 @@ #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> diff --git a/echobase-ui/src/main/resources/config/struts-user.xml b/echobase-ui/src/main/resources/config/struts-user.xml index 898e4012..27483f42 100644 --- a/echobase-ui/src/main/resources/config/struts-user.xml +++ b/echobase-ui/src/main/resources/config/struts-user.xml @@ -21,8 +21,8 @@ --> <!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> diff --git a/echobase-ui/src/main/resources/config/struts-workingDb.xml b/echobase-ui/src/main/resources/config/struts-workingDb.xml index 1e58547e..016231a9 100644 --- a/echobase-ui/src/main/resources/config/struts-workingDb.xml +++ b/echobase-ui/src/main/resources/config/struts-workingDb.xml @@ -19,8 +19,8 @@ #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> @@ -29,14 +29,14 @@ <result-types> <result-type name="redirectToShowList" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">showList</param> <param name="namespace">/workingDb</param> <param name="conf.topiaId">${conf.topiaId}</param> </result-type> <result-type name="showList" - class="org.apache.struts2.dispatcher.ServletDispatcherResult"> + class="org.apache.struts2.result.ServletDispatcherResult"> <param name="location">/WEB-INF/jsp/workingDb/manage.jsp</param> <param name="conf.topiaId">${conf.topiaId}</param> </result-type> diff --git a/echobase-ui/src/main/resources/struts.xml b/echobase-ui/src/main/resources/struts.xml index a591b00c..11077cd3 100644 --- a/echobase-ui/src/main/resources/struts.xml +++ b/echobase-ui/src/main/resources/struts.xml @@ -22,8 +22,8 @@ <!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> @@ -63,7 +63,7 @@ <result-types> <result-type name="redirectToHome" - class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + class="org.apache.struts2.result.ServletActionRedirectResult"> <param name="actionName">home</param> <param name="namespace">/</param> </result-type> diff --git a/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp b/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp index 8de419fb..195f510a 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp @@ -19,10 +19,10 @@ #L% --%> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:set name="usingEnglish"><s:text name='echobase.action.usingEnglish'/></s:set> -<s:set name="usingFrench"><s:text name='echobase.action.usingFrench'/></s:set> -<s:set name="toEnglish"><s:text name='echobase.action.toEnglish'/></s:set> -<s:set name="toFrench"><s:text name='echobase.action.toFrench'/></s:set> +<s:set var="usingEnglish"><s:text name='echobase.action.usingEnglish'/></s:set> +<s:set var="usingFrench"><s:text name='echobase.action.usingFrench'/></s:set> +<s:set var="toEnglish"><s:text name='echobase.action.toEnglish'/></s:set> +<s:set var="toFrench"><s:text name='echobase.action.toFrench'/></s:set> <s:if test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp index 79530b46..7a71ee41 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp @@ -26,9 +26,9 @@ <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> -<s:url id="getTableData" action="getTableData" namespace="/dbeditor"/> +<s:url var="getTableData" action="getTableData" namespace="/dbeditor"/> -<s:set name="tableSelected" value="%{entityType != null}"/> +<s:set var="tableSelected" value="%{entityType != null}"/> <title> <s:if test="admin"> @@ -261,7 +261,7 @@ <br class="clearBoth"/> <s:if test="tableSelected"> - <s:url id="loadUrl" action="getTableDatas" namespace="/dbeditor" + <s:url var="loadUrl" action="getTableDatas" namespace="/dbeditor" escapeAmp="false"> <s:param name="entityType" value="%{entityType}"/> </s:url> @@ -352,7 +352,7 @@ <s:iterator value="columnMetas" var="meta" status="status"> <s:set var="metaName" value='%{#meta.name}'/> <s:if test="#meta.fK"> - <s:url id="urlName" action="getForeignEntities" + <s:url var="urlName" action="getForeignEntities" namespace="/dbeditor" escapeAmp="false"> <s:param name="entityType" value="%{#meta.typeSimpleName}"/> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp index 71c80eb1..b2cdc33f 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/result.jsp @@ -21,7 +21,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/embeddedApplication" action="download"/> +<s:url var="downloadUrl" namespace="/embeddedApplication" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp index 08541784..8cd328ff 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportAtlantos/result.jsp @@ -19,7 +19,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/exportAtlantos" action="download"/> +<s:url var="downloadUrl" namespace="/exportAtlantos" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp index b38d4d03..7a6f9fda 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp @@ -21,7 +21,7 @@ <title><s:text name="echobase.title.exportCoser"/></title> -<s:url id="getZonesUrl" namespace="/exportCoser" action="getZones"/> +<s:url var="getZonesUrl" namespace="/exportCoser" action="getZones"/> <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp index 1e0c0a9a..ab4b94c9 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/result.jsp @@ -19,7 +19,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/exportCoser" action="download"/> +<s:url var="downloadUrl" namespace="/exportCoser" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp index 0010f511..79c2cafc 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/result.jsp @@ -21,7 +21,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:url id="downloadUrl" namespace="/exportDb" action="download"/> +<s:url var="downloadUrl" namespace="/exportDb" action="download"/> <s:if test="error == null"> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp index 5f025d9d..0360c036 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp @@ -42,7 +42,7 @@ </div> </s:if> <s:else> - <s:url id="loadUrl" action="getExportQueryResult" namespace="/exportQuery" + <s:url var="loadUrl" action="getExportQueryResult" namespace="/exportQuery" escapeAmp="false"> <s:param name="queryId" value="%{queryId}"/> </s:url> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp index 9dddb994..8ee3d8f6 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp @@ -76,7 +76,7 @@ </fieldset> <s:form method="post" namespace="/removeData" action="confirmDelete"> - <s:url id="loadUrl" action="getImportLogs" namespace="/removeData" + <s:url var="loadUrl" action="getImportLogs" namespace="/removeData" escapeAmp="false"> <s:param name="entityId" value="%{entityId}"/> </s:url> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp index 63325ede..35695ab1 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp @@ -26,13 +26,13 @@ <title><s:text name="echobase.title.users"/></title> -<s:url id="loadUrl" action="getUsers" namespace="/user" escapeAmp="false"/> +<s:url var="loadUrl" action="getUsers" namespace="/user" escapeAmp="false"/> -<s:url id="addUrl" action="user-Create" namespace="/user" escapeAmp="false" method="input"/> +<s:url var="addUrl" action="user-Create" namespace="/user" escapeAmp="false" method="input"/> -<s:url id="updateUrl" action="user-Update" namespace="/user" escapeAmp="false" method="input"/> +<s:url var="updateUrl" action="user-Update" namespace="/user" escapeAmp="false" method="input"/> -<s:url id="delUrl" action="user-Delete" namespace="/user" escapeAmp="false" method="input"/> +<s:url var="delUrl" action="user-Delete" namespace="/user" escapeAmp="false" method="input"/> <script type="text/javascript"> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp index 963c214b..dda8b710 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp @@ -212,7 +212,7 @@ <br/> <div id="voyagesTab"> - <s:url id="loadUrl" action="getDashboardVoyageImportLogs" namespace="/workingDb" escapeAmp="false"/> + <s:url var="loadUrl" action="getDashboardVoyageImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="true" rownumbers="false" viewrecords="true" @@ -236,7 +236,7 @@ </div> <div id ="mooringsTab"> - <s:url id="loadUrl" action="getDashboardMooringImportLogs" namespace="/workingDb" escapeAmp="false"/> + <s:url var="loadUrl" action="getDashboardMooringImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="moorings" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="false" rownumbers="false" viewrecords="true" diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp index 7fe62905..ca0dc73a 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp @@ -47,7 +47,7 @@ </script> <title><s:text name="echobase.title.entityModificationLogs"/></title> -<s:url id="loadUrl" action="getEntityModificationLogs" namespace="/workingDb" +<s:url var="loadUrl" action="getEntityModificationLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" diff --git a/echobase-ui/src/main/webapp/WEB-INF/web.xml b/echobase-ui/src/main/webapp/WEB-INF/web.xml index e9ce7218..8f51b728 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/web.xml +++ b/echobase-ui/src/main/webapp/WEB-INF/web.xml @@ -43,7 +43,7 @@ <filter> <filter-name>struts-prepare</filter-name> <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter + org.apache.struts2.dispatcher.filter.StrutsPrepareFilter </filter-class> </filter> @@ -55,7 +55,7 @@ <filter> <filter-name>struts-execute</filter-name> <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter + org.apache.struts2.dispatcher.filter.StrutsExecuteFilter </filter-class> </filter> diff --git a/pom.xml b/pom.xml index b545b51c..9f8b0aff 100644 --- a/pom.xml +++ b/pom.xml @@ -154,13 +154,13 @@ <nuitonWebVersion>1.20</nuitonWebVersion> <!-- JC 180208 - Do not update Struts 2 - Breaks forms --> - <struts2Version>2.3.15.3</struts2Version> + <struts2Version>2.5.20</struts2Version> <!-- JC 180214 - Do not update Jquery plugins, breaks startup --> - <jqueryPluginVersion>3.6.1</jqueryPluginVersion> + <jqueryPluginVersion>4.0.3</jqueryPluginVersion> <h2Version>1.3.175</h2Version> <postgresqlVersion>9.4.1211</postgresqlVersion> <slf4jVersion>1.7.25</slf4jVersion> - <coserVersion>1.5.6</coserVersion> + <coserVersion>1.6.1-SNAPSHOT</coserVersion> <!-- /!\ http://bengreen.eu/fancyhtml/quickreference/jettyjsp9error.html --> <jettyPluginVersion>9.1.6.v20160112</jettyPluginVersion> @@ -411,17 +411,6 @@ <artifactId>struts2-sitemesh-plugin</artifactId> <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> <dependency> <groupId>net.sourceforge.javacsv</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.