INTSAMPLES-125/126:SF 3.2.7, SI 3.0.1; Schemas
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:
committed by
Gary Russell
parent
56aee6fd91
commit
e20219560f
@@ -14,8 +14,8 @@
|
||||
|
||||
<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>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.11</junit.version>
|
||||
</properties>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
<packaging>jar</packaging>
|
||||
<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>
|
||||
@@ -16,7 +16,7 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<version>${spring.framework.version}</version>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.integration</groupId>
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
|
||||
<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>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
</properties>
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
|
||||
<spring.core.version>3.1.3.RELEASE</spring.core.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>
|
||||
@@ -30,12 +30,12 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-tx</artifactId>
|
||||
<version>${spring.core.version}</version>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<version>${spring.core.version}</version>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.integration</groupId>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<name>Samples (Applications) - Loan Broker</name>
|
||||
<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>
|
||||
<commons-logging.version>1.1.1</commons-logging.version>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
|
||||
@@ -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>
|
||||
<aspectj.version>1.6.10</aspectj.version>
|
||||
<slf4j.version>1.6.1</slf4j.version>
|
||||
</properties>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -12,7 +12,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>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -14,7 +14,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.helloworld.HelloWorldApp</java.main.class>
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
<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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
<activemq.version>5.7.0</activemq.version>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
@@ -44,7 +45,7 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-jms</artifactId>
|
||||
<version>3.1.3.RELEASE</version>
|
||||
<version>${spring.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
xmlns:stream="http://www.springframework.org/schema/integration/stream"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
|
||||
http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.0.xsd
|
||||
http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.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
|
||||
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
|
||||
@@ -28,8 +28,8 @@
|
||||
|
||||
<si:filter input-channel="seconds" expression="payload >= 10" output-channel="reset"/>
|
||||
|
||||
<jmx:operation-invoking-channel-adapter id="reset"
|
||||
<jmx:operation-invoking-channel-adapter id="reset"
|
||||
object-name="org.springframework.integration.samples.jmx:type=StopWatch,name=stopWatch"
|
||||
operation-name="reset"/>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
<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>
|
||||
<openjpa.version>2.2.0</openjpa.version>
|
||||
<eclipselink.version>2.3.2</eclipselink.version>
|
||||
<hibernate.version>4.0.1.Final</hibernate.version>
|
||||
<spring-instrument.version>3.1.3.RELEASE</spring-instrument.version>
|
||||
</properties>
|
||||
|
||||
<repositories>
|
||||
@@ -33,14 +33,8 @@
|
||||
</repository>
|
||||
<repository>
|
||||
<id>repo.eclipse</id>
|
||||
<name>Spring Framework Maven Milestone Repository</name>
|
||||
<url> http://download.eclipse.org/rt/eclipselink/maven.repo/</url>
|
||||
<snapshots><enabled></enabled></snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>central</id>
|
||||
<name>Maven Central</name>
|
||||
<url>http://repo1.maven.org/maven</url>
|
||||
<name>EclipseLink Maven Repository</name>
|
||||
<url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
@@ -65,7 +59,7 @@
|
||||
<configuration>
|
||||
<executable>java</executable>
|
||||
<arguments>
|
||||
<argument>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring-instrument.version}/spring-instrument-${spring-instrument.version}.jar</argument>
|
||||
<argument>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar</argument>
|
||||
<argument>-javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argument>
|
||||
<argument>-classpath</argument>
|
||||
<classpath></classpath>
|
||||
@@ -104,7 +98,7 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-instrument</artifactId>
|
||||
<version>${spring-instrument.version}</version>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Logging -->
|
||||
|
||||
@@ -12,7 +12,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>
|
||||
|
||||
@@ -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>
|
||||
@@ -25,7 +25,7 @@
|
||||
<repository>
|
||||
<id>repo.springsource.org.milestone</id>
|
||||
<name>Spring Framework Maven Milestone Repository</name>
|
||||
<url>https://repo.springsource.org/milestone</url>
|
||||
<url>https://repo.spring.io/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
xmlns:int="http://www.springframework.org/schema/integration"
|
||||
xmlns:int-mongodb="http://www.springframework.org/schema/integration/mongodb"
|
||||
xmlns:mongo="http://www.springframework.org/schema/data/mongo"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd
|
||||
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.2.xsd
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
|
||||
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd">
|
||||
http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
|
||||
|
||||
|
||||
<mongo:db-factory id="mongoDbFactory" dbname="test"/>
|
||||
|
||||
<int-mongodb:inbound-channel-adapter id="simpleInboundAdapter" channel="splittingChannel"
|
||||
|
||||
<int-mongodb:inbound-channel-adapter id="simpleInboundAdapter" channel="splittingChannel"
|
||||
query="{address.state : 'CA'}">
|
||||
<int:poller fixed-rate="60000" max-messages-per-poll="1"/>
|
||||
</int-mongodb:inbound-channel-adapter>
|
||||
|
||||
|
||||
<int:splitter input-channel="splittingChannel" output-channel="logger"/>
|
||||
|
||||
|
||||
<int:logging-channel-adapter id="logger" level="WARN"/>
|
||||
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
xmlns:int="http://www.springframework.org/schema/integration"
|
||||
xmlns:int-mongodb="http://www.springframework.org/schema/integration/mongodb"
|
||||
xmlns:mongo="http://www.springframework.org/schema/data/mongo"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd
|
||||
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.2.xsd
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
|
||||
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd">
|
||||
http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
|
||||
|
||||
|
||||
<mongo:db-factory id="mongoDbFactory" dbname="test"/>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
|
||||
@@ -33,6 +33,8 @@
|
||||
<module>ws-outbound-gateway</module>
|
||||
<module>xml</module>
|
||||
<module>xmpp</module>
|
||||
<module>mongodb</module>
|
||||
<module>tcp-amqp</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
|
||||
@@ -16,8 +16,7 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<spring.amqp.version>1.1.3.RELEASE</spring.amqp.version>
|
||||
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
|
||||
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
|
||||
<slf4j.version>1.6.4</slf4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
</properties>
|
||||
@@ -105,12 +104,6 @@
|
||||
<artifactId>spring-integration-ip</artifactId>
|
||||
<version>${spring.integration.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.amqp</groupId>
|
||||
<artifactId>spring-rabbit</artifactId>
|
||||
<version>${spring.amqp.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Logging -->
|
||||
|
||||
<dependency>
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
<java.main.class>org.springframework.integration.samples.tcpclientserver.Main</java.main.class>
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
</properties>
|
||||
|
||||
@@ -12,7 +12,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>
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
</properties>
|
||||
@@ -32,6 +32,7 @@
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-test</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
<saaj.version>1.3.19</saaj.version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
|
||||
@@ -12,7 +12,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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 -->
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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" />
|
||||
|
||||
Reference in New Issue
Block a user