DUBBO-408 Spring2.0兼容问题

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@1830 1a56cb94-b969-4eaa-88fa-be21384802f2
ifei76 · May 22, 2012 · b27149a · b27149a
1 parent 859acc0
commit b27149a
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...onfig/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ProviderBean.java b/...onfig/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ProviderBean.java
@@ -24,7 +24,7 @@
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.ClassPathBeanDefinitionScanner;
@@ -77,11 +77,16 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
         if (annotationPackage == null || annotationPackage.length() == 0) {
             return;
         }
-        ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner((DefaultListableBeanFactory) beanFactory);
-        scanner.addIncludeFilter(new AnnotationTypeFilter(Service.class));
-        String[] pkgs = Constants.COMMA_SPLIT_PATTERN.split(annotationPackage);
-        for (String pkg : pkgs) {
-            scanner.scan(pkg);
+        if (beanFactory instanceof BeanDefinitionRegistry) {
+            try {
+                Class.forName("org.springframework.context.annotation.ClassPathBeanDefinitionScanner", true, Thread.currentThread().getContextClassLoader());
+                ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner((BeanDefinitionRegistry) beanFactory);
+                scanner.addIncludeFilter(new AnnotationTypeFilter(Service.class));
+                String[] pkgs = Constants.COMMA_SPLIT_PATTERN.split(annotationPackage);
+                scanner.scan(pkgs);
+            } catch (ClassNotFoundException e) {
+                // spring 2.0
+            }
         }
     }