Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 26A5F200B7C for ; Thu, 25 Aug 2016 03:47:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 254C8160AC2; Thu, 25 Aug 2016 01:47:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4BB4D160AC5 for ; Thu, 25 Aug 2016 03:47:49 +0200 (CEST) Received: (qmail 77650 invoked by uid 500); 25 Aug 2016 01:47:48 -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 77548 invoked by uid 99); 25 Aug 2016 01:47:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Aug 2016 01:47:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 258DBE5718; Thu, 25 Aug 2016 01:47:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Date: Thu, 25 Aug 2016 01:47:51 -0000 Message-Id: In-Reply-To: <9d7a175f47f8481085f063a5335d0997@git.apache.org> References: <9d7a175f47f8481085f063a5335d0997@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/36] cxf git commit: Updating JAX-RS Spring config factory to check cxf.jaxrs.server.address archived-at: Thu, 25 Aug 2016 01:47:50 -0000 Updating JAX-RS Spring config factory to check cxf.jaxrs.server.address Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7e4873de Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7e4873de Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7e4873de Branch: refs/heads/master-jaxrs-2.1 Commit: 7e4873de12e96639c11a708062e1660e2c89a890 Parents: 67989f8 Author: Sergey Beryozkin Authored: Tue Aug 16 16:49:57 2016 +0100 Committer: Sergey Beryozkin Committed: Tue Aug 16 16:49:57 2016 +0100 ---------------------------------------------------------------------- .../jaxrs/spring/AbstractSpringConfigurationFactory.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7e4873de/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java index c1e5d60..a9c6cf5 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java @@ -22,11 +22,13 @@ import java.util.Collections; import java.util.List; import org.apache.cxf.bus.spring.SpringBus; +import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.endpoint.Server; import org.apache.cxf.feature.Feature; import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -34,6 +36,8 @@ public abstract class AbstractSpringConfigurationFactory extends AbstractBasicInterceptorProvider implements ApplicationContextAware { protected ApplicationContext applicationContext; + @Value("${cxf.jaxrs.server.address:}") + private String jaxrsServerAddress; protected Server createJaxRsServer() { @@ -68,7 +72,11 @@ public abstract class AbstractSpringConfigurationFactory } protected String getAddress() { - return "/"; + if (!StringUtils.isEmpty(jaxrsServerAddress)) { + return jaxrsServerAddress; + } else { + return "/"; + } } protected String getTransportId() {