cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Minor changes to class scan utilities
Date Thu, 30 Jun 2016 20:57:00 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 241868ec6 -> 845c3decb


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/845c3dec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/845c3dec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/845c3dec

Branch: refs/heads/3.1.x-fixes
Commit: 845c3decbf1221fde2ec5111d202fcaa78a76f06
Parents: 241868e
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Jun 30 21:55:18 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Jun 30 21:56:43 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/845c3dec/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/845c3dec/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);    
             


Mime
View raw message