cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1411075 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Date Mon, 19 Nov 2012 06:13:03 GMT
Author: ffang
Date: Mon Nov 19 06:13:02 2012
New Revision: 1411075

URL: http://svn.apache.org/viewvc?rev=1411075&view=rev
Log:
Merged revisions 1411074 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1411074 | ffang | 2012-11-19 14:06:12 +0800 (一, 19 11 2012) | 13 lines
  
  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.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=1411075&r1=1411074&r2=1411075&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:13:02 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
         }



Mime
View raw message