Skip to content

Commit 9f67b33

Browse files
olegzolegz
committed
INTSAMPLES-7 tested and tagged for RC1 release
1 parent 5d1c093 commit 9f67b33

File tree

27 files changed

+59
-57
lines changed

27 files changed

+59
-57
lines changed

‎applications/cafe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>2.0.0</version>
88
<name>Spring Integration Cafe Sample</name>
99
<properties>
10-
<spring.integration.version>2.0.0.M7</spring.integration.version>
10+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
1111
<log4j.version>1.2.16</log4j.version>
1212
<junit.version>4.7</junit.version>
1313
</properties>

‎applications/cafe/src/test/java/org/springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.junit.Test;
2020
import org.springframework.context.support.AbstractApplicationContext;
2121
import org.springframework.context.support.ClassPathXmlApplicationContext;
22-
import org.springframework.context.support.FileSystemXmlApplicationContext;
2322
import org.springframework.integration.samples.cafe.Cafe;
2423
import org.springframework.integration.samples.cafe.DrinkType;
2524
import org.springframework.integration.samples.cafe.Order;

‎applications/loan-broker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>2.0.0</version>
88
<name>Spring Integration Loan Broker Sample</name>
99
<properties>
10-
<spring.integration.version>2.0.0.M7</spring.integration.version>
10+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
1111
<commons-logging.version>1.1.1</commons-logging.version>
1212
<log4j.version>1.2.16</log4j.version>
1313
<junit.version>4.7</junit.version>

‎applications/loanshark/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<packaging>war</packaging>
99
<properties>
1010
<roo.version>1.1.0.M3</roo.version>
11-
<spring.version>3.0.4.RELEASE</spring.version>
12-
<aspectj.version>1.6.10.M1</aspectj.version>
11+
<spring.version>3.0.5.RELEASE</spring.version>
12+
<aspectj.version>1.6.10</aspectj.version>
1313
<slf4j.version>1.6.1</slf4j.version>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
</properties>
@@ -361,7 +361,7 @@
361361
<dependency>
362362
<groupId>org.springframework.integration</groupId>
363363
<artifactId>spring-integration-ip</artifactId>
364-
<version>2.0.0.M7</version>
364+
<version>2.0.0.RC1</version>
365365
</dependency>
366366
</dependencies>
367367
<build>

‎basic/file/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<name>Spring Integration File Copy Sample</name>
99
<packaging>jar</packaging>
1010
<properties>
11-
<spring.integration.version>2.0.0.M7</spring.integration.version>
11+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
1212
<log4j.version>1.2.16</log4j.version>
1313
<junit.version>4.7</junit.version>
1414
</properties>

‎basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
public class BinaryFileCopyTest {
3232

3333
@Test
34-
public void testBinaryCopy(){
34+
public void testBinaryCopy() throws Exception{
3535
ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-binary.xml", BinaryFileCopyTest.class);
3636
FileCopyDemoCommon.displayDirectories(context);
37+
Thread.sleep(5000);
3738
}
3839

3940
}

‎basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929
public class FileBasedFileCopyTest {
3030

3131
@Test
32-
public void testFileBasedCopy(){
32+
public void testFileBasedCopy() throws Exception{
3333
ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-file.xml", FileBasedFileCopyTest.class);
3434
FileCopyDemoCommon.displayDirectories(context);
35+
Thread.sleep(5000);
3536
}
3637

3738
}

‎basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
public class TextFileCopyTest {
3131

3232
@Test
33-
public void testTextBasedCopy(){
33+
public void testTextBasedCopy() throws Exception{
3434
ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-text.xml", TextFileCopyTest.class);
3535
FileCopyDemoCommon.displayDirectories(context);
36+
Thread.sleep(5000);
3637
}
3738

3839
}

‎basic/helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<name>Spring Integration Hello World Sample</name>
99
<packaging>jar</packaging>
1010
<properties>
11-
<spring.integration.version>2.0.0.M7</spring.integration.version>
11+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
1212
<log4j.version>1.2.16</log4j.version>
1313
<junit.version>4.7</junit.version>
1414
</properties>

‎basic/jms/.settings/com.springsource.sts.config.flow.prefs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#Sun Oct 03 04:56:44 EDT 2010
2+
//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/jms/src/test/java/org/springframework/integration/samples/jms/config.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="GatewayModelElement" type\="gateway">\n<structure end\="842" endstart\="842" start\="691" startend\="842"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="878" endstart\="878" start\="848" startend\="878"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="982" endstart\="982" start\="882" startend\="982"/>\n<bounds height\="112" width\="116" x\="291" y\="17"/>\n</element>\n</graph>
3+
eclipse.preferences.version=1

0 commit comments

Comments
 (0)