INTSAMPLES-121: Upgrade to SI 3.0 and SPR 3.2.6

JIRA: https://jira.springsource.org/browse/INTSAMPLES-121

intermediate/multipart-http/pom.xml

@@ -8,8 +8,8 @@
 	<packaging>war</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<commons-fileupload>1.2.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.17</log4j.version>

intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml

@@ -9,17 +9,17 @@
 	xmlns:int-file="http://www.springframework.org/schema/integration/file"
 	xmlns:int-http="http://www.springframework.org/schema/integration/http">
 
-	
-	<int-http:inbound-channel-adapter id="httpInboundAdapter" 
-									  channel="receiveChannel" 
-									  name="/inboundAdapter.htm" 
+
+	<int-http:inbound-channel-adapter id="httpInboundAdapter"
+									  channel="receiveChannel"
+									  path="/inboundAdapter.htm"
 									  supported-methods="GET, POST" />
-	
+
 	<int:channel id="receiveChannel"/>
-	
+
 	<int:service-activator id="multipartReceiver" input-channel="receiveChannel">
 		<bean class="org.springframework.integration.samples.multipart.MultipartReceiver"/>
 	</int:service-activator>
-	
+
 	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
 </beans>

intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java

@@ -32,7 +32,7 @@ import org.springframework.web.client.RestTemplate;
  *
  */
 public class MultipartRestClient {
-	
+
 	private static Logger logger = Logger.getLogger(MultipartRestClient.class);
 	private static String uri = "http://localhost:8080/multipart-http/inboundAdapter.htm";
 	private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png";
@@ -51,7 +51,7 @@ public class MultipartRestClient {
 		headers.setContentType(new MediaType("multipart", "form-data"));
 		HttpEntity<Object> request = new HttpEntity<Object>(multipartMap, headers);
 		logger.info("Posting request to: " + uri);
-		ResponseEntity<?> httpResponse = template.exchange(uri, HttpMethod.POST, request, null);
+		ResponseEntity<?> httpResponse = template.exchange(uri, HttpMethod.POST, request, Object.class);
 		if (!httpResponse.getStatusCode().equals(HttpStatus.OK)){
 			logger.error("Problems with the request. Http status: " + httpResponse.getStatusCode());
 		}