From b7cd90a24a12b43da89cf269cea0eaf1ebe1684b Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Sun, 7 Oct 2007 13:07:33 +0000
Subject: [PATCH]

---
 .../ws/soap/addressing/AbstractWsAddressingMapping.java      | 3 ---
 .../ws/soap/addressing/{version => }/WsAddressing200408.java | 2 +-
 .../ws/soap/addressing/{version => }/WsAddressing200605.java | 2 +-
 .../ws/soap/addressing/WsAddressingInterceptor.java          | 1 -
 .../springframework/ws/soap/addressing/version/package.html  | 5 -----
 5 files changed, 2 insertions(+), 11 deletions(-)
 rename sandbox/src/main/java/org/springframework/ws/soap/addressing/{version => }/WsAddressing200408.java (97%)
 rename sandbox/src/main/java/org/springframework/ws/soap/addressing/{version => }/WsAddressing200605.java (97%)
 delete mode 100644 sandbox/src/main/java/org/springframework/ws/soap/addressing/version/package.html

diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingMapping.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingMapping.java
index 2c40c8c1..fef8940c 100644
--- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingMapping.java
+++ b/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingMapping.java
@@ -31,9 +31,6 @@ import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy;
 import org.springframework.ws.soap.addressing.messageid.UidMessageIdStrategy;
 import org.springframework.ws.soap.addressing.messageid.UuidMessageIdStrategy;
-import org.springframework.ws.soap.addressing.version.WsAddressing200408;
-import org.springframework.ws.soap.addressing.version.WsAddressing200605;
-import org.springframework.ws.soap.addressing.version.WsAddressingVersion;
 import org.springframework.ws.soap.server.SoapEndpointInvocationChain;
 import org.springframework.ws.soap.server.SoapEndpointMapping;
 import org.springframework.ws.transport.WebServiceMessageSender;
diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/version/WsAddressing200408.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java
similarity index 97%
rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/version/WsAddressing200408.java
rename to sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java
index 7f7eda97..5de937f9 100644
--- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/version/WsAddressing200408.java
+++ b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.addressing.version;
+package org.springframework.ws.soap.addressing;
 
 import javax.xml.namespace.QName;
 
diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/version/WsAddressing200605.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java
similarity index 97%
rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/version/WsAddressing200605.java
rename to sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java
index 9e4ac02e..abea6c62 100644
--- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/version/WsAddressing200605.java
+++ b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.soap.addressing.version;
+package org.springframework.ws.soap.addressing;
 
 import javax.xml.namespace.QName;
 
diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingInterceptor.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingInterceptor.java
index 3abfc958..e312ff90 100644
--- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingInterceptor.java
+++ b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingInterceptor.java
@@ -25,7 +25,6 @@ import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy;
-import org.springframework.ws.soap.addressing.version.WsAddressingVersion;
 import org.springframework.ws.soap.server.SoapEndpointInterceptor;
 import org.springframework.ws.transport.WebServiceConnection;
 import org.springframework.ws.transport.WebServiceMessageSender;
diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/version/package.html b/sandbox/src/main/java/org/springframework/ws/soap/addressing/version/package.html
deleted file mode 100644
index 6ed08533..00000000
--- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/version/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Contains various implementations of the WS-Addressing specification.
-</body>
-</html>
\ No newline at end of file