You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/03/31 17:11:48 UTC
svn commit: r929579 - in /cxf/branches/2.2.x-fixes: ./
common/common/src/main/java/org/apache/cxf/common/util/ rt/frontend/simple/
rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/
rt/frontend/simple/src/test/java/org/apache/cxf/service/...
Author: dkulp
Date: Wed Mar 31 15:11:47 2010
New Revision: 929579
URL: http://svn.apache.org/viewvc?rev=929579&view=rev
Log:
Merged revisions 929568 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r929568 | dkulp | 2010-03-31 11:01:55 -0400 (Wed, 31 Mar 2010) | 2 lines
[CXF-2728] Try harder to determine classes for Spring AOP services
Patch from Bryan Stopp applied
........
Added:
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceInterceptor.java
- copied unchanged from r929568, cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceInterceptor.java
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java
- copied unchanged from r929568, cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
cxf/branches/2.2.x-fixes/rt/frontend/simple/pom.xml
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java?rev=929579&r1=929578&r2=929579&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java (original)
+++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java Wed Mar 31 15:11:47 2010
@@ -45,7 +45,10 @@ class SpringAopClassHelper extends Class
Object target = advised.getTargetSource().getTarget();
if (target == null) {
- return AopUtils.getTargetClass(o);
+ Class targetClass = AopUtils.getTargetClass(o);
+ if (targetClass != null) {
+ return targetClass;
+ }
} else {
return getRealClassInternal(target);
}
Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/pom.xml?rev=929579&r1=929578&r2=929579&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/pom.xml Wed Mar 31 15:11:47 2010
@@ -49,7 +49,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java?rev=929579&r1=929578&r2=929579&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java Wed Mar 31 15:11:47 2010
@@ -43,7 +43,6 @@ import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-
public class SpringBeansTest extends Assert {
@Test
@@ -78,6 +77,9 @@ public class SpringBeansTest extends Ass
bean = (ServerFactoryBean) ctx.getBean("simpleWithWSDL");
assertNotNull(bean);
assertEquals(bean.getWsdlLocation(), "org/apache/cxf/frontend/spring/simple.wsdl");
+
+ bean = (ServerFactoryBean) ctx.getBean("proxyBean");
+ assertNotNull(bean);
}
@Test
Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml?rev=929579&r1=929578&r2=929579&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml Wed Mar 31 15:11:47 2010
@@ -88,4 +88,12 @@ http://cxf.apache.org/simple http://cxf.
<soap:soapBinding mtomEnabled="true" version="1.2"/>
</simple:binding>
</simple:server>
+
+ <simple:server id="proxyBean"
+ serviceClass="org.apache.cxf.service.factory.HelloService"
+ address="http://localhost:8080/proxyBean" >
+ <simple:serviceBean>
+ <bean class="org.apache.cxf.service.factory.HelloServiceProxyFactory"/>
+ </simple:serviceBean>
+ </simple:server>
</beans>