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

INTSAMPLES-125/126:SF 3.2.7, SI 3.0.1; Schemas

Browse Source 
JIRA: https://jira.springsource.org/browse/INTSAMPLES-125

Polishing some poms and enable all modules

INTSAMPLES-126: Fix XSD versions vulnerability

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

Polishing

Add dummy JUnit to monitoring "test".
This commit is contained in:
Artem Bilan
2014-01-31 12:11:46 +02:00
committed by Gary Russell
parent 56aee6fd91
commit e20219560f
63 changed files with 177 additions and 174 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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

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

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

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

@@ -8,7 +8,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -59,7 +60,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.1.3.RELEASE</version>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>

8
intermediate/monitoring/pom.xml
View File

@@ -16,8 +16,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<org.springframework-version>3.1.3.RELEASE</org.springframework-version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -78,13 +78,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework-version}</version>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${org.springframework-version}</version>
<version>${spring.version}</version>
</dependency>
<!-- Spring Integration -->

14
intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,9 @@
package org.springframework.integration;
import org.junit.Test;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -27,9 +30,16 @@ public class SpringIntegrationTest {
public static void main(String[] args) throws Exception {
new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", SpringIntegrationTest.class);
ConfigurableApplicationContext context =
new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", SpringIntegrationTest.class);
System.out.println("Hit Enter to terminate");
System.in.read();
context.close();
}
@Test
public void test() {
// no op for maven
}
}

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>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<commons-fileupload>1.2.2</commons-fileupload>
<commons-io>1.3.2</commons-io>
<log4j.version>1.2.17</log4j.version>

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

@@ -13,8 +13,8 @@
</prerequisites>
<properties>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.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>

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

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<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
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.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"
http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd"
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:oxm="http://www.springframework.org/schema/oxm"
xmlns:int-http="http://www.springframework.org/schema/integration/http">

14
intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml
View File

@@ -3,20 +3,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd">
http://www.springframework.org/schema/security/spring-security.xsd">
<security:global-method-security
secured-annotations="enabled" />
<!-- Configure Spring Security -->
<security:http auto-config="true" use-expressions="true" realm="REST HTTP Web Service" create-session="never">
<security:http-basic />
<security:intercept-url pattern='/services/employee/*' access="hasRole('ROLE_REST_HTTP_USER')" />
<security:http-basic />
<security:intercept-url pattern='/services/employee/*' access="hasRole('ROLE_REST_HTTP_USER')" />
</security:http>
<!-- In this example, we are using in memory authentication. The password encoder depends on
<!-- In this example, we are using in memory authentication. The password encoder depends on
Jasypt's String Digester to digest the password stored in users.properties -->
<security:authentication-manager alias="authenticationManager">
<security:authentication-provider>
@@ -47,4 +47,4 @@
<bean id="passwordEncoder" class="org.jasypt.spring.security3.PasswordEncoder">
<property name="stringDigester" ref="jasyptStringDigester"/>
</bean>
</beans>
</beans>

12
intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml
View File

@@ -4,13 +4,13 @@
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
http://www.springframework.org/schema/context/spring-context.xsd">
<import resource="security-config.xml" />
<import resource="classpath:META-INF/spring/integration/applicationContext-http-int.xml"/>
<context:component-scan base-package="org.springframework.integration.samples.rest"/>
</beans>
</beans>

20
intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml
View File

@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-http="http://www.springframework.org/schema/integration/http"
xmlns:oxm="http://www.springframework.org/schema/oxm"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.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
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<bean id="restTemplate" class="org.springframework.web.client.RestTemplate">
<property name="messageConverters">
<list>
@@ -25,11 +25,11 @@
</list>
</property>
</bean>
<context:component-scan base-package="org.springframework.integration.samples.rest"/>
<oxm:jaxb2-marshaller id="marshaller" contextPath="org.springframework.integration.samples.rest.domain" />
<bean id="jaxbJacksonObjectMapper" class="org.springframework.integration.samples.rest.json.JaxbJacksonObjectMapper"/>
</beans>

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

@@ -14,8 +14,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.framework.version}</version>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>

8
intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml
View File

@@ -4,7 +4,7 @@
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<int-stream:stdin-channel-adapter channel="inputChannel">
@@ -12,15 +12,15 @@
</int-stream:stdin-channel-adapter>
<int:channel id="inputChannel"/>
<int:service-activator input-channel="inputChannel"
<int:service-activator input-channel="inputChannel"
ref="conditionalService"
method="testCircuitBreaker">
<int:request-handler-advice-chain>
<ref bean="circuitBreakerAdvice" />
</int:request-handler-advice-chain>
</int:service-activator>
<int:channel id="failedChannel" />
<int:chain input-channel="failedChannel">

16
intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml
View File

@@ -6,12 +6,12 @@
xmlns:context="http://www.springframework.org/schema/context"
xmlns:int-file="http://www.springframework.org/schema/integration/file"
xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp"
xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd
xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:property-placeholder />
@@ -43,16 +43,16 @@
<bean id="mockSessionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.remote.session.SessionFactory" />
</bean>
<int:transformer input-channel="afterSuccessDeleteChannel" output-channel="goodResultChannel"
expression="'Removal of ' + inputMessage.payload.absolutePath + ' after transfer, result:' +
payload" />
<int:transformer input-channel="afterFailRenameChannel" output-channel="badResultChannel"
expression="'Renaming of ' + payload.failedMessage.payload.absolutePath + ' after failed transfer, result:' +
payload.evaluationResult" />
<int:logging-channel-adapter id="goodResultChannel" level="INFO" />
<int:logging-channel-adapter id="badResultChannel" level="ERROR"/>
</beans>

22
intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml
View File

@@ -5,10 +5,10 @@
xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
xmlns:int-amqp="http://www.springframework.org/schema/integration/amqp"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd
xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd
http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.1.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- From STDIN To RabbitMQ -->
@@ -18,13 +18,13 @@
</int-stream:stdin-channel-adapter>
<int:channel id="toRabbit" />
<int:chain input-channel="toRabbit">
<int:header-enricher>
<int:header name="uniqueId" expression="T(System).nanoTime()"/>
</int:header-enricher>
<int-amqp:outbound-channel-adapter mapped-request-headers="uniqueId"
amqp-template="amqpTemplate" exchange-name="si.test.exchange"
amqp-template="amqpTemplate" exchange-name="si.test.exchange"
routing-key="si.test.binding"/>
</int:chain>
@@ -32,24 +32,24 @@
<!-- From RabbitMQ To inputChannel -->
<int-amqp:inbound-channel-adapter channel="inputChannel"
mapped-request-headers="uniqueId"
mapped-request-headers="uniqueId"
queue-names="si.test.queue"
connection-factory="connectionFactory" />
<int:channel id="inputChannel"/>
<int:header-enricher input-channel="inputChannel" output-channel="toServiceChannel">
<int:header name="failingId" expression="headers['uniqueId'].toString()" />
</int:header-enricher>
<int:service-activator input-channel="toServiceChannel"
<int:service-activator input-channel="toServiceChannel"
ref="conditionalService"
method="testRetry">
<int:request-handler-advice-chain>
<ref bean="retryAdvice" />
</int:request-handler-advice-chain>
</int:service-activator>
<int:channel id="failedChannel" />
<int:chain input-channel="failedChannel">
@@ -89,9 +89,9 @@
</bean>
</property>
</bean>
<int:channel id="recoveryChannel" />
<int:chain input-channel="recoveryChannel">
<int:transformer expression="'permanently failed:' + payload.failedMessage.payload + ' handled by recovery'" />
<int-stream:stderr-channel-adapter append-newline="true"/>

14
intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml
View File

@@ -4,7 +4,7 @@
xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<int-stream:stdin-channel-adapter channel="inputChannel">
@@ -12,19 +12,19 @@
</int-stream:stdin-channel-adapter>
<int:channel id="inputChannel"/>
<int:header-enricher input-channel="inputChannel" output-channel="toServiceChannel">
<int:header name="failingId" expression="headers['id'].toString()" />
</int:header-enricher>
<int:service-activator input-channel="toServiceChannel"
<int:service-activator input-channel="toServiceChannel"
ref="conditionalService"
method="testRetry">
<int:request-handler-advice-chain>
<ref bean="retryAdvice" />
</int:request-handler-advice-chain>
</int:service-activator>
<int:channel id="failedChannel" />
<int:chain input-channel="failedChannel">
@@ -39,7 +39,7 @@
<beans profile="default">
<bean id="retryAdvice" class="org.springframework.integration.handler.advice.RequestHandlerRetryAdvice" />
</beans>
<!-- Retry advice, template with default 3 tries, exponential backoff, no recovery;
final failure will go to poller's error channel -->
<beans profile="backoff">
@@ -67,9 +67,9 @@
</bean>
</property>
</bean>
<int:channel id="recoveryChannel" />
<int:chain input-channel="recoveryChannel">
<int:transformer expression="'permanently failed:' + payload.failedMessage.payload + ' handled by recovery'" />
<int-stream:stderr-channel-adapter append-newline="true"/>

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

@@ -20,11 +20,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.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.2.6.RELEASE</spring.version>
<spring.version>3.2.7.RELEASE</spring.version>
</properties>
<repositories>
@@ -96,6 +96,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
View File

@@ -7,7 +7,7 @@
xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/jdbc file:///Users/hillert/dev/git/spring-integration/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd
http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/spring-integration-jdbc.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">

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.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<spring.integration.version>3.0.1.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>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.version>3.2.7.RELEASE</spring.version>
<java.main.class>org.springframework.integration.samples.travel.Main</java.main.class>
</properties>
<dependencies>

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

@@ -14,8 +14,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.framework.version}</version>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.framework.version}</version>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -92,7 +92,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<configuration>
<mainClass>${java.main.class}</mainClass>
<mainClass>org.springframework.integration.samples.advice.TransactionSynchronizationDemo</mainClass>
</configuration>
</plugin>
</plugins>
@@ -101,7 +101,7 @@
<repository>
<id>repo.springsource.org.milestone</id>
<name>Spring Framework Maven Milestone Repository</name>
<url>https://repo.springsource.org/libs-snapshot</url>
<url>https://repo.spring.io/libs-milestone</url>
</repository>
</repositories>
</project>

12
intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml
View File

@@ -10,7 +10,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.2.xsd
http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
@@ -30,20 +30,20 @@
</int-file:inbound-channel-adapter>
<int:transaction-synchronization-factory id="syncFactory">
<int:after-commit expression="payload.renameTo(payload.absolutePath + '.SUCCEEDED') ? payload + ' renamed after success' : payload + 'failed to rename after success'"
<int:after-commit expression="payload.renameTo(payload.absolutePath + '.SUCCEEDED') ? payload + ' renamed after success' : payload + 'failed to rename after success'"
channel="infoLogger" />
<int:after-rollback expression="payload.renameTo(payload.absolutePath + '.FAILED') ? payload + ' renamed after faiure' : payload + 'failed to rename after failure'"
channel="errorLogger" />
</int:transaction-synchronization-factory>
<int:channel id="inputChannel"/>
<int-file:file-to-string-transformer input-channel="inputChannel" output-channel="toServiceChannel" />
<int:service-activator input-channel="toServiceChannel"
<int:service-activator input-channel="toServiceChannel"
ref="conditionalService"
method="failIfTextIsFail" />
<int:logging-channel-adapter id="infoLogger" level="INFO" />
<int:logging-channel-adapter id="errorLogger" level="ERROR" />