INTSAMPLES-121: Upgrade to SI 3.0 and SPR 3.2.6
JIRA: https://jira.springsource.org/browse/INTSAMPLES-121
This commit is contained in:
@@ -14,8 +14,8 @@
|
||||
|
||||
<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>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.11</junit.version>
|
||||
</properties>
|
||||
@@ -122,4 +122,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -8,7 +8,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>
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
|
||||
<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>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
</properties>
|
||||
|
||||
@@ -21,7 +21,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>
|
||||
<spring.core.version>3.1.3.RELEASE</spring.core.version>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<name>Samples (Applications) - Loan Broker</name>
|
||||
<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>
|
||||
<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>2.1.0.RELEASE</spring.integration.version>
|
||||
<spring.version>3.1.0.RELEASE</spring.version>
|
||||
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
|
||||
<spring.version>3.2.6.RELEASE</spring.version>
|
||||
<aspectj.version>1.6.10</aspectj.version>
|
||||
<slf4j.version>1.6.1</slf4j.version>
|
||||
</properties>
|
||||
|
||||
@@ -36,11 +36,11 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
*/
|
||||
@ContextConfiguration(locations="classpath:META-INF/spring/applicationContext.xml")
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
public class TestAccumulator {
|
||||
public class AccumulatorTests {
|
||||
|
||||
@Autowired
|
||||
Accumulator accumulator;
|
||||
|
||||
|
||||
@Test
|
||||
@Transactional
|
||||
public void test() {
|
||||
@@ -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>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
@@ -59,4 +59,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<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.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>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<spring.integration.version>3.0.0.M3</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>
|
||||
|
||||
@@ -14,7 +14,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.helloworld.HelloWorldApp</java.main.class>
|
||||
@@ -84,4 +84,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
<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>
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
xmlns:int-mail="http://www.springframework.org/schema/integration/mail">
|
||||
|
||||
<int-http:inbound-gateway request-channel="receiveChannel"
|
||||
name="/receiveGateway"
|
||||
path="/receiveGateway"
|
||||
supported-methods="POST"/>
|
||||
|
||||
<int:channel id="receiveChannel"/>
|
||||
|
||||
|
||||
<int:channel id="receiveChannel"/>
|
||||
|
||||
<int:service-activator input-channel="receiveChannel" expression="payload + ' from the other side'"/>
|
||||
</beans>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
<activemq.version>5.7.0</activemq.version>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
@@ -64,4 +64,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -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>
|
||||
<openjpa.version>2.2.0</openjpa.version>
|
||||
@@ -40,7 +40,7 @@
|
||||
<repository>
|
||||
<id>central</id>
|
||||
<name>Maven Central</name>
|
||||
<url>http://repo1.maven.org/maven2</url>
|
||||
<url>http://repo1.maven.org/maven</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
||||
@@ -12,7 +12,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>
|
||||
@@ -68,4 +68,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -14,7 +14,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>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<spring.amqp.version>1.1.3.RELEASE</spring.amqp.version>
|
||||
<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
|
||||
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
|
||||
<slf4j.version>1.6.4</slf4j.version>
|
||||
<junit.version>4.10</junit.version>
|
||||
</properties>
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
<java.main.class>org.springframework.integration.samples.tcpclientserver.Main</java.main.class>
|
||||
@@ -93,4 +93,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
<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>2.2.4.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>
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
<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>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>
|
||||
<saaj.version>1.3.19</saaj.version>
|
||||
@@ -82,4 +82,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</prerequisites>
|
||||
<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>
|
||||
@@ -65,4 +65,4 @@
|
||||
<url>https://repo.springsource.org/libs-milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -12,7 +12,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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user