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 C3795200B29 for ; Thu, 30 Jun 2016 22:55:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C228B160A52; Thu, 30 Jun 2016 20:55:48 +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 16929160A06 for ; Thu, 30 Jun 2016 22:55:47 +0200 (CEST) Received: (qmail 93590 invoked by uid 500); 30 Jun 2016 20:55:47 -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 93581 invoked by uid 99); 30 Jun 2016 20:55:47 -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, 30 Jun 2016 20:55:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED118DFF03; Thu, 30 Jun 2016 20:55:46 +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: Minor changes to class scan utilities Date: Thu, 30 Jun 2016 20:55:46 +0000 (UTC) archived-at: Thu, 30 Jun 2016 20:55:48 -0000 Repository: cxf Updated Branches: refs/heads/master 9c5b14dbc -> 1a621886f Minor changes to class scan utilities Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a621886 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a621886 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a621886 Branch: refs/heads/master Commit: 1a621886ff0c509f0a1d1eca9cfd38b27b256bb6 Parents: 9c5b14d Author: Sergey Beryozkin Authored: Thu Jun 30 21:55:18 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Jun 30 21:55:18 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/common/util/ClasspathScanner.java | 2 +- .../java/org/apache/cxf/common/util/SpringClasspathScanner.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1a621886/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java index cc43731..7b4c34a 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java +++ b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java @@ -75,7 +75,7 @@ public class ClasspathScanner { public static Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClasses( String basePackage, Class< ? extends Annotation > ... annotations) throws IOException, ClassNotFoundException { - return findClasses(Collections.singletonList(basePackage), + return findClasses(parsePackages(basePackage), Collections.unmodifiableList(Arrays.asList(annotations))); } http://git-wip-us.apache.org/repos/asf/cxf/blob/1a621886/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java index e8dd183..650e793 100644 --- a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java +++ b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java @@ -85,8 +85,8 @@ class SpringClasspathScanner extends ClasspathScanner { for (final String basePackage: basePackages) { final boolean scanAllPackages = basePackage.equals(WILDCARD); final String packageSearchPath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + (scanAllPackages ? "" : basePackage.contains(WILDCARD) ? basePackage - : ClassUtils.convertClassNameToResourcePath(basePackage)) + ALL_CLASS_FILES; + + (scanAllPackages ? "" : ClassUtils.convertClassNameToResourcePath(basePackage)) + + ALL_CLASS_FILES; final Resource[] resources = resolver.getResources(packageSearchPath);