From c73d3df3e11059499c13b8272186f2bbfc3a505a Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Sun, 17 Feb 2008 02:29:00 +0000
Subject: [PATCH] Improved logging.

---
 .../ws/client/support/WebServiceAccessor.java | 11 +++++++--
 ...ebServiceMessageReceiverObjectSupport.java |  2 +-
 .../http/WEB-INF/spring-ws-servlet.xml        | 23 -------------------
 3 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/spring-ws-servlet.xml

diff --git a/core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java b/core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
index a317d9fa..ad2a4afd 100644
--- a/core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
+++ b/core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
@@ -18,6 +18,7 @@ package org.springframework.ws.client.support;
 
 import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
@@ -103,10 +104,16 @@ public abstract class WebServiceAccessor extends TransformerObjectSupport implem
         WebServiceMessageSender[] messageSenders = getMessageSenders();
         for (int i = 0; i < messageSenders.length; i++) {
             if (messageSenders[i].supports(uri)) {
+                WebServiceConnection connection = messageSenders[i].createConnection(uri);
                 if (logger.isDebugEnabled()) {
-                    logger.debug("Opening connection to [" + uri + "] using [" + messageSenders[i] + "]");
+                    try {
+                        logger.debug("Opening [" + connection + "] to [" + connection.getUri() + "]");
+                    }
+                    catch (URISyntaxException e) {
+                        // ignore
+                    }
                 }
-                return messageSenders[i].createConnection(uri);
+                return connection;
             }
         }
         throw new IllegalArgumentException("Could not resolve [" + uri + "] to a WebServiceMessageSender");
diff --git a/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java b/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
index ecfd4060..e20b6782 100644
--- a/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
+++ b/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
@@ -111,7 +111,7 @@ public abstract class WebServiceMessageReceiverObjectSupport implements Initiali
     private void logUri(WebServiceConnection connection) {
         if (logger.isDebugEnabled()) {
             try {
-                logger.debug("Incoming connection [" + connection.getUri() + "]");
+                logger.debug("Accepting incoming [" + connection + "] to [" + connection.getUri() + "]");
             }
             catch (URISyntaxException e) {
                 // ignore
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/spring-ws-servlet.xml b/core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/spring-ws-servlet.xml
deleted file mode 100644
index ab47629b..00000000
--- a/core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/spring-ws-servlet.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-    <bean id="payloadMapping" class="org.springframework.ws.soap.server.endpoint.mapping.SoapActionEndpointMapping">
-        <property name="mappings">
-            <props>
-                <prop key="http://springframework.org/spring-ws/NoResponse">noResponseEndpoint</prop>
-                <prop key="http://springframework.org/spring-ws/Response">responseEndpoint</prop>
-                <prop key="http://springframework.org/spring-ws/Fault">faultEndpoint</prop>
-            </props>
-        </property>
-    </bean>
-
-    <bean id="noResponseEndpoint"
-          class="org.springframework.ws.transport.http.NoResponseEndpoint"/>
-
-    <bean id="responseEndpoint"
-          class="org.springframework.ws.transport.http.ResponseEndpoint"/>
-
-    <bean id="faultEndpoint"
-          class="org.springframework.ws.transport.http.FaultEndpoint"/>
-
-</beans>