This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit fc8c6aa47fa19650522ae3af20328dc44dc2f6af Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Nov 16 00:46:52 2014 +0100 update struts lib to 2.3.16.1 --- bow-ui/src/main/resources/struts.properties | 2 +- bow-ui/src/main/webapp/WEB-INF/web.xml | 21 +++++++++++++-------- pom.xml | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/bow-ui/src/main/resources/struts.properties b/bow-ui/src/main/resources/struts.properties index 61e13a5..dcab240 100644 --- a/bow-ui/src/main/resources/struts.properties +++ b/bow-ui/src/main/resources/struts.properties @@ -40,7 +40,7 @@ struts.serve.static.browserCache=true struts.tag.altSyntax=true -struts.devMode=true +struts.devMode=false struts.i18n.reload=true diff --git a/bow-ui/src/main/webapp/WEB-INF/web.xml b/bow-ui/src/main/webapp/WEB-INF/web.xml index b3df661..023f8b4 100644 --- a/bow-ui/src/main/webapp/WEB-INF/web.xml +++ b/bow-ui/src/main/webapp/WEB-INF/web.xml @@ -26,23 +26,28 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <display-name>Bow</display-name> + <!-- Filters --> <filter> - <filter-name>action2-cleanup</filter-name> - <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> + <filter-name>struts-prepare</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter + </filter-class> </filter> <filter> <filter-name>sitemesh</filter-name> - <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> </filter> <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + <filter-name>struts-execute</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter + </filter-class> </filter> - + <filter-mapping> - <filter-name>action2-cleanup</filter-name> + <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> <filter-mapping> @@ -50,7 +55,7 @@ <url-pattern>/*</url-pattern> </filter-mapping> <filter-mapping> - <filter-name>struts2</filter-name> + <filter-name>struts-execute</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> diff --git a/pom.xml b/pom.xml index 6401c30..52b12f8 100644 --- a/pom.xml +++ b/pom.xml @@ -119,8 +119,8 @@ <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <wikittyVersion>3.10</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.2.3</struts2Version> - <struts2jqueryVersion>3.1.0</struts2jqueryVersion> + <struts2Version>2.3.16.3</struts2Version> + <struts2jqueryVersion>3.7.1</struts2jqueryVersion> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.