svn commit: r1411078 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java

[ffang]

Author: ffang
Date: Mon Nov 19 06:42:48 2012
New Revision: 1411078

URL: http://svn.apache.org/viewvc?rev=1411078&view=rev
Log:
[CXF-4640]rollback change on 2.5.x branch as it still use all-in-one cxf bundle

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/
------------------------------------------------------------------------------
  Reverse-merged /cxf/trunk:r1411067-1411068
  Reverse-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=1411078&r1=1411077&r2=1411078&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:42:48 2012
@@ -48,7 +48,6 @@ 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 {
@@ -178,7 +177,8 @@ public class EndpointDefinitionParser ex
     public static final void setBlocking(ApplicationContext ctx, EndpointImpl 
impl) {
         Class<?> cls = null;
         try {
-            cls = 
Class.forName(CommonAnnotationBeanPostProcessor.class.getName());
+            cls = Class
+                
.forName("org.springframework.context.annotation.CommonAnnotationBeanPostProcessor");
         } catch (ClassNotFoundException e) {
             //ignore
         }