Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0371211EE5 for ; Tue, 22 Apr 2014 12:34:09 +0000 (UTC) Received: (qmail 28690 invoked by uid 500); 22 Apr 2014 12:34:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 28473 invoked by uid 500); 22 Apr 2014 12:34:02 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 28455 invoked by uid 99); 22 Apr 2014 12:34:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2014 12:34:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ED4DC839C9E; Tue, 22 Apr 2014 12:34:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <25251b85cdfd4e13acd0c4df9c7ee7f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-5702] Ignoring ApplicationPath by default Date: Tue, 22 Apr 2014 12:34:00 +0000 (UTC) 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 Authored: Tue Apr 22 13:33:42 2014 +0100 Committer: Sergey Beryozkin 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 @@ - jaxrs.application.address.ignore - true - - jaxrs.outInterceptors org.apache.cxf.interceptor.LoggingOutInterceptor @@ -133,6 +129,10 @@ javax.ws.rs.Application org.apache.cxf.systest.jaxrs.BookApplication + + jaxrs.application.address.ignore + false + 1