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 9AAE518A8F for ; Tue, 30 Jun 2015 15:53:34 +0000 (UTC) Received: (qmail 52021 invoked by uid 500); 30 Jun 2015 15:53:34 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 51963 invoked by uid 500); 30 Jun 2015 15:53:34 -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 51954 invoked by uid 99); 30 Jun 2015 15:53:34 -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; Tue, 30 Jun 2015 15:53:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 641DEDFE61; Tue, 30 Jun 2015 15:53:34 +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: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6477] Adding jaxrs schema publish attribute Date: Tue, 30 Jun 2015 15:53:34 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes cc834cef9 -> 4275bf063 [CXF-6477] Adding jaxrs schema publish attribute Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4275bf06 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4275bf06 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4275bf06 Branch: refs/heads/2.7.x-fixes Commit: 4275bf0636cda5ac6990ae846b3ad4cab1c59240 Parents: cc834ce Author: Sergey Beryozkin Authored: Tue Jun 30 16:43:24 2015 +0100 Committer: Sergey Beryozkin Committed: Tue Jun 30 16:53:16 2015 +0100 ---------------------------------------------------------------------- .../jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java | 2 ++ .../cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java | 2 ++ rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd | 1 + rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd | 1 + 4 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4275bf06/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java index 780e910..a6ede2b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java @@ -73,6 +73,8 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti } else if ("serviceName".equals(name)) { QName q = parseQName(e, val); bean.addProperty(name, createValue(context, q)); + } else if ("publish".equals(name)) { + mapToProperty(bean, "start", val, context); } else { mapToProperty(bean, name, val, context); } http://git-wip-us.apache.org/repos/asf/cxf/blob/4275bf06/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java index 874504e..c981ebe 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java @@ -67,6 +67,8 @@ public class JAXRSServerFactoryBeanDefinitionParser extends AbstractBeanDefiniti } else if ("serviceName".equals(name)) { QName q = parseQName(e, val); bean.addPropertyValue(name, q); + } else if ("publish".equals(name)) { + mapToProperty(bean, "start", val); } else { mapToProperty(bean, name, val); } http://git-wip-us.apache.org/repos/asf/cxf/blob/4275bf06/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd b/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd index 0270492..c10795c 100644 --- a/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd +++ b/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd @@ -68,6 +68,7 @@ + http://git-wip-us.apache.org/repos/asf/cxf/blob/4275bf06/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd b/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd index 928a3d2..c9409fd 100644 --- a/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd +++ b/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd @@ -67,6 +67,7 @@ +