SWS-702 - sws:annotation-driven does not pick up @endpoint annotations on classes that are JDK proxies

Author: poutsma

core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java

@@ -40,11 +40,11 @@ private void loggedMethod() {
     }
 
     @Around("loggedMethod()")
-    public void log(ProceedingJoinPoint joinPoint) throws Throwable {
+    public Object log(ProceedingJoinPoint joinPoint) throws Throwable {
         logInvoked = true;
         logger.info("Before: " + joinPoint.getSignature());
         try {
-            joinPoint.proceed();
+            return joinPoint.proceed();
         }
         finally {
             logger.info("After: " + joinPoint.getSignature());

core/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml

@@ -2,18 +2,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:sws="http://www.springframework.org/schema/web-services"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-    <aop:aspectj-autoproxy/>
-
-    <bean id="mapping"
-          class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping"/>
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+        http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
 
     <bean id="endpoint" class="org.springframework.ws.server.endpoint.mapping.PayloadRootEndpoint"/>
 
+    <aop:aspectj-autoproxy/>
+
     <bean id="other" class="org.springframework.ws.server.endpoint.mapping.OtherBean"/>
 
     <bean id="logAspect" class="org.springframework.ws.server.endpoint.mapping.LogAspect"/>
 
+    <sws:annotation-driven/>
+
 </beans>