Skip to content

Commit

Permalink
INTSAMPLES-7 tested and tagged for RC1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@olegz
olegz committed Oct 29, 2010
1 parent 5d1c093 commit 9f67b33
Show file tree
Hide file tree
Showing 27 changed files with 59 additions and 57 deletions.
2 changes: 1 addition & 1 deletion applications/cafe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>2.0.0</version>
<name>Spring Integration Cafe Sample</name>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
1 change: 0 additions & 1 deletion ...springframework/integration/samples/cafe/annotation/CafeDemoAnnotationConfiguredTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
import org.springframework.integration.samples.cafe.Cafe;
import org.springframework.integration.samples.cafe.DrinkType;
import org.springframework.integration.samples.cafe.Order;
Expand Down
2 changes: 1 addition & 1 deletion applications/loan-broker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>2.0.0</version>
<name>Spring Integration Loan Broker Sample</name>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<commons-logging.version>1.1.1</commons-logging.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
Expand Down
6 changes: 3 additions & 3 deletions applications/loanshark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<packaging>war</packaging>
<properties>
<roo.version>1.1.0.M3</roo.version>
<spring.version>3.0.4.RELEASE</spring.version>
<aspectj.version>1.6.10.M1</aspectj.version>
<spring.version>3.0.5.RELEASE</spring.version>
<aspectj.version>1.6.10</aspectj.version>
<slf4j.version>1.6.1</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down Expand Up @@ -361,7 +361,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<version>2.0.0.M7</version>
<version>2.0.0.RC1</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion basic/file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name>Spring Integration File Copy Sample</name>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
3 changes: 2 additions & 1 deletion ...le/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@
public class BinaryFileCopyTest {

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

}
3 changes: 2 additions & 1 deletion ...src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@
public class FileBasedFileCopyTest {

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

}
3 changes: 2 additions & 1 deletion ...file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
public class TextFileCopyTest {

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

}
Expand Down
2 changes: 1 addition & 1 deletion basic/helloworld/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name>Spring Integration Hello World Sample</name>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
3 changes: 3 additions & 0 deletions basic/jms/.settings/com.springsource.sts.config.flow.prefs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#Sun Oct 03 04:56:44 EDT 2010
//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>
eclipse.preferences.version=1
14 changes: 14 additions & 0 deletions basic/jms/.springBeans
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.3.3.201007151000-M2]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/java/org/springframework/integration/samples/jms/config.xml</config>
</configs>
<configSets>
</configSets>
</beansProjectDescription>
2 changes: 1 addition & 1 deletion basic/jms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name>Spring Integration JMS Sample</name>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<activemq.version>5.2.0</activemq.version>
</properties>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion basic/jmx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>2.0.0</version>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion basic/mail/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<name>Spring Integration IMAP IDLE Sample</name>
<version>2.0.0</version>
<properties>
<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion basic/oddeven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>2.0.0</version>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion basic/quote/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>2.0.0</version>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions basic/tcp-client-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<name>Spring Integration TCP Client Server Sample</name>
<packaging>jar</packaging>
<properties>
<spring.version>3.0.3.RELEASE</spring.version>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.version>3.0.5.RELEASE</spring.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions basic/ws-inbound-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<version>2.0.0</version>
<packaging>war</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.version>3.0.4.RELEASE</spring.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<spring.version>3.0.5.RELEASE</spring.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion basic/ws-outbound-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>2.0.0</version>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
<saaj.version>1.3</saaj.version>
Expand Down
2 changes: 1 addition & 1 deletion basic/xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>2.0.0</version>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion intermediate/async-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>Async Gateway Demo</name>
<packaging>jar</packaging>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion intermediate/errorhandling/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>Spring Integration Error Handling Sample</name>
<version>2.0.0</version>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion intermediate/file-processing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<artifactId>file-processing</artifactId>
<version>2.0.0</version>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions intermediate/multipart-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<name>Spring Integration HTTP Multipart Demo</name>
<packaging>war</packaging>
<properties>
<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
<spring.version>3.0.4.RELEASE</spring.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<spring.version>3.0.5.RELEASE</spring.version>
<commons-fileupload>1.2</commons-fileupload>
<commons-io>1.3.2</commons-io>
<log4j.version>1.2.16</log4j.version>
Expand Down
4 changes: 2 additions & 2 deletions intermediate/travel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<name>Spring Integration Travel Services Sample</name>
<version>2.0.0</version>
<properties>
<spring.integration.version>2.0.0.M7</spring.integration.version>
<spring.integration.version>2.0.0.RC1</spring.integration.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>
<spring.version>3.0.4.RELEASE</spring.version>
<spring.version>3.0.5.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
11 changes: 11 additions & 0 deletions intermediate/travel/src/test/resources/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
log4j.rootCategory=WARN, stdout

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n


log4j.category.org.springframework=WARN
# log4j.category.org.springframework.integration=DEBUG
# log4j.category.org.springframework.integration.jdbc=DEBUG
log4j.category.org.springframework.integration.samples=DEBUG
28 changes: 0 additions & 28 deletions intermediate/travel/src/test/resources/log4j.xml
View file

This file was deleted.

0 comments on commit 9f67b33

Please sign in to comment.