Author: ffang
Date: Mon Nov 19 06:55:00 2012
New Revision: 1411082

URL: http://svn.apache.org/viewvc?rev=1411082&view=rev
Log:
[CXF-4640]still need apply same change as that on trunk, as this change also 
affect the all-in-on bundle maven-bundle-plugin so that package 
org.springframework.context.annotation can get added as well

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1411067-1411068
  Merged /cxf/branches/2.6.x-fixes:r1411074

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=1411082&r1=1411081&r2=1411082&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
 Mon Nov 19 06:55:00 2012
@@ -48,6 +48,7 @@ import org.springframework.beans.factory
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import 
org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
 
 
 public class EndpointDefinitionParser extends AbstractBeanDefinitionParser {
@@ -177,8 +178,7 @@ public class EndpointDefinitionParser ex
     public static final void setBlocking(ApplicationContext ctx, EndpointImpl 
impl) {
         Class<?> cls = null;
         try {
-            cls = Class
-                
.forName("org.springframework.context.annotation.CommonAnnotationBeanPostProcessor");
+            cls = 
Class.forName(CommonAnnotationBeanPostProcessor.class.getName());
         } catch (ClassNotFoundException e) {
             //ignore
         }


Reply via email to