You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2020/01/15 14:42:23 UTC
[cxf] branch 3.3.x-fixes updated: [CXF-8193]upgrade to jetty
9.4.25.v20191220
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 22678a4 [CXF-8193]upgrade to jetty 9.4.25.v20191220
22678a4 is described below
commit 22678a4c84225e46825e256acdbfbbdc7bed5637
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Jan 15 09:40:22 2020 -0500
[CXF-8193]upgrade to jetty 9.4.25.v20191220
(cherry picked from commit 528b35178ec31860cf5ad2095d6f3cc3c951d914)
---
parent/pom.xml | 2 +-
.../resources/jaxrs_dispatch/WEB-INF/beans.xml | 4 ++--
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 26 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 29c1840..c171259 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,8 +147,8 @@
<cxf.jettison.version>1.4.0</cxf.jettison.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
- <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version><!-- 9.4.25 will break JAXRSRequestDispatcherTest.testGetBookHTMLInclude -->
<cxf.jexl.version>2.1.1</cxf.jexl.version>
+ <cxf.jetty9.version>9.4.25.v20191220</cxf.jetty9.version>
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.johnzon.version>1.1.13</cxf.johnzon.version>
<cxf.json.api.version>1.1.4</cxf.json.api.version>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
index 3a510a9..a1e344d 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
@@ -48,7 +48,7 @@
<property name="dispatcherName" value="default"/>
</bean>
<bean id="dispatchProvider5" class="org.apache.cxf.jaxrs.provider.RequestDispatcherProvider">
- <property name="resourcePath" value="/book.html"/>
+ <property name="resourcePath" value="/book_include.html"/>
<property name="includeResource" value="true"/>
</bean>
<jaxrs:server id="bookservice1" address="/bookstore1">
@@ -92,4 +92,4 @@
</jaxrs:providers>
</jaxrs:server>
</beans>
-<!-- END SNIPPET: beans -->
\ No newline at end of file
+<!-- END SNIPPET: beans -->
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
index b9fe1c8..3795f7c 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
@@ -59,6 +59,32 @@
<url-pattern>/the/*</url-pattern>
</servlet-mapping>
<servlet>
+ <servlet-name>RedirectIncludeCXFServlet</servlet-name>
+ <display-name>Redirect CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <init-param>
+ <param-name>redirects-list</param-name>
+ <param-value>
+ /(\w)+.html
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirect-with-include</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirect-servlet-path</param-name>
+ <param-value>/static</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>RedirectIncludeCXFServlet</servlet-name>
+ <url-pattern>/book_include.html</url-pattern>
+ </servlet-mapping>
+ <servlet>
<servlet-name>RedirectCXFServlet</servlet-name>
<display-name>Redirect CXF Servlet</display-name>
<servlet-class>