Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INTSAMPLES-121: Upgrade to SI 3.0 and SPR 3.2.6

Browse Source 
JIRA: https://jira.springsource.org/browse/INTSAMPLES-121
This commit is contained in:
Artem Bilan
2013-12-16 10:53:29 +02:00
parent ed736aa499
commit ddbfc4479c
53 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intermediate/async-gateway/pom.xml
View File

@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
intermediate/dynamic-poller/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<java.main.class>org.springframework.integration.samples.poller.Main</java.main.class>

2
intermediate/errorhandling/pom.xml
View File

@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

4
intermediate/file-processing/pom.xml
View File

@@ -7,7 +7,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -57,4 +57,4 @@
<url>https://repo.springsource.org/libs-milestone</url>
</repository>
</repositories>
</project>
</project>

2
intermediate/mail-attachments/pom.xml
View File

@@ -8,7 +8,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
intermediate/monitoring/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<org.springframework-version>3.1.3.RELEASE</org.springframework-version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>

4
intermediate/multipart-http/pom.xml
View File

@@ -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>

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

@@ -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>

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

@@ -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());
}

6
intermediate/rest-http/pom.xml
View File

@@ -13,9 +13,9 @@
</prerequisites>
<properties>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.version>3.1.3.RELEASE</spring.version>
<spring.security.version>3.1.3.RELEASE</spring.security.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.security.version>3.1.4.RELEASE</spring.security.version>
<commons-fileupload>1.2</commons-fileupload>
<commons-io>1.3.2</commons-io>
<log4j.version>1.2.17</log4j.version>

96
intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml
View File

@@ -2,75 +2,75 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:oxm="http://www.springframework.org/schema/oxm"
xmlns:oxm="http://www.springframework.org/schema/oxm"
xmlns:int-http="http://www.springframework.org/schema/integration/http">
<int:annotation-config/>
<!-- handler mapping implementation that is aware of inbound Spring Integration
http inbound gateway's and inbound adapter's with "path" attributes -->
<bean class="org.springframework.integration.http.inbound.UriPathHandlerMapping"/>
<!-- Inbound/Outbound Channels -->
<int:channel id="employeeSearchRequest" />
<int:channel id="employeeSearchResponse" />
<int-http:inbound-gateway id="inboundEmployeeSearchRequestGateway"
supported-methods="GET, POST"
<int-http:inbound-gateway id="inboundEmployeeSearchRequestGateway"
supported-methods="GET, POST"
request-channel="employeeSearchRequest"
reply-channel="employeeSearchResponse"
mapped-response-headers="Return-Status, Return-Status-Msg, HTTP_RESPONSE_HEADERS"
view-name="/employee"
reply-channel="employeeSearchResponse"
mapped-response-headers="Return-Status, Return-Status-Msg, HTTP_RESPONSE_HEADERS"
view-name="/employee"
path="/services/employee/{id}/search"
reply-timeout="50000">
<int-http:header name="employeeId" expression="#pathVariables.id"/>
</int-http:inbound-gateway>
<!-- Note: The default parameter name for favorParameter is 'format'. For instance, when this flag is true, a request for /services/employee/{id}/search?format=json will result
<!-- Note: The default parameter name for favorParameter is 'format'. For instance, when this flag is true, a request for /services/employee/{id}/search?format=json will result
in an MappingJacksonJsonView being resolved, while the Accept header can be the browser-defined text/html,application/xhtml+xml -->
<bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
<property name="order" value="1" />
<property name="defaultContentType" value="application/xml"/>
<property name="favorParameter" value="true"/>
<property name="ignoreAcceptHeader" value="true" />
<property name="mediaTypes">
<map>
<entry key="json" value="application/json" />
<entry key="xml" value="application/xml" />
</map>
<property name="order" value="1" />
<property name="contentNegotiationManager">
<bean class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
<property name="defaultContentType" value="application/xml"/>
<property name="favorParameter" value="true"/>
<property name="ignoreAcceptHeader" value="true" />
<property name="mediaTypes">
<map>
<entry key="json" value="application/json" />
<entry key="xml" value="application/xml" />
</map>
</property>
</bean>
</property>
<property name="defaultViews">
<list>
<bean
class="org.springframework.integration.samples.rest.json.view.ExtendedMappingJacksonJsonView" >
<property name="objectMapper" ref="jaxbJacksonObjectMapper"/>
</bean>
</bean>
<bean class="org.springframework.web.servlet.view.xml.MarshallingView">
<constructor-arg ref="marshaller"/>
</bean>
<constructor-arg ref="marshaller"/>
</bean>
</list>
</property>
</property>
</bean>
<oxm:jaxb2-marshaller id="marshaller" contextPath="org.springframework.integration.samples.rest.domain" />
<int:service-activator id="employeeServiceActivator"
input-channel="employeeSearchRequest"
output-channel="employeeSearchResponse"
ref="employeeSearchService"
method="getEmployee"
requires-reply="true"
send-timeout="60000"/>
<bean id="jaxbJacksonObjectMapper" class="org.springframework.integration.samples.rest.json.JaxbJacksonObjectMapper"/>
</beans>
<oxm:jaxb2-marshaller id="marshaller" contextPath="org.springframework.integration.samples.rest.domain" />
<int:service-activator id="employeeServiceActivator"
input-channel="employeeSearchRequest"
output-channel="employeeSearchResponse"
ref="employeeSearchService"
method="getEmployee"
requires-reply="true"
send-timeout="60000"/>
<bean id="jaxbJacksonObjectMapper" class="org.springframework.integration.samples.rest.json.JaxbJacksonObjectMapper"/>
</beans>

2
intermediate/retry-and-more/pom.xml
View File

@@ -15,7 +15,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

6
intermediate/splitter-aggregator-reaper/pom.xml
View File

@@ -20,11 +20,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.0.RC2</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.10</junit.version>
<inject.version>1</inject.version>
<spring.version>3.1.2.RELEASE</spring.version>
<spring.version>3.2.6.RELEASE</spring.version>
</properties>
<repositories>
@@ -98,4 +98,4 @@
<version>${spring.version}</version>
</dependency>
</dependencies>
</project>
</project>

2
intermediate/stored-procedures-derby/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
intermediate/stored-procedures-ms/pom.xml
View File

@@ -17,7 +17,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
intermediate/stored-procedures-oracle/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.2.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

4
intermediate/tcp-client-server-multiplex/pom.xml
View File

@@ -14,8 +14,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.1.3.RELEASE</spring.version>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

4
intermediate/travel/pom.xml
View File

@@ -12,10 +12,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<spring.version>3.1.3.RELEASE</spring.version>
<spring.version>3.2.6.RELEASE</spring.version>
<java.main.class>org.springframework.integration.samples.travel.Main</java.main.class>
</properties>
<dependencies>

2
intermediate/tx-synch/pom.xml
View File

@@ -15,7 +15,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>