From f1b913df00eb99200cae3e59af4d5717a3da6368 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 14 Jul 2010 07:23:26 +0000
Subject: [PATCH] Moving client2 to client

---
 .../java/org/springframework/ws/mock/client/DiffMatcher.java  | 2 +-
 .../springframework/ws/mock/client/ErrorResponseCallback.java | 2 +-
 .../ws/mock/client/ExceptionResponseCallback.java             | 2 +-
 .../springframework/ws/mock/client/MockSenderConnection.java  | 2 +-
 .../ws/mock/client/MockWebServiceMessageSender.java           | 2 +-
 .../ws/mock/client/MockWebServiceMessageSenderHolder.java     | 2 +-
 .../org/springframework/ws/mock/client/PayloadMatcher.java    | 2 +-
 .../ws/mock/client/PayloadResponseCallback.java               | 2 +-
 .../org/springframework/ws/mock/client/RequestMatcher.java    | 2 +-
 .../org/springframework/ws/mock/client/ResponseActions.java   | 2 +-
 .../org/springframework/ws/mock/client/ResponseCallback.java  | 2 +-
 .../ws/mock/client/SoapFaultResponseCallback.java             | 2 +-
 .../org/springframework/ws/mock/client/SoapHeaderMatcher.java | 2 +-
 .../java/org/springframework/ws/mock/client/UriMatcher.java   | 2 +-
 .../org/springframework/ws/mock/client/WebServiceMock.java    | 2 +-
 .../ws/mock/client/ExceptionResponseCallbackTest.java         | 2 +-
 .../springframework/ws/mock/client/PayloadMatcherTest.java    | 2 +-
 .../ws/mock/client/SoapFaultResponseCallbackTest.java         | 2 +-
 .../springframework/ws/mock/client/SoapHeaderMatcherTest.java | 2 +-
 .../springframework/ws/mock/client/WebServiceMockTest.java    | 4 ++--
 .../ws/mock/client/integration/CustomerCountRequest.java      | 2 +-
 .../ws/mock/client/integration/CustomerCountResponse.java     | 2 +-
 .../ws/mock/client/integration/IntegrationTest.java           | 4 ++--
 .../ws/mock/client/integration/integration-test.xml           | 4 ++--
 24 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/test/src/main/java/org/springframework/ws/mock/client/DiffMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/DiffMatcher.java
index 8eb06458..1ef744e6 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/DiffMatcher.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/DiffMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java
index 66cd932c..a649a0a4 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java
index a00c7548..76257adb 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 
diff --git a/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
index 950ab55c..c9931125 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSender.java b/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSender.java
index 742fb7ee..caf6da5f 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSender.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSender.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSenderHolder.java b/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSenderHolder.java
index 6fc99fa2..898d80e8 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSenderHolder.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSenderHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import org.springframework.core.NamedThreadLocal;
 
diff --git a/test/src/main/java/org/springframework/ws/mock/client/PayloadMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/PayloadMatcher.java
index aa8129b2..ed9a0f28 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/PayloadMatcher.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/PayloadMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
index 0b4955e5..cb480d63 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import javax.xml.transform.Source;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/RequestMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/RequestMatcher.java
index e2bef32d..c309560b 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/RequestMatcher.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/RequestMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ResponseActions.java b/test/src/main/java/org/springframework/ws/mock/client/ResponseActions.java
index 4e493786..ddf01261 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/ResponseActions.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/ResponseActions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 /**
  * Allows for setting up responses. Implementations of this interface are returned by {@link WebServiceMock}.
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java
index 54f5396b..3080ba2f 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 
diff --git a/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
index 4ce4bb2f..94b84492 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.util.Locale;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/SoapHeaderMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/SoapHeaderMatcher.java
index 6c6d1002..354b32e5 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/SoapHeaderMatcher.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/SoapHeaderMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/UriMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/UriMatcher.java
index 684bb3de..0c8ca8ce 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/UriMatcher.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/UriMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.net.URI;
 
diff --git a/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java b/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
index 8a3b618e..9507dc0e 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java
index d141039c..fd89feac 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 
diff --git a/test/src/test/java/org/springframework/ws/mock/client/PayloadMatcherTest.java b/test/src/test/java/org/springframework/ws/mock/client/PayloadMatcherTest.java
index 8ac77af4..ada14ce2 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/PayloadMatcherTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/PayloadMatcherTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.xml.transform.StringSource;
diff --git a/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
index 181de95e..10e704cc 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.util.Locale;
diff --git a/test/src/test/java/org/springframework/ws/mock/client/SoapHeaderMatcherTest.java b/test/src/test/java/org/springframework/ws/mock/client/SoapHeaderMatcherTest.java
index 6ba66c2f..e9bfa517 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/SoapHeaderMatcherTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/SoapHeaderMatcherTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import javax.xml.namespace.QName;
 import javax.xml.soap.MessageFactory;
diff --git a/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java b/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java
index c487786d..38a96037 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2;
+package org.springframework.ws.mock.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -36,7 +36,7 @@ import org.junit.Test;
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.springframework.ws.mock.client2.WebServiceMock.*;
+import static org.springframework.ws.mock.client.WebServiceMock.*;
 
 public class WebServiceMockTest {
 
diff --git a/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountRequest.java b/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountRequest.java
index 7312924a..ca27fe72 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountRequest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2.integration;
+package org.springframework.ws.mock.client.integration;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountResponse.java b/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountResponse.java
index a4a917c5..f4a0eebb 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountResponse.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountResponse.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2.integration;
+package org.springframework.ws.mock.client.integration;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/test/src/test/java/org/springframework/ws/mock/client/integration/IntegrationTest.java b/test/src/test/java/org/springframework/ws/mock/client/integration/IntegrationTest.java
index 76459fb2..bbc30efe 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/integration/IntegrationTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/integration/IntegrationTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client2.integration;
+package org.springframework.ws.mock.client.integration;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
-import static org.springframework.ws.mock.client2.WebServiceMock.*;
+import static org.springframework.ws.mock.client.WebServiceMock.*;
 
 /**
  * Integration test for client-side WebService testing. In different package so we can't use the package-protected
diff --git a/test/src/test/resources/org/springframework/ws/mock/client/integration/integration-test.xml b/test/src/test/resources/org/springframework/ws/mock/client/integration/integration-test.xml
index dd9042e3..c059479e 100644
--- a/test/src/test/resources/org/springframework/ws/mock/client/integration/integration-test.xml
+++ b/test/src/test/resources/org/springframework/ws/mock/client/integration/integration-test.xml
@@ -12,8 +12,8 @@
     <bean id="marshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
         <property name="classesToBeBound">
             <list>
-                <value>org.springframework.ws.mock.client2.integration.CustomerCountRequest</value>
-                <value>org.springframework.ws.mock.client2.integration.CustomerCountResponse</value>
+                <value>org.springframework.ws.mock.client.integration.CustomerCountRequest</value>
+                <value>org.springframework.ws.mock.client.integration.CustomerCountResponse</value>
             </list>
         </property>
     </bean>