branch feature/8312 created (now 723ed56)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8312 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 723ed56 Passage sur la dernière version de struts (2.5), cela pose pleins de problèmes (xworks n'existe plus en autonome, log4j remplacé par log4j2 et ça ne fonctionne pas). (See #8312) This branch includes the following new commits: new 34ed43d Passage i18n 3.5 (See #8312) new 723ed56 Passage sur la dernière version de struts (2.5), cela pose pleins de problèmes (xworks n'existe plus en autonome, log4j remplacé par log4j2 et ça ne fonctionne pas). (See #8312) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 723ed56dc6a694da13551e4c8dc7ee6db8391758 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 11:45:03 2016 +0200 Passage sur la dernière version de struts (2.5), cela pose pleins de problèmes (xworks n'existe plus en autonome, log4j remplacé par log4j2 et ça ne fonctionne pas). (See #8312) commit 34ed43de4ae61eeb09d9052bf23aac013b29d7db Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 09:51:06 2016 +0200 Passage i18n 3.5 (See #8312) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8312 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 34ed43de4ae61eeb09d9052bf23aac013b29d7db Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 09:51:06 2016 +0200 Passage i18n 3.5 (See #8312) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38d6142..035843a 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ <topiaVersion>3.1</topiaVersion> <nuitonUtilsVersion>3.0-rc-12</nuitonUtilsVersion> - <nuitonI18nVersion>3.4.1</nuitonI18nVersion> + <nuitonI18nVersion>3.5</nuitonI18nVersion> <nuitonWebVersion>1.17</nuitonWebVersion> <!--<struts2Version>2.3.20</struts2Version>--> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8312 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 723ed56dc6a694da13551e4c8dc7ee6db8391758 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 11:45:03 2016 +0200 Passage sur la dernière version de struts (2.5), cela pose pleins de problèmes (xworks n'existe plus en autonome, log4j remplacé par log4j2 et ça ne fonctionne pas). (See #8312) --- echobase-ui/pom.xml | 4 -- .../src/main/resources/config/struts-dbeditor.xml | 2 +- .../main/resources/config/struts-exportQuery.xml | 6 +-- .../src/main/resources/config/struts-workingDb.xml | 4 +- echobase-ui/src/main/resources/struts.xml | 2 +- .../src/main/webapp/WEB-INF/includes/i18n.jsp | 8 ++-- .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 8 ++-- .../WEB-INF/jsp/embeddedApplication/result.jsp | 2 +- .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 2 +- .../main/webapp/WEB-INF/jsp/exportCoser/result.jsp | 2 +- .../main/webapp/WEB-INF/jsp/exportDb/result.jsp | 2 +- .../WEB-INF/jsp/exportQuery/exportQueryResult.jsp | 3 +- .../webapp/WEB-INF/jsp/removeData/importLogs.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/user/userList.jsp | 8 ++-- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 2 +- .../webapp/WEB-INF/jsp/workingDb/modifications.jsp | 2 +- echobase-ui/src/main/webapp/WEB-INF/web.xml | 4 +- pom.xml | 45 ++++++++++++++-------- 18 files changed, 59 insertions(+), 49 deletions(-) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index ce24db1..990b149 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -229,10 +229,6 @@ <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> <scope>runtime</scope> diff --git a/echobase-ui/src/main/resources/config/struts-dbeditor.xml b/echobase-ui/src/main/resources/config/struts-dbeditor.xml index c571650..3287306 100644 --- a/echobase-ui/src/main/resources/config/struts-dbeditor.xml +++ b/echobase-ui/src/main/resources/config/struts-dbeditor.xml @@ -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-exportQuery.xml b/echobase-ui/src/main/resources/config/struts-exportQuery.xml index 5cead5e..09169b7 100644 --- a/echobase-ui/src/main/resources/config/struts-exportQuery.xml +++ b/echobase-ui/src/main/resources/config/struts-exportQuery.xml @@ -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-workingDb.xml b/echobase-ui/src/main/resources/config/struts-workingDb.xml index 201af08..c3ee5d6 100644 --- a/echobase-ui/src/main/resources/config/struts-workingDb.xml +++ b/echobase-ui/src/main/resources/config/struts-workingDb.xml @@ -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 0331f5b..5a6415a 100644 --- a/echobase-ui/src/main/resources/struts.xml +++ b/echobase-ui/src/main/resources/struts.xml @@ -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 8de419f..195f510 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 0366ac1..895b1f7 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"> @@ -246,7 +246,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> @@ -337,7 +337,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 71c80eb..b2cdc33 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/exportCoser/configure.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/exportCoser/configure.jsp index b38d4d0..7a6f9fd 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 1e0c0a9..ab4b94c 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 0010f51..79c2caf 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 5f025d9..c13caa9 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,8 +42,7 @@ </div> </s:if> <s:else> - <s:url id="loadUrl" action="getExportQueryResult" namespace="/exportQuery" - escapeAmp="false"> + <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 b470b6d..e5404f6 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 @@ -73,7 +73,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="voyageId" value="%{voyageId}"/> </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 63325ed..35695ab 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 cf025c1..46928b9 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 @@ -158,7 +158,7 @@ </script> <title><s:text name="echobase.title.dashboard"/></title> -<s:url id="loadUrl" action="getDashboardImportLogs" namespace="/workingDb" +<s:url var="loadUrl" action="getDashboardImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="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 7fe6290..ca0dc73 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 e9ce721..8f51b72 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 035843a..e889368 100644 --- a/pom.xml +++ b/pom.xml @@ -132,10 +132,10 @@ <nuitonI18nVersion>3.5</nuitonI18nVersion> <nuitonWebVersion>1.17</nuitonWebVersion> - <!--<struts2Version>2.3.20</struts2Version>--> - <struts2Version>2.3.15.3</struts2Version> - <!--<jqueryPluginVersion>3.7.1</jqueryPluginVersion>--> - <jqueryPluginVersion>3.6.1</jqueryPluginVersion> + <!--<struts2Version>2.3.15.3</struts2Version>--> + <struts2Version>2.5</struts2Version> + <!--<jqueryPluginVersion>3.6.1</jqueryPluginVersion>--> + <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <!--<h2Version>1.4.182</h2Version>--> <!--<h2Version>1.3.176</h2Version>--> <h2Version>1.3.175</h2Version> @@ -183,6 +183,16 @@ <groupId>fr.ifremer.coser</groupId> <artifactId>coser-business</artifactId> <version>${coserVersion}</version> + <exclusions> + <exclusion> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Commons --> @@ -266,6 +276,16 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>3.0</version> + <exclusions> + <exclusion> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -286,6 +306,12 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-struts2</artifactId> <version>${nuitonWebVersion}</version> + <exclusions> + <exclusion> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.web</groupId> @@ -389,17 +415,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>.
participants (1)
-
codelutin.com scm