From bd62e54013aaec940702d250d4ed5468f76dc3b3 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 19 May 2011 12:39:49 +0000
Subject: [PATCH] SWS-702 - sws:annotation-driven does not pick up @Endpoint
 annotations on classes that are JDK proxies

---
 .../ws/server/endpoint/mapping/LogAspect.java       |  4 ++--
 .../server/endpoint/mapping/applicationContext.xml  | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java
index bc2dceb2..26477e48 100644
--- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java
+++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java
@@ -40,11 +40,11 @@ public class LogAspect {
     }
 
     @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());
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml b/core/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml
index f6547aec..000e8fc2 100644
--- a/core/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml
+++ b/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>