Repository: cxf Updated Branches: refs/heads/master 8be9f4b6a -> ce7692af6
[CXF-5702] Ignoring ApplicationPath by default Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce7692af Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce7692af Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce7692af Branch: refs/heads/master Commit: ce7692af60cf4e270c62d9bdda935adf547add73 Parents: 8be9f4b Author: Sergey Beryozkin <[email protected]> Authored: Tue Apr 22 13:33:42 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Apr 22 13:33:42 2014 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 2 +- .../src/test/resources/jaxrs_non_spring/WEB-INF/web.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ce7692af/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java index 510d18e..b1b0026 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java @@ -433,7 +433,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { String ignoreParam = servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM); JAXRSServerFactoryBean bean = ResourceUtils.createApplication(app, - MessageUtils.isTrue(ignoreParam), + ignoreParam == null || MessageUtils.isTrue(ignoreParam), getStaticSubResolutionValue(servletConfig)); String splitChar = getParameterSplitChar(servletConfig); setAllInterceptors(bean, servletConfig, splitChar); http://git-wip-us.apache.org/repos/asf/cxf/blob/ce7692af/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml b/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml index f256107..8982f15 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml @@ -76,10 +76,6 @@ </param-value> </init-param> <init-param> - <param-name>jaxrs.application.address.ignore</param-name> - <param-value>true</param-value> - </init-param> - <init-param> <param-name>jaxrs.outInterceptors</param-name> <param-value>org.apache.cxf.interceptor.LoggingOutInterceptor</param-value> </init-param> @@ -133,6 +129,10 @@ <param-name>javax.ws.rs.Application</param-name> <param-value>org.apache.cxf.systest.jaxrs.BookApplication</param-value> </init-param> + <init-param> + <param-name>jaxrs.application.address.ignore</param-name> + <param-value>false</param-value> + </init-param> <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping>
