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

[ffang]

Author: ffang
Date: Mon Nov 19 06:06:12 2012
New Revision: 1411074

URL: http://svn.apache.org/viewvc?rev=1411074&view=rev
Log:
Merged revisions 1411067-1411068 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1411067 | ffang | 2012-11-19 13:08:30 +0800 (一, 19 11 2012) | 1 line
  
  [CXF-4640]@PostConstruct methods invoked twice in Spring projects when using 
OSGi
........
  r1411068 | ffang | 2012-11-19 13:10:19 +0800 (一, 19 11 2012) | 1 line
  
  [CXF-4640]fix checkstyle
........

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

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

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

Modified: 
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=1411074&r1=1411073&r2=1411074&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
 Mon Nov 19 06:06:12 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
         }