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

‎basic/jms/.springBeans

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<beansProjectDescription>
3+
<version>1</version>
4+
<pluginVersion><![CDATA[2.3.3.201007151000-M2]]></pluginVersion>
5+
<configSuffixes>
6+
<configSuffix><![CDATA[xml]]></configSuffix>
7+
</configSuffixes>
8+
<enableImports><![CDATA[false]]></enableImports>
9+
<configs>
10+
<config>src/test/java/org/springframework/integration/samples/jms/config.xml</config>
11+
</configs>
12+
<configSets>
13+
</configSets>
14+
</beansProjectDescription>

‎basic/jms/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<name>Spring Integration JMS 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
<activemq.version>5.2.0</activemq.version>
1313
</properties>
1414
<dependencies>

‎basic/jmx/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>2.0.0</version>
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/mail/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<name>Spring Integration IMAP IDLE Sample</name>
77
<version>2.0.0</version>
88
<properties>
9-
<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
9+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
1010
<log4j.version>1.2.16</log4j.version>
1111
<junit.version>4.7</junit.version>
1212
</properties>

‎basic/oddeven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>2.0.0</version>
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/quote/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>2.0.0</version>
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/tcp-client-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<name>Spring Integration TCP Client Server Sample</name>
99
<packaging>jar</packaging>
1010
<properties>
11-
<spring.version>3.0.3.RELEASE</spring.version>
12-
<spring.integration.version>2.0.0.M7</spring.integration.version>
11+
<spring.version>3.0.5.RELEASE</spring.version>
12+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
1313
<log4j.version>1.2.16</log4j.version>
1414
<junit.version>4.7</junit.version>
1515
</properties>

‎basic/ws-inbound-gateway/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<version>2.0.0</version>
99
<packaging>war</packaging>
1010
<properties>
11-
<spring.integration.version>2.0.0.M7</spring.integration.version>
12-
<spring.version>3.0.4.RELEASE</spring.version>
11+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
12+
<spring.version>3.0.5.RELEASE</spring.version>
1313
<log4j.version>1.2.16</log4j.version>
1414
<junit.version>4.7</junit.version>
1515
</properties>

‎basic/ws-outbound-gateway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>2.0.0</version>
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
<saaj.version>1.3</saaj.version>

‎basic/xml/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>2.0.0</version>
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>

‎intermediate/async-gateway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<name>Async Gateway Demo</name>
88
<packaging>jar</packaging>
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>

‎intermediate/errorhandling/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<name>Spring Integration Error Handling Sample</name>
88
<version>2.0.0</version>
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>

‎intermediate/file-processing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<artifactId>file-processing</artifactId>
55
<version>2.0.0</version>
66
<properties>
7-
<spring.integration.version>2.0.0.M7</spring.integration.version>
7+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
88
<log4j.version>1.2.16</log4j.version>
99
<junit.version>4.7</junit.version>
1010
</properties>

‎intermediate/multipart-http/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<name>Spring Integration HTTP Multipart Demo</name>
88
<packaging>war</packaging>
99
<properties>
10-
<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
11-
<spring.version>3.0.4.RELEASE</spring.version>
10+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
11+
<spring.version>3.0.5.RELEASE</spring.version>
1212
<commons-fileupload>1.2</commons-fileupload>
1313
<commons-io>1.3.2</commons-io>
1414
<log4j.version>1.2.16</log4j.version>

‎intermediate/travel/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<name>Spring Integration Travel Services Sample</name>
77
<version>2.0.0</version>
88
<properties>
9-
<spring.integration.version>2.0.0.M7</spring.integration.version>
9+
<spring.integration.version>2.0.0.RC1</spring.integration.version>
1010
<log4j.version>1.2.16</log4j.version>
1111
<junit.version>4.7</junit.version>
12-
<spring.version>3.0.4.RELEASE</spring.version>
12+
<spring.version>3.0.5.RELEASE</spring.version>
1313
</properties>
1414
<dependencies>
1515
<dependency>

‎intermediate/travel/src/test/resources/log4j.properties

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
log4j.rootCategory=WARN, stdout
2+
3+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
4+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
5+
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n
6+
7+
8+
log4j.category.org.springframework=WARN
9+
# log4j.category.org.springframework.integration=DEBUG
10+
# log4j.category.org.springframework.integration.jdbc=DEBUG
11+
log4j.category.org.springframework.integration.samples=DEBUG

‎intermediate/travel/src/test/resources/log4j.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)