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 AAA03112AE for ; Wed, 23 Apr 2014 12:32:50 +0000 (UTC) Received: (qmail 70906 invoked by uid 500); 23 Apr 2014 12:32:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 70727 invoked by uid 500); 23 Apr 2014 12:32:42 -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 70713 invoked by uid 99); 23 Apr 2014 12:32:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2014 12:32:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CB48E94835A; Wed, 23 Apr 2014 12:32:40 +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: git commit: Changing Spring jaxrs base-packages attribute to basePackages Date: Wed, 23 Apr 2014 12:32:40 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 2625deedb -> 326fa2ae9 Changing Spring jaxrs base-packages attribute to basePackages Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/326fa2ae Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/326fa2ae Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/326fa2ae Branch: refs/heads/master Commit: 326fa2ae986b784a5de37e43c6ef1d6746be54c8 Parents: 2625dee Author: Sergey Beryozkin Authored: Wed Apr 23 13:32:23 2014 +0100 Committer: Sergey Beryozkin Committed: Wed Apr 23 13:32:23 2014 +0100 ---------------------------------------------------------------------- .../cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java | 2 +- rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd | 2 +- .../client/spring/JAXRSClientFactoryBeanDefinitionParser.java | 2 +- rt/rs/client/src/main/resources/schemas/jaxrs-client.xsd | 2 +- .../src/test/resources/jaxrs_spring_discovery/WEB-INF/beans.xml | 2 +- .../org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/326fa2ae/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 f1a21d8..2744b01 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 @@ -74,7 +74,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends AbstractBeanDefiniti } else if ("serviceName".equals(name)) { QName q = parseQName(e, val); bean.addPropertyValue(name, q); - } else if ("base-packages".equals(name)) { + } else if ("basePackages".equals(name)) { bean.addPropertyValue("basePackages", ClasspathScanner.parsePackages(val)); } else { mapToProperty(bean, name, val); http://git-wip-us.apache.org/repos/asf/cxf/blob/326fa2ae/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 a63c875..932dbe9 100644 --- a/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd +++ b/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd @@ -68,7 +68,7 @@ - + http://git-wip-us.apache.org/repos/asf/cxf/blob/326fa2ae/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java index 8c15a6b..c35f25b 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java @@ -76,7 +76,7 @@ public class JAXRSClientFactoryBeanDefinitionParser extends AbstractFactoryBeanD if ("serviceName".equals(name)) { QName q = parseQName(e, val); bean.addPropertyValue(name, q); - } else if ("base-packages".equals(name)) { + } else if ("basePackages".equals(name)) { bean.addPropertyValue("basePackages", ClasspathScanner.parsePackages(val)); } else { mapToProperty(bean, name, val); http://git-wip-us.apache.org/repos/asf/cxf/blob/326fa2ae/rt/rs/client/src/main/resources/schemas/jaxrs-client.xsd ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/resources/schemas/jaxrs-client.xsd b/rt/rs/client/src/main/resources/schemas/jaxrs-client.xsd index 46c96d6..87b0a49 100644 --- a/rt/rs/client/src/main/resources/schemas/jaxrs-client.xsd +++ b/rt/rs/client/src/main/resources/schemas/jaxrs-client.xsd @@ -64,7 +64,7 @@ - + http://git-wip-us.apache.org/repos/asf/cxf/blob/326fa2ae/systests/jaxrs/src/test/resources/jaxrs_spring_discovery/WEB-INF/beans.xml ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/resources/jaxrs_spring_discovery/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_spring_discovery/WEB-INF/beans.xml index d6a7df6..2fbed1a 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_spring_discovery/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_spring_discovery/WEB-INF/beans.xml @@ -28,5 +28,5 @@ http://cxf.apache.org/schemas/jaxrs.xsd"> - + http://git-wip-us.apache.org/repos/asf/cxf/blob/326fa2ae/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml index d455441..c6956c3 100644 --- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml +++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml @@ -26,7 +26,7 @@ under the License. http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd"> - +