From b2c7a45dcf9a2ff74f9861b4b21cbd95f6f26e22 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 8 Aug 2011 17:24:53 -0400
Subject: [PATCH] INT-1951, INT-1981 cleaned up the test and changed the
 template.mf to reflect the lowest version of Spring-WS to be 2.0.0

---
 .../WebServiceInboundGatewayParserTests.java  | 24 +++++++++----------
 spring-integration-ws/template.mf             |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
index efa102ad76..a22c7b0c1c 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
@@ -16,14 +16,6 @@
 
 package org.springframework.integration.ws.config;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
@@ -33,7 +25,6 @@ import javax.xml.transform.Source;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,7 +32,6 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.MessageHeaders;
 import org.springframework.integration.core.PollableChannel;
-import org.springframework.integration.gateway.MessagingGatewaySupport;
 import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.mapping.HeaderMapper;
 import org.springframework.integration.test.util.TestUtils;
@@ -55,6 +45,16 @@ import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapHeader;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.junit.Assert.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * @author Iwein Fuld
  * @author Oleg Zhurakousky
@@ -131,9 +131,7 @@ public class WebServiceInboundGatewayParserTests {
 		assertThat((AbstractMarshaller) accessor.getPropertyValue("unmarshaller"),
 				is(marshaller));
 		assertTrue("messaging gateway is not running", marshallingGateway.isRunning());
-		
-		//MessagingGatewaySupport mgs = (MessagingGatewaySupport) accessor.getPropertyValue("gatewayDelegate");
-		//DirectFieldAccessor mgsAccessor = new DirectFieldAccessor(mgs);
+
 		assertThat(
 				(MessageChannel) accessor.getPropertyValue("errorChannel"),
 				is(customErrorChannel));
diff --git a/spring-integration-ws/template.mf b/spring-integration-ws/template.mf
index a13c014d5e..ed5de28200 100644
--- a/spring-integration-ws/template.mf
+++ b/spring-integration-ws/template.mf
@@ -11,7 +11,7 @@ Import-Template:
  org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
  org.springframework.util;version="[3.1.0, 4.0.0)",
  org.springframework.oxm;version="[1.5.9, 3.1.0)",
- org.springframework.ws.*;version="[1.5.9, 2.1.0)",
+ org.springframework.ws.*;version="[2.0.0, 2.1.0)",
  org.springframework.xml.*;version="[1.5.9, 2.1.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0",