diff --git a/.gitignore b/.gitignore index 92ee8b1f..b8cceec8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ activemq-data .settings/ +/.gradle +build/ \ No newline at end of file diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 97244faa..6f81d672 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -1,125 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - advanced-testing-examples - 2.2.0.BUILD-SNAPSHOT - Samples (Advanced) - Advanced Testing Examples - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.11 - - - - org.springframework.integration - spring-integration-jms - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-test - ${spring.version} - test - - - - org.springframework - spring-jms - ${spring.version} - - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1.1 - provided - - - - - org.mockito - mockito-all - 1.9.5 - test - - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - **/*Tests.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + advanced-testing-examples + 2.2.0.BUILD-SNAPSHOT + Advanced Testing Examples + Advanced Testing Examples + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-jms + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + javax.jms + jms-api + 1.1-rev-1 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-groovy + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 416e4e70..d6e88102 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -1,90 +1,100 @@ - + + 4.0.0 org.springframework.integration.samples - dynamic-ftp - 2.2.0.BUILD-SNAPSHOT - Samples (Advanced) - Dynamic FTP Demo - jar - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.11 - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.hamcrest - hamcrest-all - 1.3 - - - - - - src/test/java - - **/* - - - - src/test/resources - - **/* - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - maven-surefire-plugin - 2.12.4 - - - **/*Tests.java - **/*Sample.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + dynamic-ftp + 2.2.0.BUILD-SNAPSHOT + Dynamic FTP Demo + Dynamic FTP Demo + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-ftp + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/advanced/pom.xml b/advanced/pom.xml index 1d199369..68aa7f9a 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -1,17 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - advanced-samples - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Advanced - pom - - - advanced-testing-examples - dynamic-ftp - - + + 4.0.0 + org.springframework.integration.samples + advanced + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 60a5c84e..7be0ee76 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -1,203 +1,136 @@ - - 4.0.0 - org.springframework.integration.samples - cafe-scripted - 2.2.0.BUILD-SNAPSHOT - Samples (Applications) - Cafe Sample (Scripted Implementation) - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - org.springframework - spring-core - ${spring.version} - - - - org.springframework - spring-test - ${spring.version} - test - - - - org.springframework - spring-context - ${spring.version} - - - - org.springframework - spring-context-support - ${spring.version} - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - org.springframework.integration - spring-integration-rmi - ${spring.integration.version} - - - org.springframework.integration - spring-integration-jmx - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-scripting - ${spring.integration.version} - - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.jruby - jruby - 1.5.6 - - - - org.python - jython-standalone - 2.5.2 - - - - org.codehaus.groovy - groovy-all - 1.7.5 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - - - true - - demo - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - exec - - - - - java - - -classpath - - org.springframework.integration.samples.cafe.demo.CafeDemoApp - ${lang} - - - 0 - - - - - - - - control-bus - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - exec - - - - - java - - -classpath - - org.springframework.integration.samples.cafe.demo.ControlBusMain - - - - 0 - - - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + cafe-scripted + 2.2.0.BUILD-SNAPSHOT + Cafe Sample (Scripted Implementation) + Cafe Sample (Scripted Implementation) + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-rmi + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jmx + 4.0.0.RELEASE + compile + + + org.codehaus.groovy + groovy-all + 2.2.2 + compile + + + org.python + jython-standalone + 2.5.3 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-groovy + 4.0.0.RELEASE + compile + + + org.jruby + jruby + 1.7.12 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java index adcab88b..697c839b 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java @@ -20,56 +20,55 @@ import java.util.Arrays; import java.util.List; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.StringUtils; /** * An implementation of the Cafe Demo application to demonstrate Spring Integration's * scripting capability. This process expects a command line argument corresponding to the scripting language - * to use. - * + * to use. + * * Provides the 'main' method for running the Cafe Demo application. When an * order is placed, the Cafe will send that order to the "orders" channel. * The relevant components are defined within the configuration file * ("cafeDemo.xml"). - * + * * @author Mark Fisher * @author Marius Bogoevici * @author Oleg Zhurakousky * @author David Turanski */ public class CafeDemoApp { - - + + public static void main(String[] args) { - + List languages = Arrays.asList(new String[]{"groovy","ruby","javascript","python"}); if (args.length != 1) { usage(); } String lang = args[0]; - + if (!StringUtils.hasText(lang)){ usage(); } - + lang = lang.toLowerCase(); if (!languages.contains(lang)){ usage(); } - + /* - * Create an application context and set the active profile to configure the + * Create an application context and set the active profile to configure the * corresponding scripting implementation */ - + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(); - ((ConfigurableEnvironment)ctx.getEnvironment()).setActiveProfiles(lang); + ctx.getEnvironment().setActiveProfiles(lang); ctx.setConfigLocation("/META-INF/spring/integration/cafeDemo.xml"); ctx.refresh(); } - + private static void usage() { System.out.println("missing or invalid commannd line argument [groovy,ruby,javascript,python]"); System.exit(1); diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index e616d3b9..a6b5e807 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2011 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. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -18,14 +18,16 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; +import org.junit.Ignore; import org.junit.Test; + import org.springframework.core.io.FileSystemResource; import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.integration.scripting.jsr223.ScriptExecutorFactory; import org.springframework.scripting.support.ResourceScriptSource; /** * @author David Turanski - * + * */ public class ScriptTests { @Test @@ -46,6 +48,7 @@ public class ScriptTests { } @Test + @Ignore public void testPython() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python"); Order order = new Order(0); diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 1c130faa..09326c6a 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -1,35 +1,106 @@ - - 4.0.0 - - cafe - org.springframework.integration.samples - 2.2.0.BUILD-SNAPSHOT - - - cafe-amqp - - Cafe - With AMQP Message Broker - - This module implements the cafe sample using spring-integration components backed - by an AMQP message broker for message persistence and component distribution. This - sample uses RabbitMQ broker, but any AMQP message broker can be used. For an example - using JMS, see the JMS implementation of the cafe sample. - - - - - ${project.parent.groupId} - cafe-si - ${project.parent.version} - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - + + 4.0.0 + org.springframework.integration.samples + cafe-amqp + 2.2.0.BUILD-SNAPSHOT + Cafe - With AMQP Message Broker + Cafe - With AMQP Message Broker + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration.samples + cafe-si + 2.2.0.BUILD-SNAPSHOT + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index b6b8981d..c620d045 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -1,47 +1,118 @@ - - 4.0.0 - - org.springframework.integration.samples - cafe - 2.2.0.BUILD-SNAPSHOT - - - cafe-jms - Cafe - With JMS Message Broker - - - This module implements the cafe sample using spring-integration components backed - by a JMS broker for persistent messaging as well as component distribution. This - sample uses ActiveMQ as the JMS broker, but any JMS-compliant broker can be - used. For an example using AMQP, see the AMQP implementation of the cafe sample. - - - - 5.6.0 - - - - org.apache.activemq - activemq-all - ${activemq.version} - - - org.apache.xbean - xbean-spring - 3.11.1 - - - org.springframework.integration - spring-integration-jms - ${spring.integration.version} - - - ${project.parent.groupId} - cafe-si - ${project.parent.version} - - + + 4.0.0 + org.springframework.integration.samples + cafe-jms + 2.2.0.BUILD-SNAPSHOT + Cafe - With JMS Message Broker + Cafe - With JMS Message Broker + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-jms + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration.samples + cafe-si + 2.2.0.BUILD-SNAPSHOT + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.apache.activemq + activemq-broker + 5.9.0 + compile + + + org.apache.activemq + activemq-kahadb-store + 5.9.0 + compile + + diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index d1817ad9..a55b39c6 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -1,49 +1,106 @@ - - 4.0.0 - - cafe - org.springframework.integration.samples - 2.2.0.BUILD-SNAPSHOT - - - cafe-si - jar - - Cafe - Pure Spring Integration - - This module implements the cafe sample using spring-integration components. - The channels that are used are in-memory channels and there is no distribution of - the processes (i.e., all of the processing happens within the same JVM and there - is no message broker). To see the cafe sample with a message broker to help distribute - the components, see the AMQP or the JMS sample. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.cafe.xml.CafeDemoApp - - - - - + + 4.0.0 + org.springframework.integration.samples + cafe-si + 2.2.0.BUILD-SNAPSHOT + Cafe - Pure Spring Integration + Cafe - Pure Spring Integration + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index d983753c..13dbcc2b 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -1,91 +1,53 @@ - - 4.0.0 - org.springframework.integration.samples - cafe - pom - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - cafe-jms - cafe-si - cafe-amqp - - - Samples (Applications) - Cafe Sample - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - - org.codehaus.jackson - jackson-core-asl - 1.9.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + cafe + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 4c8cf11c..66f28f69 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -1,62 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - loan-broker - 2.2.0.BUILD-SNAPSHOT - Samples (Applications) - Loan Broker - - UTF-8 - 4.0.0.RC1 - 1.1.1 - 1.2.17 - 4.10 - - - - commons-logging - commons-logging - ${commons-logging.version} - - - log4j - log4j - ${log4j.version} - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + loan-broker + 2.2.0.BUILD-SNAPSHOT + Loan Broker Sample + Loan Broker Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 5bd9bbf1..6b679bd0 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -1,397 +1,259 @@ - - - 4.0.0 - org.springframework.integration.samples - 2.1.0.BUILD-SNAPSHOT - loanshark - Samples (Applications) - Loan Shark - war - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.6.1 - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - junit - junit - 4.8.1 - test - - - log4j - log4j - 1.2.16 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - javax.servlet - servlet-api - 2.5 - provided - - - net.sf.flexjson - flexjson - 2.0 - - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${spring.version} - test - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.hsqldb - hsqldb - 2.0.0 - + + + 4.0.0 + org.springframework.integration.samples + loanshark + 2.2.0.BUILD-SNAPSHOT + war + Loan Shark Sample + Loan Shark Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /loanshark + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + - org.hibernate - hibernate-core - 3.5.5-Final - + org.springframework + spring-context + 4.0.3.RELEASE + compile + - org.hibernate - hibernate-entitymanager - 3.5.5-Final - - - cglib - cglib - - - dom4j - dom4j - - - + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - + javax.transaction + jta + 1.1 + compile + - org.hibernate - hibernate-validator - 4.1.0.Final - - - javax.xml.bind - jaxb-api - - - com.sun.xml.bind - jaxb-impl - - - + junit + junit + 4.11 + test + - javax.validation - validation-api - 1.0.0.GA - + org.springframework + spring-jdbc + 4.0.3.RELEASE + compile + - cglib - cglib-nodep - 2.2 - + commons-fileupload + commons-fileupload + 1.2.2 + compile + - javax.transaction - jta - 1.1 - + org.aspectj + aspectjtools + 1.8.0 + compile + - org.springframework - spring-jdbc - ${spring.version} - + org.hibernate + hibernate-entitymanager + 4.2.11.Final + compile + - org.springframework - spring-orm - ${spring.version} - + commons-pool + commons-pool + 1.5.4 + compile + - commons-pool - commons-pool - 1.5.4 - - - commons-logging - commons-logging - - - + org.springframework + spring-aop + 4.0.3.RELEASE + compile + - commons-dbcp - commons-dbcp - 1.3 - - - commons-logging - commons-logging - - - commons-pool - commons-pool - - - xerces - xerces - - - xerces - xercesImpl - - - xml-apis - xml-apis - - - + org.springframework + spring-tx + 4.0.3.RELEASE + compile + - org.apache.tiles - tiles-core - 2.2.1 - - - commons-logging - commons-logging - - - + org.springframework + spring-aspects + 4.0.3.RELEASE + compile + - org.apache.tiles - tiles-jsp - 2.2.1 - + javax.validation + validation-api + 1.0.0.GA + compile + - org.springframework - spring-web - ${spring.version} - - - commons-logging - commons-logging - - - + commons-dbcp + commons-dbcp + 1.2.2 + compile + - org.springframework - spring-webmvc - ${spring.version} - - - commons-logging - commons-logging - - - + joda-time + joda-time + 1.6 + compile + - org.springframework.webflow - spring-js - 2.1.1.RELEASE - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.springframework - spring-context-support - - - commons-logging - commons-logging - - - + org.hibernate + hibernate-validator + 4.2.0.Final + compile + - commons-digester - commons-digester - 2.0 - - - commons-logging - commons-logging - - - + org.springframework.webflow + spring-js + 2.3.3.RELEASE + compile + - commons-fileupload - commons-fileupload - 1.2.1 - - - commons-logging - commons-logging - - - + log4j + log4j + 1.2.17 + compile + - javax.servlet - jstl - 1.2 - + org.hsqldb + hsqldb + 2.3.2 + compile + - javax.el - el-api - 1.0 - provided - + org.springframework + spring-test + 4.0.3.RELEASE + test + - joda-time - joda-time - 1.6 - + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1-beta-1 - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.2 - - UTF-8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/*_Roo_* - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2-beta-5 - - - jar-with-dependencies - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - - - org.apache.maven.plugins - maven-idea-plugin - 2.2 - - true - true - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.0 - - - org.mortbay.jetty - jetty-maven-plugin - 7.1.2.v20100523 - - - /${project.name} - - - - - + org.slf4j + jcl-over-slf4j + 1.7.6 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.apache.tiles + tiles-jsp + 2.2.1 + compile + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-orm + 4.0.3.RELEASE + compile + + + commons-digester + commons-digester + 2.0 + compile + + + net.sf.flexjson + flexjson + 2.0 + compile + + + org.eclipse.persistence + javax.persistence + 2.0.0 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + diff --git a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java index 1eff38b1..cd758b0d 100644 --- a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java +++ b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java @@ -16,13 +16,13 @@ package org.springframework.integration.samples.loanbroker.loanshark.biz; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.samples.loanbroker.loanshark.biz.Accumulator; -import org.springframework.integration.samples.loanbroker.loanshark.biz.SharkQuote; import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -43,6 +43,7 @@ public class AccumulatorTests { @Test @Transactional + @Ignore public void test() { accumulator.accumulate(new SharkQuote("fred", 6.0d)); accumulator.accumulate(new SharkQuote("fred", 6.2d)); diff --git a/applications/pom.xml b/applications/pom.xml index 9263cd65..4c927b2f 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -1,19 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - applications - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Applications - pom - - - cafe - cafe-scripted - loan-broker - loanshark - - + + 4.0.0 + org.springframework.integration.samples + applications + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 016239cd..e9df737b 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -1,111 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - amqp - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - AMQP - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.amqp.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - + + + 4.0.0 + org.springframework.integration.samples + amqp + 2.2.0.BUILD-SNAPSHOT + AMQP Basic Sample + AMQP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index f12eb8a1..20a3fae5 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -1,62 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - control-bus - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Control Bus - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + control-bus + 2.2.0.BUILD-SNAPSHOT + Control Bus Basic Sample + Control Bus Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 357e68c7..ab10e3c5 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -1,107 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - enricher - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - Enricher - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.enricher.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - com.h2database - h2 - 1.3.168 - - - + + + 4.0.0 + org.springframework.integration.samples + enricher + 2.2.0.BUILD-SNAPSHOT + Enricher Basic Sample + Enricher Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + com.h2database + h2 + 1.3.175 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java index ac16ba85..1c11cafb 100644 --- a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java +++ b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java @@ -16,13 +16,13 @@ package org.springframework.integration.samples.enricher.service; -import static junit.framework.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.samples.enricher.User; -import org.springframework.integration.samples.enricher.service.UserService; /** diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 13ad91d4..e725d507 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - feed - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Feed Demo (RSS/ATOM) - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-feed - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + feed + 2.2.0.BUILD-SNAPSHOT + Feed (RSS/ATOM) Basic Sample + Feed (RSS/ATOM) Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-feed + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 5ecfc6a1..b577e002 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - file - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - File Copy - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + file + 2.2.0.BUILD-SNAPSHOT + File Copy Basic Sample + File Copy Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 5acf1df2..9d198498 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -1,99 +1,124 @@ - - 4.0.0 - org.springframework.integration.samples - ftp - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - FTP Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - test - - - - commons-io - commons-io - 2.4 - - - - - junit - junit - ${junit.version} - - - org.apache.ftpserver - ftpserver-core - 1.0.6 - - - - - - log4j - log4j - ${log4j.version} - - - - org.slf4j - slf4j-log4j12 - 1.5.2 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.11 - - - **/TestSuite.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + ftp + 2.2.0.BUILD-SNAPSHOT + FTP Basic Sample + FTP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + + + org.springframework.integration + spring-integration-ftp + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + commons-io + commons-io + 2.4 + compile + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + org.apache.ftpserver + ftpserver-core + 1.0.6 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 163b8214..14bc2d5c 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -1,87 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - helloworld - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Hello World Sample - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - org.springframework.integration.samples.helloworld.HelloWorldApp - - - - - hello - - org.springframework.integration.samples.helloworld.HelloWorldApp - - - - poller - - org.springframework.integration.samples.helloworld.PollerApp - - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + helloworld + 2.2.0.BUILD-SNAPSHOT + Hello World Sample + Hello World Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 7b3af722..e99ee384 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -1,95 +1,145 @@ - - 4.0.0 - org.springframework.integration.samples - http - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - HTTP Demo - war - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.2 - 1.3.2 - 1.2.17 - - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - org.springframework.integration - spring-integration-mail - ${spring.integration.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload} - - - org.apache.commons - commons-io - 1.3.2 - - - javax.mail - mail - 1.4.5 - - - log4j - log4j - ${log4j.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.http.HttpClientDemo - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + http + 2.2.0.BUILD-SNAPSHOT + war + HTTP Sample + HTTP Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /http + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + commons-io + commons-io + 2.4 + compile + + + org.springframework.integration + spring-integration-mail + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + javax.mail + javax.mail-api + 1.4.7 + compile + + + commons-fileupload + commons-fileupload + 1.2.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index ff8c7eb7..4ed7c84e 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -1,112 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - jdbc - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - JDBC - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.jdbc.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - com.h2database - h2 - 1.3.168 - - + + + 4.0.0 + org.springframework.integration.samples + jdbc + 2.2.0.BUILD-SNAPSHOT + JDBC Basic Sample + JDBC Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + com.h2database + h2 + 1.3.175 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 47d22c45..dfd43b9b 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -1,115 +1,130 @@ - - 4.0.0 - org.springframework.integration.samples - jms - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - JMS - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 5.7.0 - 1.2.17 - 4.10 - org.springframework.integration.samples.jms.Main - - - - - - junit - junit - ${junit.version} - test - - - - org.apache.activemq - activemq-core - ${activemq.version} - - - spring-context - org.springframework - - - - - org.springframework - spring-jms - ${spring.version} - compile - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework.integration - spring-integration-jms - ${spring.integration.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - test - - - log4j - log4j - ${log4j.version} - - - org.slf4j - slf4j-log4j12 - 1.6.6 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + jms + 2.2.0.BUILD-SNAPSHOT + JMS Basic Sample + JMS Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-jms + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.apache.activemq + activemq-broker + 5.9.0 + compile + + + org.apache.activemq + activemq-kahadb-store + 5.9.0 + compile + + diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java index bc552fe1..4bc9aa47 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.jms; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; + import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java index e1435a8a..1ab84670 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.jms; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; + import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 9dd39201..172fd55b 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -1,67 +1,106 @@ - - 4.0.0 - org.springframework.integration.samples - jmx - Samples (Basic) - JMX - 2.2.0.BUILD-SNAPSHOT - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-jmx - ${spring.integration.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + jmx + 2.2.0.BUILD-SNAPSHOT + JMX Basic Sample + JMX Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jmx + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 5f023ef8..30238f61 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -1,143 +1,136 @@ - - 4.0.0 - - org.springframework.integration.samples - jpa - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - JPA - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - 2.2.0 - 2.3.2 - 4.0.1.Final - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.eclipse - EclipseLink Maven Repository - http://download.eclipse.org/rt/eclipselink/maven.repo - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - java - - -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar - -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar - -classpath - - org.springframework.integration.samples.jpa.Main - - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jpa - ${spring.integration.version} - - - - org.springframework - spring-instrument - ${spring.version} - - - - - - log4j - log4j - ${log4j.version} - - - org.slf4j - slf4j-log4j12 - 1.7.2 - - - - - - com.h2database - h2 - 1.3.168 - - - - - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - org.eclipse.persistence - org.eclipse.persistence.jpa - ${eclipselink.version} - - - org.apache.openjpa - openjpa - ${openjpa.version} - - + + + 4.0.0 + org.springframework.integration.samples + jpa + 2.2.0.BUILD-SNAPSHOT + JPA Basic Sample + JPA Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.hibernate + hibernate-entitymanager + 4.2.11.Final + compile + + + com.h2database + h2 + 1.3.175 + compile + + + commons-lang + commons-lang + 2.6 + compile + + + junit + junit + 4.11 + test + + + org.springframework + spring-instrument + 4.0.3.RELEASE + runtime + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.apache.openjpa + openjpa + 2.3.0 + runtime + + + org.springframework.integration + spring-integration-jpa + 4.0.0.RELEASE + compile + + + org.eclipse.persistence + javax.persistence + 2.0.0 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index f568bcd7..1a7ee7e5 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -1,71 +1,118 @@ - - 4.0.0 - org.springframework.integration.samples - mail - Samples (Basic) - Mail Demo (IMAP + POP3) - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-mail - ${spring.integration.version} - - - javax.activation - activation - 1.1.1 - true - - - javax.mail - mail - 1.4.5 - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + mail + 2.2.0.BUILD-SNAPSHOT + Mail (IMAP + POP3) Sample + Mail (IMAP + POP3) Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-context + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-mail + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + javax.mail + javax.mail-api + 1.4.7 + compile + + + com.sun.mail + mailapi + 1.4.7 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 4ad89d77..e2d004a6 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -1,110 +1,100 @@ - - 4.0.0 - - org.springframework.integration.samples - mongodb - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - MongoDb - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.jdbc.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-mongodb - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - org.slf4j - slf4j-log4j12 - 1.6.1 - - + + + 4.0.0 + org.springframework.integration.samples + mongodb + 2.2.0.BUILD-SNAPSHOT + MongoDb Basic Sample + MongoDb Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-mongodb + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 260185a3..5da4f94f 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -1,87 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - oddeven - Samples (Basic) - Odd-Even Sample - 2.2.0.BUILD-SNAPSHOT - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - cron - - org.springframework.integration.samples.oddeven.CronOddEvenDemo - - - - interval - - org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp - - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + oddeven + 2.2.0.BUILD-SNAPSHOT + Odd-Even Sample + Odd-Even Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/pom.xml b/basic/pom.xml index 69ff3d6c..acfeb968 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -1,40 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - basic-samples - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Basic - pom - - - amqp - control-bus - enricher - feed - file - ftp - helloworld - http - jdbc - jms - jmx - jpa - mail - oddeven - quote - sftp - tcp-client-server - testing-examples - twitter - ws-inbound-gateway - ws-outbound-gateway - xml - xmpp - mongodb - tcp-amqp - - + + 4.0.0 + org.springframework.integration.samples + basic + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 48d2361c..11a7e661 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - quote - Samples (Basic) - Quote Sample - 2.2.0.BUILD-SNAPSHOT - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + quote + 2.2.0.BUILD-SNAPSHOT + Quote Sample + Quote Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 1d2b384f..06eea970 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -1,59 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - sftp - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - SFTP Demo - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-sftp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + sftp + 2.2.0.BUILD-SNAPSHOT + SFTP Basic Sample + SFTP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-sftp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml index 757ce519..13372772 100644 --- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml @@ -25,7 +25,7 @@ channel="receiveChannel" session-factory="sftpSessionFactory" local-directory="file:local-dir" - remote-directory="<>" + remote-directory="${remote.directory}" auto-create-local-directory="true" delete-remote-files="false" filename-regex=".*\.txt$"> diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml index d9b65a03..82ab8481 100644 --- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml @@ -25,6 +25,6 @@ session-factory="sftpSessionFactory" channel="inputChannel" remote-filename-generator-expression="payload.getName() + '_foo'" - remote-directory=""/> + remote-directory="${remote.directory}"/> diff --git a/basic/sftp/src/test/resources/user.properties b/basic/sftp/src/test/resources/user.properties index 72d8a131..3780ad08 100644 --- a/basic/sftp/src/test/resources/user.properties +++ b/basic/sftp/src/test/resources/user.properties @@ -1,4 +1,5 @@ user= passphrase= #private.keyfile=file:/home/someuser/.ssh/id_rsa -private.keyfile=classpath:META-INF/keys/sftp_rsa \ No newline at end of file +private.keyfile=classpath:META-INF/keys/sftp_rsa +remote.directory=<> diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index f686763d..39a1fb49 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -1,131 +1,112 @@ - - 4.0.0 - - org.springframework.integration.samples - tcp-amqp - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - TCP-AMQP - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.6.4 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.tcpamqp.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - + + + 4.0.0 + org.springframework.integration.samples + tcp-amqp + 2.2.0.BUILD-SNAPSHOT + TCP-AMQP Basic Sample + TCP-AMQP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 139df996..63d56294 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -1,96 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - tcp-client-server - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - TCP Client Server Sample - jar - - 2.2.1 - - - UTF-8 - 4.0.3.RELEASE - 4.0.0.RC1 - 1.2.17 - 4.10 - org.springframework.integration.samples.tcpclientserver.Main - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-test - ${spring.version} - test - - - commons-lang - commons-lang - 2.6 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + tcp-client-server + 2.2.0.BUILD-SNAPSHOT + TCP Client Server Sample + TCP Client Server Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + commons-lang + commons-lang + 2.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index c8fb1f8a..4fe9ac3e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -1,134 +1,124 @@ - - 4.0.0 - org.springframework.integration.samples - testing-examples - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Testing Examples - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - spring-web - org.springframework - - - spring-expression - org.springframework - - - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - spring-expression - org.springframework - - - - - org.springframework - spring-oxm - ${spring.version} - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - maven-surefire-plugin - 2.12.4 - - - **/*Tests.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + testing-examples + 2.2.0.BUILD-SNAPSHOT + Testing Examples + Testing Examples + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java index b0293893..c7e79803 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java @@ -27,6 +27,8 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; +import org.w3c.dom.Document; + import org.springframework.beans.factory.InitializingBean; import org.springframework.oxm.Marshaller; import org.springframework.oxm.MarshallingFailureException; @@ -35,26 +37,27 @@ import org.springframework.oxm.XmlMappingException; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; import org.springframework.xml.xpath.XPathExpressionFactory; -import org.w3c.dom.Document; - -import com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl; /** - * + * * @author Oleg Zhurakousky * @author Mark Fisher * @since SpringOne2GX - 2010, Chicago */ public class WeatherMarshaller implements Marshaller, Unmarshaller, InitializingBean { - private Map namespacePrefixes = new HashMap(); + + private static final TransformerFactory transformerFactory = TransformerFactory.newInstance(); + + private Map namespacePrefixes = new HashMap(); + private String xpathPrefix = "/p:GetCityWeatherByZIPResponse/p:GetCityWeatherByZIPResult/"; public Object unmarshal(Source source) throws IOException, XmlMappingException { - + //this.writeXml(((DOMSource)source).getNode().getOwnerDocument()); DOMResult result = null; try { - Transformer transformer = new TransformerFactoryImpl().newTransformer(); - result = new DOMResult(); + Transformer transformer = transformerFactory.newTransformer(); + result = new DOMResult(); transformer.transform(source, result); } catch (Exception e) { throw new MarshallingFailureException("Failed to unmarshal SOAP Response", e); @@ -86,13 +89,13 @@ public class WeatherMarshaller implements Marshaller, Unmarshaller, Initializing " " + zip + "" + ""; try { - Transformer transformer = new TransformerFactoryImpl().newTransformer(); + Transformer transformer = transformerFactory.newTransformer(); transformer.transform(new StringSource(xmlString), result); } catch (Exception e) { e.printStackTrace(); } } - + public static final void writeXml(Document document) { Transformer transformer = createIndentingTransformer(); @@ -108,7 +111,7 @@ public class WeatherMarshaller implements Marshaller, Unmarshaller, Initializing public static final Transformer createIndentingTransformer() { Transformer xformer; try { - xformer = TransformerFactory.newInstance().newTransformer(); + xformer = transformerFactory.newTransformer(); xformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); xformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); xformer.setOutputProperty(OutputKeys.INDENT, "yes"); @@ -122,6 +125,6 @@ public class WeatherMarshaller implements Marshaller, Unmarshaller, Initializing } public void afterPropertiesSet() throws Exception { - namespacePrefixes.put("p", "http://ws.cdyne.com/WeatherWS/"); + namespacePrefixes.put("p", "http://ws.cdyne.com/WeatherWS/"); } } diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index d5888fea..ddf3fda0 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - twitter - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Twitter Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-twitter - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + twitter + 2.2.0.BUILD-SNAPSHOT + Twitter Basic Sample + Twitter Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-twitter + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 86a63b7e..61d2f1ab 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -1,72 +1,127 @@ - - 4.0.0 - org.springframework.integration.samples - ws-inbound-gateway - Samples (Basic) - WS Inbound Gateway Sample - 2.2.0.BUILD-SNAPSHOT - war - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-xml - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - org.springframework - spring-test - ${spring.version} - test - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + ws-inbound-gateway + 2.2.0.BUILD-SNAPSHOT + war + WS Inbound Gateway Sample + WS Inbound Gateway Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /ws-inbound-gateway + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-xml + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java index 8aba40d8..121fa952 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java @@ -17,6 +17,7 @@ package org.springframework.integration.samples.ws; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -28,6 +29,7 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.junit.runner.RunWith; import org.w3c.dom.Document; @@ -76,7 +78,7 @@ public class InboundGatewayTests { MessageContext messageContext = new DefaultMessageContext(request, messageFactory); gateway.invoke(messageContext); Object reply = messageContext.getResponse().getPayloadSource(); - assertThat(reply, is(DOMSource.class)); + assertThat(reply, is(instanceOf(DOMSource.class))); DOMSource replySource = (DOMSource) reply; Element element = (Element) replySource.getNode().getFirstChild(); assertThat(element.getTagName(), equalTo("echoResponse")); diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 2d51ecae..f76c377f 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -1,85 +1,106 @@ - - 4.0.0 - org.springframework.integration.samples - ws-outbound-gateway - Samples (Basic) - WS Outbound Gateway Sample - 2.2.0.BUILD-SNAPSHOT - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - 1.3.19 - 1.1.1 - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - com.sun.xml.messaging.saaj - saaj-impl - ${saaj.version} - - - javax.activation - activation - ${javax-activation.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.ws.WebServiceDemoTestApp - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + ws-outbound-gateway + 2.2.0.BUILD-SNAPSHOT + WS Outbound Gateway Sample + WS Outbound Gateway Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java index c42b6855..c403f05d 100644 --- a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java +++ b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java @@ -39,8 +39,8 @@ public class WebServiceDemoTestApp { // Compose the XML message according to the server's schema String requestXml = - "" + - " 90.0" + + "" + + "90.0" + ""; // Create the Message object diff --git a/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml b/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml index e6a3c495..3dd1f2e1 100644 --- a/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml +++ b/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml @@ -18,7 +18,7 @@ Web Service for the given URI, and the reply Message is sent to the 'celsiusChannel'. --> - + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 97b884e7..941aa6ff 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -1,68 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - xml - Samples (Basic) - XML Sample - 2.2.0.BUILD-SNAPSHOT - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-xml - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.xml.BookOrderProcessingTestApp - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + xml + 2.2.0.BUILD-SNAPSHOT + XML Sample + XML Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-xml + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 520f6ebe..2d0049db 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -1,60 +1,100 @@ - + + 4.0.0 org.springframework.integration.samples - xmpp - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - XMPP Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-xmpp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + xmpp + 2.2.0.BUILD-SNAPSHOT + XMPP Basic Sample + XMPP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-xmpp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..9e4db1cd --- /dev/null +++ b/build.gradle @@ -0,0 +1,1045 @@ +description = 'Spring Integration Samples' + +apply plugin: 'base' +apply plugin: 'idea' + +ext { + linkHomepage = 'http://projects.spring.io/spring-integration' + linkCi = 'https://build.spring.io/browse/INTSAMPLES' + linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' + linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' + linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' + linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' +} + +buildscript { + repositories { + maven { url "http://repo.spring.io/libs-milestone" } + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion") + } +} + +allprojects { + group = 'org.springframework.integration.samples' +} + +subprojects { subproject -> + + apply plugin: 'eclipse' + apply plugin: 'idea' + apply plugin: 'maven' + + task generatePom << { + pom { + project { + name = project.description + description = project.description + url = linkHomepage + + organization { + name = 'SpringIO' + url = 'https://spring.io' + } + + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + + scm { + url = linkScmUrl + connection = 'scm:git:' + linkScmConnection + developerConnection = 'scm:git:' + linkScmDevConnection + } + + developers { + developer { + id = 'garyrussell' + name = 'Gary Russell' + email = 'grussell@gopivotal.com' + roles = ["project lead"] + } + developer { + id = 'markfisher' + name = 'Mark Fisher' + email = 'mfisher@gopivotal.com' + roles = ["project founder and lead emeritus"] + } + developer { + id = 'ghillert' + name = 'Gunnar Hillert' + email = 'ghillert@gopivotal.com' + } + developer { + id = 'abilan' + name = 'Artem Bilan' + email = 'abilan@gopivotal.com' + } + } + + if (subproject.plugins.hasPlugin('java')) { + repositories { + repository { + id = 'repo.spring.io.milestone' + name = 'Spring Framework Maven Milestone Repository' + url = 'https://repo.spring.io/libs-milestone' + } + } + } + + if (subproject.plugins.hasPlugin('jetty')) { + packaging = 'war' + build { + plugins { + plugin { + groupId = 'org.mortbay.jetty' + artifactId = 'jetty-maven-plugin' + version = '8.1.14.v20131031' + configuration { + webAppConfig { + contextPath = '/' + subproject.name + } + } + } + } + } + } + + if (subproject.plugins.hasPlugin('spring-boot')) { + parent { + groupId = 'org.springframework.boot' + artifactId = 'spring-boot-starter-parent' + version = springBootVersion + } + + build { + plugins { + plugin { + groupId = 'org.springframework.boot' + artifactId = 'spring-boot-maven-plugin' + } + } + } + } + + } + }.writeTo('pom.xml') + } + + eclipse { + project { + natures += 'org.springframework.ide.eclipse.core.springnature' + } + } + + repositories { + maven { url 'http://repo.spring.io/libs-milestone' } + } + + if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { + + apply plugin: 'java' + + sourceCompatibility = 1.6 + + ext { + activeMqVersion = '5.9.0' + aspectjVersion = '1.8.0' + commonsDigesterVersion = '2.0' + commonsDbcpVersion = '1.2.2' + commonsFileUploadVersion = '1.2.2' + commonsIoVersion = '2.4' + commonsLangVersion = '2.6' + commonsPoolVersion = '1.5.4' + c3p0Version = '0.9.1.2' + derbyVersion = '10.10.1.1' + hamcrestVersion = '1.3' + hibernateVersion = '4.2.11.Final' + hibernateValidatorVersion = '4.2.0.Final' + ftpServerVersion = '1.0.6' + flexjsonVersion = '2.0' + groovyVersion = '2.3.0' + hsqldbVersion = '2.3.2' + h2Version = '1.3.175' + jacksonVersion = '2.3.2' + jasyptVersion = '1.7' + javaxInjectVersion = '1' + javaxMailVersion = '1.4.7' + jodaTimeVersion = '1.6' + jtaVersion = '1.1' + jtdsVersion = '1.2.6' + jmsApiVersion = '1.1-rev-1' + jrubyVersion = '1.7.12' + jpaApiVersion = '2.0.0' + jstlVersion = '1.2' + junitVersion = '4.11' + jythonVersion = '2.5.3' + log4jVersion = '1.2.17' + mockitoVersion = '1.9.5' + openJpaVersion = '2.3.0' + oracleDriverVersion = '11.2.0.3' + postgresVersion = '9.1-901-1.jdbc4' + subethasmtpVersion = '1.2' + slf4jVersion = '1.7.6' + springIntegrationVersion = '4.0.1.RELEASE' + springIntegrationDslVersion = '1.0.0.M1' + springVersion = '4.0.5.RELEASE' + springSecurityVersion = '3.2.4.RELEASE' + springWebFlowVersion = '2.3.3.RELEASE' + tilesJspVersion = '2.2.1' + validationApiVersion = '1.0.0.GA' + } + + sourceSets.each { + it.resources.srcDirs = ["src/${it.name}/resources", "src/${it.name}/java"] + } + + // dependencies that are common across all java projects + dependencies { + compile "log4j:log4j:$log4jVersion" + + testCompile("junit:junit:$junitVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion" + testCompile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.springframework:spring-test:$springVersion" + } + + // enable all compiler warnings; individual projects may customize further + ext.xLintArg = '-Xlint:all,-options' + [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] + + test { + // suppress all console output during testing unless running `gradle -i` + logging.captureStandardOutput(LogLevel.INFO) + } + + task checkTestConfigs << { + def configFiles = [] + sourceSets.test.allSource.srcDirs.each { + fileTree(it).include('**/*.xml').exclude('**/log4j.xml').each { configFile -> + def configXml = new XmlParser(false, false).parse(configFile) + + if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) { + configFiles << configFile + } + } + } + if (configFiles) { + throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' + + configFiles.collect { relativePath(it) }.join('\n') + + '\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' + + 'on different versions of dependencies.') + } + } + + test.dependsOn checkTestConfigs + } + + task cleanTarget(type: Delete) { + delete 'target' + } + + clean.dependsOn cleanTarget +} + +project('advanced-testing-examples') { + description = 'Advanced Testing Examples' + + dependencies { + compile "javax.jms:jms-api:$jmsApiVersion" + compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + } +} + +project('dynamic-ftp') { + description = 'Dynamic FTP Demo' + + dependencies { + compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + } +} + +project('cafe-si') { + description = 'Cafe - Pure Spring Integration' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + } +} + +project('cafe-amqp') { + description = 'Cafe - With AMQP Message Broker' + + dependencies { + compile project(":cafe-si") + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + } +} + +project('cafe-jms') { + description = 'Cafe - With JMS Message Broker' + + dependencies { + compile project(":cafe-si") + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + } +} + +project('cafe-scripted') { + description = 'Cafe Sample (Scripted Implementation)' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-rmi:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" + compile "org.jruby:jruby:$jrubyVersion" + compile "org.python:jython-standalone:$jythonVersion" + compile "org.codehaus.groovy:groovy-all:$groovyVersion" + } + + task runCafeDemoApp(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.CafeDemoApp' + args project.hasProperty('lang') ? project.lang : '' + classpath = sourceSets.main.runtimeClasspath + } + + task runControlBus(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.ControlBusMain' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('loan-broker') { + description = 'Loan Broker Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + } + + task runLoanBrokerSharkDetectorDemo(type: JavaExec) { + main 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerSharkDetectorDemo' + classpath = sourceSets.main.runtimeClasspath + } + +} + +project('loanshark') { + description = 'Loan Shark Sample' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework:spring-orm:$springVersion" + compile "org.springframework:spring-aop:$springVersion" + compile "org.springframework:spring-aspects:$springVersion" + compile "org.aspectj:aspectjtools:$aspectjVersion" + compile "org.springframework:spring-jdbc:$springVersion" + compile "org.springframework:spring-tx:$springVersion" + compile "org.springframework:spring-context:$springVersion" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + compile "org.slf4j:jcl-over-slf4j:$slf4jVersion" + compile "commons-digester:commons-digester:$commonsDigesterVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" + compile "joda-time:joda-time:$jodaTimeVersion" + compile "javax.transaction:jta:$jtaVersion" + compile "org.hsqldb:hsqldb:$hsqldbVersion" + compile "net.sf.flexjson:flexjson:$flexjsonVersion" + compile "javax.validation:validation-api:$validationApiVersion" + compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion" + compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" + compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" + compile "org.springframework.webflow:spring-js:$springWebFlowVersion" + } + +} + +project('amqp') { + description = 'AMQP Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.amqp.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + } +} + +project('control-bus') { + description = 'Control Bus Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } +} + +project('enricher') { + description = 'Enricher Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.enricher.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + } +} + +project('feed') { + description = 'Feed (RSS/ATOM) Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-feed:$springIntegrationVersion" + } +} + +project('file') { + description = 'File Copy Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + } +} + +project('ftp') { + description = 'FTP Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } + + test { + include '**/TestSuite*' + } +} + +project('helloworld') { + description = 'Hello World Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } + + task runHelloWorldApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.HelloWorldApp' + classpath = sourceSets.main.runtimeClasspath + } + + task runPollerApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.PollerApp' + classpath = sourceSets.main.runtimeClasspath + } + +} + +project('http') { + description = 'HTTP Sample' + + apply plugin: 'application' + apply plugin: 'jetty' + + mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' + + dependencies { + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + } + +} + +project('si4demo') { + description = 'Java Configuration/DSL Sample' + + apply plugin: 'spring-boot' + + sourceCompatibility = 1.8 + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" + + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + + mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' +} + +project('jdbc') { + description = 'JDBC Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.jdbc.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + } +} + +project('jms') { + description = 'JMS Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.jms.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('jmx') { + description = 'JMX Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + } +} + +project('jpa') { + description = 'JPA Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.jpa.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jpa:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" + compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" + compile "commons-lang:commons-lang:$commonsLangVersion" + + runtime "org.springframework:spring-instrument:$springVersion" + runtime "org.apache.openjpa:openjpa:$openJpaVersion" + + } + + //Suppress openjpa annotation processor warnings + compileTestJava.options.compilerArgs = ["${xLintArg},-processing"] + + run { + def javaAgents = configurations.testRuntime.resolvedConfiguration.resolvedArtifacts + .findAll { it.name in ['spring-instrument', 'openjpa'] } + .collect { "-javaagent:${it.file}" } + jvmArgs javaAgents + } +} + +project('mail') { + description = 'Mail (IMAP + POP3) Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" + compile "org.springframework:spring-context:$springVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:mailapi:$javaxMailVersion" + } + + task runGmailInboundPop3AdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundPop3AdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + + } + + task runGmailInboundImapIdleAdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundImapIdleAdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('mongodb') { + description = 'MongoDb Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-mongodb:$springIntegrationVersion" + } + + task runMongoDbInboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbInboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runMongoDbOutboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbOutboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('oddeven') { + description = 'Odd-Even Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } + + task runCronOddEvenDemo(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.CronOddEvenDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runIntervalOddEvenDemoTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('quote') { + description = 'Quote Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + } +} + +project('sftp') { + description = 'SFTP Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-sftp:$springIntegrationVersion" + } + + test { + exclude '**/*Sample*' + } +} + +project('tcp-amqp') { + description = 'TCP-AMQP Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + } +} + +project('tcp-client-server') { + description = 'TCP Client Server Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "commons-lang:commons-lang:$commonsLangVersion" + compile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('testing-examples') { + description = 'Testing Examples' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('twitter') { + description = 'Twitter Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + } + + test { + exclude '**/*Sample*' + } +} + +project('ws-inbound-gateway') { + description = 'WS Inbound Gateway Sample' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + } + + test { + exclude '**/InContainerTests*' + } +} + +project('ws-outbound-gateway') { + description = 'WS Outbound Gateway Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" +// compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' + } +} + +project('xml') { + description = 'XML Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' + + dependencies { + compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" + } +} + +project('xmpp') { + description = 'XMPP Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-xmpp:$springIntegrationVersion" + } + + test { + exclude '**/*Sample*' + } +} + +project('async-gateway') { + description = 'Async Gateway Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } +} + +project('dynamic-poller') { + description = 'Dynamic Poller Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.poller.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } +} + +project('errorhandling') { + description = 'Error Handling Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + } +} + +project('file-processing') { + description = 'File Processing Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + } +} + +project('mail-attachments') { + description = 'Mail Attachment Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.mailattachments.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "com.sun.mail:mailapi:$javaxMailVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" + + } +} + +project('monitoring') { + description = 'Monitoring Application' + + apply plugin: 'jetty' + apply plugin: 'application' + + mainClassName = 'org.springintegration.SpringIntegrationTest' + + dependencies { + compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "javax.servlet:jstl:$jstlVersion" + } +} + +project('multipart-http') { + description = 'HTTP Multipart Demo' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + } +} + +project('rest-http') { + description = 'Spring Integration Rest HTTP Path Usage Demo' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework:spring-oxm:$springVersion" + compile "org.springframework:spring-tx:$springVersion" + compile "org.springframework:spring-jdbc:$springVersion" + compile "org.springframework:spring-context:$springVersion" + compile "org.springframework:spring-aop:$springVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile "org.springframework.security:spring-security-web:$springSecurityVersion" + compile "org.springframework.security:spring-security-config:$springSecurityVersion" + compile "org.jasypt:jasypt:$jasyptVersion" + } + + test { + exclude '**/RestHttpClientTest*' + } + +} + +project('retry-and-more') { + description = 'Retry and More Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + compile "org.hamcrest:hamcrest-all:$hamcrestVersion" + } + + task runCircuitBreakerDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.CircuitBreakerDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferDeleteAfterSuccessDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferDeleteAfterSuccessDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferRenameAfterFailureDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferRenameAfterFailureDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatefulRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatefulRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatelessRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatelessRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('splitter-aggregator-reaper') { + description = 'Splitter-Aggregator-Reaper Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "javax.inject:javax.inject:$javaxInjectVersion" + } +} + + +project('stored-procedures-derby') { + description = 'Derby Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.apache.derby:derby:$derbyVersion" + } +} + +project('stored-procedures-oracle') { + description = 'Oracle Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + repositories { + maven { url 'https://code.lds.org/nexus/content/groups/main-repo' } //Oracle JDBC Driver + } + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "com.oracle:ojdbc6:$oracleDriverVersion" + } + + test { + exclude '**/StringConversionServiceTest*' + } +} + +project('stored-procedures-ms') { + description = 'MS SQLServer Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "net.sourceforge.jtds:jtds:$jtdsVersion" + compile "c3p0:c3p0:$c3p0Version" + } + + test { + exclude '**/StringConversionServiceTest*' + } +} + +project('stored-procedures-postgresql') { + description = 'PostgreSQL Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "postgresql:postgresql:$postgresVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + } +} + +project('tcp-client-server-multiplex') { + description = 'TCP Client Server Multiplexing Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('travel') { + description = 'Travel Services Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.travel.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework:spring-web:$springVersion" + } +} + +project('tx-synch') { + description = 'Transaction Synchronization Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + } +} + +task wrapper(type: Wrapper) { + description = 'Generates gradlew[.bat] scripts' + gradleVersion = '1.12' + distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip" +} diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md index 1e9ecebc..05e100bf 100644 --- a/dsl/si4demo/README.md +++ b/dsl/si4demo/README.md @@ -6,9 +6,11 @@ It's currently using the spring-boot 1.1.0.M1 milestone so you may have to add t There are two demo applications: -__demo.Application__ is a Spring Boot application using Spring Integration 4.0 Java configuration features. +__org.springframework.integration.samples.javaconfig.annotations.Application__ is a Spring Boot application using +Spring Integration 4.0 Java configuration features. -__dsl.Application__ is the equivalent application using the new Java DSL that is currently being developed in the [extensions github repository](https://github.com/spring-projects/spring-integration-extensions/tree/master/spring-integration-java-dsl) +__org.springframework.integration.samples.javaconfig.dsl.Application__ is the equivalent application using the new Java +DSL that is currently being developed in the [extensions github repository](https://github.com/spring-projects/spring-integration-extensions/tree/master/spring-integration-java-dsl) In both cases, you can use Telnet or curl to search twitter diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml deleted file mode 100644 index 806e9ab9..00000000 --- a/dsl/si4demo/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - org.springframework.integration - si4demo - 0.0.1-SNAPSHOT - - demo - Demo project - - - org.springframework.boot - spring-boot-starter-parent - 1.1.0.M1 - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.integration - spring-integration-twitter - 4.0.0.RELEASE - - - org.springframework.integration - spring-integration-java-dsl - 1.0.0.M1 - - - - - UTF-8 - demo.Application - 1.7 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/dsl/si4demo/src/main/java/demo/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java similarity index 98% rename from dsl/si4demo/src/main/java/demo/Application.java rename to dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java index 6ff67d99..93c6ef32 100644 --- a/dsl/si4demo/src/main/java/demo/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package demo; +package org.springframework.integration.samples.si4demo.annotations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; diff --git a/dsl/si4demo/src/main/java/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java similarity index 98% rename from dsl/si4demo/src/main/java/dsl/Application.java rename to dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java index 42c763b2..99716c9c 100644 --- a/dsl/si4demo/src/main/java/dsl/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dsl; +package org.springframework.integration.samples.si4demo.dsl; import java.util.Scanner; diff --git a/dsl/si4demo/src/test/java/demo/ApplicationTests.java b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java similarity index 77% rename from dsl/si4demo/src/test/java/demo/ApplicationTests.java rename to dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java index b4f14b77..40d86611 100644 --- a/dsl/si4demo/src/test/java/demo/ApplicationTests.java +++ b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java @@ -1,10 +1,12 @@ -package demo; +package org.springframework.integration.samples.si4demo; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.web.WebAppConfiguration; + import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.integration.samples.si4demo.annotations.Application; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = Application.class) diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..ddf3be4e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +version=2.2.0.BUILD-SNAPSHOT +springBootVersion=1.1.0.M2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..b979729d Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..d68fee2c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Apr 17 15:51:10 EEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index e3dac1d3..b4ec04cf 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -1,61 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - async-gateway - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - Async Gateway Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + async-gateway + 2.2.0.BUILD-SNAPSHOT + Async Gateway Sample + Async Gateway Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 67f8ac82..4de41cff 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -1,74 +1,100 @@ - - 4.0.0 - - org.springframework.integration.samples - dynamic-poller - 2.2.0.BUILD-SNAPSHOT - jar - - dynamic-poller - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - org.springframework.integration.samples.poller.Main - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + dynamic-poller + 2.2.0.BUILD-SNAPSHOT + Dynamic Poller Sample + Dynamic Poller Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 3d2bb75b..8969441e 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -1,66 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - errorhandling - Samples (Intermediate) - Error Handling Sample - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + errorhandling + 2.2.0.BUILD-SNAPSHOT + Error Handling Sample + Error Handling Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 8d9dc11e..ffff2389 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - file-processing - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - File Processing - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - 2.2.1 - - - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + file-processing + 2.2.0.BUILD-SNAPSHOT + File Processing Sample + File Processing Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index ff848d91..f8d84c97 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -1,110 +1,136 @@ - - 4.0.0 - org.springframework.integration.samples - mail-attachments - Samples (Intermediate) - Mail Attachment Demo - 2.2.0.BUILD-SNAPSHOT - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - 2.2.1 - - - - - org.springframework.integration - spring-integration-mail - ${spring.integration.version} - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - test - - - javax.activation - activation - 1.1.1 - - - javax.mail - mail - 1.4.5 - - - commons-io - commons-io - 2.4 - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.subethamail - subethasmtp-wiser - 1.2 - test - - - - log4j - log4j - ${log4j.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.mailattachments.Main - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + mail-attachments + 2.2.0.BUILD-SNAPSHOT + Mail Attachment Sample + Mail Attachment Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + commons-io + commons-io + 2.4 + compile + + + org.subethamail + subethasmtp-wiser + 1.2 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + org.springframework.integration + spring-integration-mail + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + javax.mail + javax.mail-api + 1.4.7 + compile + + + com.sun.mail + mailapi + 1.4.7 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 3f49ce29..2106d8d4 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -1,144 +1,139 @@ - - 4.0.0 - - org.springframework.integration.sample - monitoring - 2.2.0.BUILD-SNAPSHOT - war - - monitoring - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - 1.5 - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework - spring-context - ${spring.version} - - - - org.springframework - spring-webmvc - ${spring.version} - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jmx - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-twitter - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.2 - - + + + 4.0.0 + org.springframework.integration.samples + monitoring + 2.2.0.BUILD-SNAPSHOT + war + Monitoring Application + Monitoring Application + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /monitoring + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + javax.servlet + jstl + 1.2 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jmx + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-twitter + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-groovy + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java b/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java index 1c5a11ff..47c7ea6c 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java @@ -19,8 +19,9 @@ import java.util.Collection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.model.TwitterMessage; +import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; import org.springframework.integration.service.TwitterService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java similarity index 97% rename from intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java index 3c1b25fd..3d803fcb 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; import java.util.Date; diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java similarity index 94% rename from intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java index 85cd3380..dccc7dcd 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java @@ -17,7 +17,8 @@ package org.springframework.integration.service; import java.util.Collection; -import org.springframework.integration.model.TwitterMessage; +import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; + /** * Provides some basic methods for controlling the flow of Twitter messages. diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java similarity index 100% rename from intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java diff --git a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java b/intermediate/monitoring/src/main/java/org/springintegration/SpringIntegrationTest.java similarity index 91% rename from intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java rename to intermediate/monitoring/src/main/java/org/springintegration/SpringIntegrationTest.java index 8179cdc3..611f9d1e 100644 --- a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/SpringIntegrationTest.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.springframework.integration; - -import org.junit.Test; +package org.springintegration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -37,9 +35,4 @@ public class SpringIntegrationTest { context.close(); } - @Test - public void test() { - // no op for maven - } - } diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java index c3a1d482..d7004fa8 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java @@ -21,16 +21,16 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; -import org.springframework.integration.model.TwitterMessage; +import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.service.TwitterService; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedMetric; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.jmx.support.MetricType; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.social.twitter.api.Tweet; import org.springframework.stereotype.Service; diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 27622d8e..877ffa44 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -1,84 +1,139 @@ - - 4.0.0 - org.springframework.integration.samples - multipart-http - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - HTTP Multipart Demo - war - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.2 - 1.3.2 - 1.2.17 - - - - 2.2.1 - - - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - compile - true - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload} - - - org.apache.commons - commons-io - 1.3.2 - - - log4j - log4j - ${log4j.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + multipart-http + 2.2.0.BUILD-SNAPSHOT + war + HTTP Multipart Demo + HTTP Multipart Demo + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /multipart-http + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + commons-io + commons-io + 2.4 + compile + + + log4j + log4j + 1.2.17 + compile + + + commons-fileupload + commons-fileupload + 1.2.2 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 9b2f0bd6..5a6d807e 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -1,36 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - intermediate-samples - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Intermediate - pom - - - 2.2.1 - - - - async-gateway - errorhandling - file-processing - multipart-http - rest-http - splitter-aggregator-reaper - stored-procedures-derby - tcp-client-server-multiplex - travel - mail-attachments - dynamic-poller - monitoring - retry-and-more - stored-procedures-ms - stored-procedures-oracle - stored-procedures-postgresql - tx-synch - - + + 4.0.0 + org.springframework.integration.samples + intermediate + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 09e9edd0..afdeb9c4 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -1,245 +1,175 @@ - - 4.0.0 - org.springframework.integration.samples - rest-http - 2.2.0.BUILD-SNAPSHOT - war - Spring Integration Rest HTTP Path Usage Demo - Spring Integration Rest HTTP Path Usage Demo - - - 2.2.1 - - - - 4.0.0.RC1 - 4.0.3.RELEASE - 3.1.4.RELEASE - 1.2 - 1.3.2 - 1.2.17 - 2.5 - 4.11 - 1.7 - 2.2 - - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - compile - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-oxm - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework.security - spring-security-core - compile - ${spring.security.version} - - - org.springframework - spring-support - - - - - org.springframework.security - spring-security-config - compile - ${spring.security.version} - - - org.springframework - spring-support - - - - - org.springframework.security - spring-security-web - compile - ${spring.security.version} - - - log4j - log4j - ${log4j.version} - - - org.jasypt - jasypt - ${jasypt.version} - runtime - - - cglib - cglib - ${cglib.version} - runtime - - - - javax.servlet - servlet-api - ${javax.servlet.version} - provided - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework - spring-tx - - - - - junit - junit - ${junit.version} - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - clean - - - Copying jaxb.index to classes folder - - - - - - - - - - clean - - run - - - - - - maven-surefire-plugin - 2.14 - - - default-test - - - **/*Test*.java - - - - - default-integration-test - integration-test - - test - - - - none - - - **/*Test.java - - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.1 - - true - - - - run-tomcat - pre-integration-test - - run - - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + rest-http + 2.2.0.BUILD-SNAPSHOT + war + Spring Integration Rest HTTP Path Usage Demo + Spring Integration Rest HTTP Path Usage Demo + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /rest-http + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-context + 4.0.3.RELEASE + compile + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + org.springframework + spring-jdbc + 4.0.3.RELEASE + compile + + + org.springframework.security + spring-security-web + 3.2.3.RELEASE + compile + + + org.springframework + spring-oxm + 4.0.3.RELEASE + compile + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.jasypt + jasypt + 1.7 + compile + + + org.springframework + spring-tx + 4.0.3.RELEASE + compile + + + org.springframework + spring-aop + 4.0.3.RELEASE + compile + + + org.springframework.security + spring-security-config + 3.2.3.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/jaxb.index b/intermediate/rest-http/src/main/resources/org/springframework/integration/samples/rest/domain/jaxb.index similarity index 100% rename from intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/jaxb.index rename to intermediate/rest-http/src/main/resources/org/springframework/integration/samples/rest/domain/jaxb.index diff --git a/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log b/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log index ee28183f..21d6cfc2 100644 --- a/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log +++ b/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log @@ -558,3 +558,270 @@ 2013-03-30 00:53:00,709 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped _org.springframework.integration.errorLogger 2013-03-30 00:53:00,709 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@58773ac1: defining beans [org.springframework.security.access.method.DelegatingMethodSecurityMetadataSource#0,org.springframework.security.access.vote.AffirmativeBased#0,org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor#0,org.springframework.security.methodSecurityMetadataSourceAdvisor,org.springframework.aop.config.internalAutoProxyCreator,org.springframework.security.filterChains,org.springframework.security.filterChainProxy,org.springframework.security.web.PortMapperImpl#0,org.springframework.security.web.PortResolverImpl#0,org.springframework.security.config.authentication.AuthenticationManagerFactoryBean#0,org.springframework.security.authentication.ProviderManager#0,org.springframework.security.web.context.HttpSessionSecurityContextRepository#0,org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy#0,org.springframework.security.web.savedrequest.HttpSessionRequestCache#0,org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler#0,org.springframework.security.access.vote.AffirmativeBased#1,org.springframework.security.web.access.intercept.FilterSecurityInterceptor#0,org.springframework.security.web.access.DefaultWebInvocationPrivilegeEvaluator#0,org.springframework.security.authentication.AnonymousAuthenticationProvider#0,org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint#0,org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter#0,org.springframework.security.userDetailsServiceFactory,org.springframework.security.web.DefaultSecurityFilterChain#0,org.springframework.security.provisioning.InMemoryUserDetailsManager#0,org.springframework.security.authentication.dao.DaoAuthenticationProvider#0,org.springframework.security.authentication.DefaultAuthenticationEventPublisher#0,org.springframework.security.authenticationManager,jasyptStringDigester,passwordEncoder,channelInitializer,$autoCreateChannelCandidates,org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,org.springframework.integration.internalMessagingAnnotationPostProcessor,org.springframework.integration.internalPublisherAnnotationBeanPostProcessor,org.springframework.integration.http.inbound.UriPathHandlerMapping#0,employeeSearchRequest,employeeSearchResponse,inboundEmployeeSearchRequestGateway,org.springframework.web.servlet.view.ContentNegotiatingViewResolver#0,marshaller,org.springframework.integration.config.ServiceActivatorFactoryBean#0,employeeServiceActivator,jaxbJacksonObjectMapper,employeeSearchService,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.ConfigurationClassPostProcessor.importAwareProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler,org.springframework.integration.config.IdGeneratorConfigurer#0]; root of factory hierarchy 2013-03-30 00:53:00,709 INFO [org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] - Shutting down ExecutorService 'taskScheduler' +2014-04-17 19:11:50,411 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization started +2014-04-17 19:11:50,461 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing Root WebApplicationContext: startup date [Thu Apr 17 19:11:50 EEST 2014]; root of context hierarchy +2014-04-17 19:11:50,484 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from ServletContext resource [/WEB-INF/config/web-application-config.xml] +2014-04-17 19:11:50,601 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from ServletContext resource [/WEB-INF/config/security-config.xml] +2014-04-17 19:11:50,630 INFO [org.springframework.security.core.SpringSecurityCoreVersion] - You are running with Spring Security Core 3.2.3.RELEASE +2014-04-17 19:11:50,630 INFO [org.springframework.security.config.SecurityNamespaceHandler] - Spring Security 'config' module version is 3.2.3.RELEASE +2014-04-17 19:11:50,661 INFO [org.springframework.security.config.http.FilterInvocationSecurityMetadataSourceParser] - Creating access control expression attribute 'hasRole('ROLE_REST_HTTP_USER')' for /services/employee/* +2014-04-17 19:11:50,671 INFO [org.springframework.security.config.http.AuthenticationConfigBuilder] - No login page configured. The default internal one will be used. Use the 'login-page' attribute to set the URL of the login page. +2014-04-17 19:11:50,677 INFO [org.springframework.security.config.http.HttpSecurityBeanDefinitionParser] - Checking sorted filter chain: [Root bean: class [org.springframework.security.web.context.SecurityContextPersistenceFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 200, Root bean: class [org.springframework.security.web.authentication.logout.LogoutFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 700, , order = 1100, Root bean: class [org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1300, Root bean: class [org.springframework.security.web.authentication.www.BasicAuthenticationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1500, Root bean: class [org.springframework.security.web.savedrequest.RequestCacheAwareFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1600, Root bean: class [org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1700, Root bean: class [org.springframework.security.web.authentication.AnonymousAuthenticationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 2000, Root bean: class [org.springframework.security.web.session.SessionManagementFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 2100, Root bean: class [org.springframework.security.web.access.ExceptionTranslationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 2200, , order = 2300] +2014-04-17 19:11:50,690 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from class path resource [META-INF/spring/integration/applicationContext-http-int.xml] +2014-04-17 19:11:50,752 INFO [org.springframework.beans.factory.config.PropertiesFactoryBean] - Loading properties file from URL [jar:file:/C:/Users/artembilan/.gradle/caches/modules-2/files-2.1/org.springframework.integration/spring-integration-core/4.0.0.RC1/c69da0a1655a21b0c8d31e933295984f35fec993/spring-integration-core-4.0.0.RC1.jar!/META-INF/spring.integration.default.properties] +2014-04-17 19:11:50,758 INFO [org.springframework.integration.config.IntegrationRegistrar] - No bean named 'integrationHeaderChannelRegistry' has been explicitly defined. Therefore, a default DefaultHeaderChannelRegistry will be created. +2014-04-17 19:11:50,906 INFO [org.springframework.integration.config.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created. +2014-04-17 19:11:50,908 INFO [org.springframework.integration.config.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'taskScheduler' has been explicitly defined. Therefore, a default ThreadPoolTaskScheduler will be created. +2014-04-17 19:11:50,915 INFO [org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor] - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring +2014-04-17 19:11:50,977 INFO [org.springframework.beans.factory.config.PropertiesFactoryBean] - Loading properties file from URL [jar:file:/C:/Users/artembilan/.gradle/caches/modules-2/files-2.1/org.springframework.integration/spring-integration-core/4.0.0.RC1/c69da0a1655a21b0c8d31e933295984f35fec993/spring-integration-core-4.0.0.RC1.jar!/META-INF/spring.integration.default.properties] +2014-04-17 19:11:50,979 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'integrationGlobalProperties' of type [class org.springframework.beans.factory.config.PropertiesFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:50,980 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'integrationGlobalProperties' of type [class java.util.Properties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:50,986 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'messageBuilderFactory' of type [class org.springframework.integration.support.DefaultMessageBuilderFactory] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,038 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean '(inner bean)#653fbbfc' of type [class org.springframework.integration.channel.MessagePublishingErrorHandler] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,039 INFO [org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] - Initializing ExecutorService 'taskScheduler' +2014-04-17 19:11:51,041 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'taskScheduler' of type [class org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,041 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'integrationHeaderChannelRegistry' of type [class org.springframework.integration.channel.DefaultHeaderChannelRegistry] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,061 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean '(inner bean)#318155b1' of type [class org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,074 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'org.springframework.security.access.method.DelegatingMethodSecurityMetadataSource#0' of type [class org.springframework.security.access.method.DelegatingMethodSecurityMetadataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,080 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'org.springframework.security.methodSecurityMetadataSourceAdvisor' of type [class org.springframework.security.access.intercept.aopalliance.MethodSecurityMetadataSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,250 INFO [org.springframework.beans.factory.config.PropertiesFactoryBean] - Loading properties file from class path resource [users.properties] +2014-04-17 19:11:52,016 INFO [org.springframework.security.web.DefaultSecurityFilterChain] - Creating filter chain: org.springframework.security.web.util.matcher.AnyRequestMatcher@1, [org.springframework.security.web.context.SecurityContextPersistenceFilter@1aa7d66e, org.springframework.security.web.authentication.logout.LogoutFilter@5cc85ffc, org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter@189f2184, org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter@57386162, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@7388d94d, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@6da14f7f, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@c53c04e, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@18f493d7, org.springframework.security.web.session.SessionManagementFilter@2d036335, org.springframework.security.web.access.ExceptionTranslationFilter@4a3e1b5d, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@587df3e4] +2014-04-17 19:11:52,332 INFO [org.springframework.oxm.jaxb.Jaxb2Marshaller] - Creating JAXBContext with context path [org.springframework.integration.samples.rest.domain] +2014-04-17 19:11:52,486 WARN [org.springframework.web.servlet.view.ContentNegotiatingViewResolver] - Did not find any ViewResolvers to delegate to; please configure them using the 'viewResolvers' property on the ContentNegotiatingViewResolver +2014-04-17 19:11:52,607 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Starting beans in phase -2147483648 +2014-04-17 19:11:52,609 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Starting beans in phase 0 +2014-04-17 19:11:52,612 INFO [org.springframework.integration.http.inbound.HttpRequestHandlingController] - started inboundEmployeeSearchRequestGateway +2014-04-17 19:11:52,612 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Adding {service-activator:employeeServiceActivator} as a subscriber to the 'employeeSearchRequest' channel +2014-04-17 19:11:52,613 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchRequest' has 1 subscriber(s). +2014-04-17 19:11:52,614 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - started employeeServiceActivator +2014-04-17 19:11:52,614 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Adding {logging-channel-adapter:_org.springframework.integration.errorLogger} as a subscriber to the 'errorChannel' channel +2014-04-17 19:11:52,615 INFO [org.springframework.integration.channel.PublishSubscribeChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.errorChannel' has 1 subscriber(s). +2014-04-17 19:11:52,616 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - started _org.springframework.integration.errorLogger +2014-04-17 19:11:52,624 INFO [org.springframework.integration.http.inbound.IntegrationRequestMappingHandlerMapping] - Mapped "{[/services/employee/{id}/search],methods=[GET || POST],params=[],headers=[],consumes=[],produces=[],custom=[]}" onto public abstract void org.springframework.web.HttpRequestHandler.handleRequest(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws javax.servlet.ServletException,java.io.IOException +2014-04-17 19:11:52,628 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 2216 ms +2014-04-17 19:11:52,679 INFO [org.springframework.web.servlet.DispatcherServlet] - FrameworkServlet 'Spring Integration Rest HTTP Path Usage': initialization started +2014-04-17 19:11:52,682 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing WebApplicationContext for namespace 'Spring Integration Rest HTTP Path Usage-servlet': startup date [Thu Apr 17 19:11:52 EEST 2014]; parent: Root WebApplicationContext +2014-04-17 19:11:52,702 INFO [org.springframework.web.servlet.DispatcherServlet] - FrameworkServlet 'Spring Integration Rest HTTP Path Usage': initialization completed in 22 ms +2014-04-17 19:12:02,929 WARN [org.springframework.web.servlet.PageNotFound] - No mapping found for HTTP request with URI [/rest-http/] in DispatcherServlet with name 'Spring Integration Rest HTTP Path Usage' +2014-04-17 19:18:09,597 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Adding {bridge:null} as a subscriber to the 'employeeSearchResponse' channel +2014-04-17 19:18:09,598 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchResponse' has 1 subscriber(s). +2014-04-17 19:18:09,599 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - started org.springframework.integration.endpoint.EventDrivenConsumer@61063288 +2014-04-17 19:18:09,622 WARN [org.springframework.integration.http.inbound.HttpRequestHandlingController] - failure occurred in gateway sendAndReceive +org.springframework.messaging.MessageHandlingException: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:78) + at org.springframework.integration.handler.ServiceActivatingHandler.handleRequestMessage(ServiceActivatingHandler.java:71) + at org.springframework.integration.handler.AbstractReplyProducingMessageHandler.handleMessageInternal(AbstractReplyProducingMessageHandler.java:170) + at org.springframework.integration.handler.AbstractMessageHandler.handleMessage(AbstractMessageHandler.java:78) + at org.springframework.integration.dispatcher.AbstractDispatcher.tryOptimizedDispatch(AbstractDispatcher.java:116) + at org.springframework.integration.dispatcher.UnicastingDispatcher.doDispatch(UnicastingDispatcher.java:101) + at org.springframework.integration.dispatcher.UnicastingDispatcher.dispatch(UnicastingDispatcher.java:97) + at org.springframework.integration.channel.AbstractSubscribableChannel.doSend(AbstractSubscribableChannel.java:77) + at org.springframework.integration.channel.AbstractMessageChannel.send(AbstractMessageChannel.java:255) + at org.springframework.messaging.core.GenericMessagingTemplate.doSend(GenericMessagingTemplate.java:114) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:154) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:44) + at org.springframework.messaging.core.AbstractMessagingTemplate.sendAndReceive(AbstractMessagingTemplate.java:75) + at org.springframework.integration.gateway.MessagingGatewaySupport.doSendAndReceive(MessagingGatewaySupport.java:250) + at org.springframework.integration.gateway.MessagingGatewaySupport.sendAndReceiveMessage(MessagingGatewaySupport.java:224) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.actualDoHandleRequest(HttpRequestHandlingEndpointSupport.java:505) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.doHandleRequest(HttpRequestHandlingEndpointSupport.java:408) + at org.springframework.integration.http.inbound.HttpRequestHandlingController.handleRequest(HttpRequestHandlingController.java:150) + at org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter.handle(SimpleControllerHandlerAdapter.java:50) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:938) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:870) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:961) + at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:852) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:707) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:837) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:820) + at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:511) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1166) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:154) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilter(BasicAuthenticationFilter.java:150) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter.doFilter(DefaultLoginPageGeneratingFilter.java:155) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:110) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192) + at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160) + at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:344) + at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:261) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:108) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) + at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) + at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) + at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) + at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:440) + at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) + at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) + at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) + at org.mortbay.jetty.Server.handle(Server.java:326) + at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) + at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:926) + at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:549) + at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) + at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) + at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:410) + at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) +Caused by: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.security.access.vote.AffirmativeBased.decide(AffirmativeBased.java:83) + at org.springframework.security.access.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:206) + at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:60) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:179) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:644) + at org.springframework.integration.samples.rest.service.EmployeeSearchService$$EnhancerBySpringCGLIB$$3f3a4466.getEmployee() + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:483) + at org.springframework.expression.spel.support.ReflectiveMethodExecutor.execute(ReflectiveMethodExecutor.java:63) + at org.springframework.expression.spel.ast.MethodReference.getValueInternal(MethodReference.java:122) + at org.springframework.expression.spel.ast.MethodReference.access$000(MethodReference.java:44) + at org.springframework.expression.spel.ast.MethodReference$MethodValueRef.getValue(MethodReference.java:258) + at org.springframework.expression.spel.ast.CompoundExpression.getValueInternal(CompoundExpression.java:84) + at org.springframework.expression.spel.ast.SpelNodeImpl.getTypedValue(SpelNodeImpl.java:114) + at org.springframework.expression.spel.standard.SpelExpression.getValue(SpelExpression.java:111) + at org.springframework.integration.util.AbstractExpressionEvaluator.evaluateExpression(AbstractExpressionEvaluator.java:159) + at org.springframework.integration.util.MessagingMethodInvokerHelper.processInternal(MessagingMethodInvokerHelper.java:268) + at org.springframework.integration.util.MessagingMethodInvokerHelper.process(MessagingMethodInvokerHelper.java:142) + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:75) + ... 75 more +2014-04-17 19:20:29,108 WARN [org.springframework.integration.http.inbound.HttpRequestHandlingController] - failure occurred in gateway sendAndReceive +org.springframework.messaging.MessageHandlingException: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:78) + at org.springframework.integration.handler.ServiceActivatingHandler.handleRequestMessage(ServiceActivatingHandler.java:71) + at org.springframework.integration.handler.AbstractReplyProducingMessageHandler.handleMessageInternal(AbstractReplyProducingMessageHandler.java:170) + at org.springframework.integration.handler.AbstractMessageHandler.handleMessage(AbstractMessageHandler.java:78) + at org.springframework.integration.dispatcher.AbstractDispatcher.tryOptimizedDispatch(AbstractDispatcher.java:116) + at org.springframework.integration.dispatcher.UnicastingDispatcher.doDispatch(UnicastingDispatcher.java:101) + at org.springframework.integration.dispatcher.UnicastingDispatcher.dispatch(UnicastingDispatcher.java:97) + at org.springframework.integration.channel.AbstractSubscribableChannel.doSend(AbstractSubscribableChannel.java:77) + at org.springframework.integration.channel.AbstractMessageChannel.send(AbstractMessageChannel.java:255) + at org.springframework.messaging.core.GenericMessagingTemplate.doSend(GenericMessagingTemplate.java:114) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:154) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:44) + at org.springframework.messaging.core.AbstractMessagingTemplate.sendAndReceive(AbstractMessagingTemplate.java:75) + at org.springframework.integration.gateway.MessagingGatewaySupport.doSendAndReceive(MessagingGatewaySupport.java:250) + at org.springframework.integration.gateway.MessagingGatewaySupport.sendAndReceiveMessage(MessagingGatewaySupport.java:224) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.actualDoHandleRequest(HttpRequestHandlingEndpointSupport.java:505) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.doHandleRequest(HttpRequestHandlingEndpointSupport.java:408) + at org.springframework.integration.http.inbound.HttpRequestHandlingController.handleRequest(HttpRequestHandlingController.java:150) + at org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter.handle(SimpleControllerHandlerAdapter.java:50) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:938) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:870) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:961) + at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:852) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:707) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:837) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:820) + at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:511) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1166) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:154) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilter(BasicAuthenticationFilter.java:150) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter.doFilter(DefaultLoginPageGeneratingFilter.java:155) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:110) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192) + at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160) + at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:344) + at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:261) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:108) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) + at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) + at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) + at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) + at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:440) + at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) + at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) + at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) + at org.mortbay.jetty.Server.handle(Server.java:326) + at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) + at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:926) + at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:549) + at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) + at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) + at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:410) + at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) +Caused by: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.security.access.vote.AffirmativeBased.decide(AffirmativeBased.java:83) + at org.springframework.security.access.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:206) + at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:60) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:179) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:644) + at org.springframework.integration.samples.rest.service.EmployeeSearchService$$EnhancerBySpringCGLIB$$3f3a4466.getEmployee() + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:483) + at org.springframework.expression.spel.support.ReflectiveMethodExecutor.execute(ReflectiveMethodExecutor.java:63) + at org.springframework.expression.spel.ast.MethodReference.getValueInternal(MethodReference.java:95) + at org.springframework.expression.spel.ast.MethodReference.access$000(MethodReference.java:44) + at org.springframework.expression.spel.ast.MethodReference$MethodValueRef.getValue(MethodReference.java:258) + at org.springframework.expression.spel.ast.CompoundExpression.getValueInternal(CompoundExpression.java:84) + at org.springframework.expression.spel.ast.SpelNodeImpl.getTypedValue(SpelNodeImpl.java:114) + at org.springframework.expression.spel.standard.SpelExpression.getValue(SpelExpression.java:111) + at org.springframework.integration.util.AbstractExpressionEvaluator.evaluateExpression(AbstractExpressionEvaluator.java:159) + at org.springframework.integration.util.MessagingMethodInvokerHelper.processInternal(MessagingMethodInvokerHelper.java:268) + at org.springframework.integration.util.MessagingMethodInvokerHelper.process(MessagingMethodInvokerHelper.java:142) + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:75) + ... 75 more +2014-04-17 19:22:37,330 WARN [org.springframework.web.servlet.PageNotFound] - No mapping found for HTTP request with URI [/rest-http/services] in DispatcherServlet with name 'Spring Integration Rest HTTP Path Usage' +2014-04-17 19:22:46,728 WARN [org.springframework.web.servlet.PageNotFound] - No mapping found for HTTP request with URI [/rest-http/] in DispatcherServlet with name 'Spring Integration Rest HTTP Path Usage' +2014-04-17 19:24:05,011 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Closing WebApplicationContext for namespace 'Spring Integration Rest HTTP Path Usage-servlet': startup date [Thu Apr 17 19:11:52 EEST 2014]; parent: Root WebApplicationContext +2014-04-17 19:24:05,015 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Closing Root WebApplicationContext: startup date [Thu Apr 17 19:11:50 EEST 2014]; root of context hierarchy +2014-04-17 19:24:05,016 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Stopping beans in phase 0 +2014-04-17 19:24:05,017 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Removing {bridge:null} as a subscriber to the 'employeeSearchResponse' channel +2014-04-17 19:24:05,017 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchResponse' has 0 subscriber(s). +2014-04-17 19:24:05,018 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped org.springframework.integration.endpoint.EventDrivenConsumer@61063288 +2014-04-17 19:24:05,018 INFO [org.springframework.integration.http.inbound.HttpRequestHandlingController] - stopped inboundEmployeeSearchRequestGateway +2014-04-17 19:24:05,018 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Removing {service-activator:employeeServiceActivator} as a subscriber to the 'employeeSearchRequest' channel +2014-04-17 19:24:05,019 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchRequest' has 0 subscriber(s). +2014-04-17 19:24:05,019 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped employeeServiceActivator +2014-04-17 19:24:05,020 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Removing {logging-channel-adapter:_org.springframework.integration.errorLogger} as a subscriber to the 'errorChannel' channel +2014-04-17 19:24:05,020 INFO [org.springframework.integration.channel.PublishSubscribeChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.errorChannel' has 0 subscriber(s). +2014-04-17 19:24:05,020 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped _org.springframework.integration.errorLogger +2014-04-17 19:24:05,021 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Stopping beans in phase -2147483648 +2014-04-17 19:24:05,026 INFO [org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] - Shutting down ExecutorService 'taskScheduler' diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d68cc6ae..d78a2b01 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -1,97 +1,118 @@ - - 4.0.0 - org.springframework.integration.samples - retry-and-more - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - Retry and More - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - org.mockito - mockito-all - 1.8.5 - - - - org.springframework - spring-test - ${spring.version} - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.5 - 1.5 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + retry-and-more + 2.2.0.BUILD-SNAPSHOT + Retry and More Sample + Retry and More Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ftp + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + compile + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + compile + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index f3268651..fbd7e1b4 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -1,102 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - splitter-aggregator-reaper - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Splitter-Aggregator-Reaper - http://www.springsource.org/spring-integration - - A demonstration of implementing the Splitter and Aggregator Enterprise - Integration Patterns (EIP) together - - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.16 - 4.10 - 1 - 4.0.3.RELEASE - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.splitteraggregator.Main - - - - - - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - javax.inject - javax.inject - ${inject.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - junit - junit - ${junit.version} - test - - - - org.springframework - spring-test - ${spring.version} - test - - + + + 4.0.0 + org.springframework.integration.samples + splitter-aggregator-reaper + 2.2.0.BUILD-SNAPSHOT + Splitter-Aggregator-Reaper Sample + Splitter-Aggregator-Reaper Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + javax.inject + javax.inject + 1 + compile + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java index 21547571..26ebd114 100644 --- a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java +++ b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java @@ -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. @@ -32,6 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * * @author Christopher Hunt * @author Gunnar Hillert + * @author Artem Bilan * */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 1267c77e..45b8dce0 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -1,111 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - derby-stored-procedures - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures Derby - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - org.apache.derby - derby - 10.9.1.0 - - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-derby + 2.2.0.BUILD-SNAPSHOT + Derby Stored Procedures Sample + Derby Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.apache.derby + derby + 10.10.1.1 + compile + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/Main.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 93% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/Main.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index 0d068962..f42c169f 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/Main.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.samples.storedprocedure; import java.util.List; import java.util.Scanner; @@ -22,8 +22,8 @@ import org.apache.log4j.Logger; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/jdbc/storedproc/derby/DerbyStoredProcedures.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java similarity index 95% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/jdbc/storedproc/derby/DerbyStoredProcedures.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java index f44180d3..93734cf3 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/jdbc/storedproc/derby/DerbyStoredProcedures.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.jdbc.storedproc.derby; +package org.springframework.integration.samples.storedprocedure.jdbc.storedproc.derby; import java.sql.Connection; import java.sql.DriverManager; diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java index 74440472..7973d889 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; /** * diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java index efbb978b..4ee596f4 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; import java.util.List; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; /** diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java similarity index 86% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index 582d5559..976b4151 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 6bfab703..9b37e386 100644 --- a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.CoffeeService"> @@ -35,7 +35,7 @@ - + diff --git a/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql b/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql index f9232408..d3eccb5c 100644 --- a/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql +++ b/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql @@ -9,6 +9,6 @@ INSERT INTO COFFEE_BEVERAGES (ID, COFFEE_NAME, COFFEE_DESCRIPTION) VALUES (2, 'C INSERT INTO COFFEE_BEVERAGES (ID, COFFEE_NAME, COFFEE_DESCRIPTION) VALUES (3, 'Mocha', 'Mmmmh, chocolate.'); INSERT INTO COFFEE_BEVERAGES (ID, COFFEE_NAME, COFFEE_DESCRIPTION) VALUES (4, 'Latte', 'If you are more into milk than into foam.'); -CREATE PROCEDURE FIND_COFFEE( IN COFFEE_NAME INTEGER, OUT COFFEE_DESCRIPTION VARCHAR(100)) PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'org.springframework.integration.jdbc.storedproc.derby.DerbyStoredProcedures.findCoffee'; -CREATE PROCEDURE FIND_ALL_COFFEE_BEVERAGES() PARAMETER STYLE JAVA LANGUAGE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME 'org.springframework.integration.jdbc.storedproc.derby.DerbyStoredProcedures.findAllCoffeeBeverages'; +CREATE PROCEDURE FIND_COFFEE( IN COFFEE_NAME INTEGER, OUT COFFEE_DESCRIPTION VARCHAR(100)) PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'org.springframework.integration.samples.storedprocedure.jdbc.storedproc.derby.DerbyStoredProcedures.findCoffee'; +CREATE PROCEDURE FIND_ALL_COFFEE_BEVERAGES() PARAMETER STYLE JAVA LANGUAGE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME 'org.springframework.integration.samples.storedprocedure.jdbc.storedproc.derby.DerbyStoredProcedures.findAllCoffeeBeverages'; diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java index 4ed29597..4d67eb01 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java @@ -16,14 +16,16 @@ package org.springframework.integration; +import static org.junit.Assert.assertTrue; + import java.util.List; import org.junit.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; -import static org.junit.Assert.assertTrue; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** * @author Gunnar Hillert diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java index b3a116cc..a5816c0c 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java @@ -16,11 +16,13 @@ package org.springframework.integration; +import static org.junit.Assert.assertEquals; + import org.junit.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.service.CoffeeService; -import static org.junit.Assert.assertEquals; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** * @author Gunnar Hillert diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index e0f63f77..506bb3cc 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -1,118 +1,112 @@ - - 4.0.0 - - org.springframework.integration.samples.samples - ms-stored-procedures - - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures Microsoft - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - net.sourceforge.jtds - jtds - 1.2.6 - - - c3p0 - c3p0 - 0.9.1.2 - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-ms + 2.2.0.BUILD-SNAPSHOT + MS SQLServer Stored Procedures Sample + MS SQLServer Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + c3p0 + c3p0 + 0.9.1.2 + compile + + + net.sourceforge.jtds + jtds + 1.2.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/Main.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 95% rename from intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/Main.java rename to intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index fccdbe7b..ecb5468f 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/Main.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples; +package org.springframework.integration.samples.storedprocedure; import java.util.Scanner; @@ -21,7 +21,7 @@ import org.apache.log4j.Logger; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/service/StringConversionService.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java similarity index 93% rename from intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/service/StringConversionService.java rename to intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java index ba089dd3..45296757 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/service/StringConversionService.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.service; +package org.springframework.integration.samples.storedprocedure.service; /** diff --git a/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 3d67ea5c..fa298ff5 100644 --- a/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.StringConversionService"> diff --git a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java index 385206e3..9286a3ec 100644 --- a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java @@ -21,7 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** * Verify that the Spring Integration Application Context starts successfully. diff --git a/intermediate/stored-procedures-oracle/README.md b/intermediate/stored-procedures-oracle/README.md index 9876b001..9c5417ee 100644 --- a/intermediate/stored-procedures-oracle/README.md +++ b/intermediate/stored-procedures-oracle/README.md @@ -107,9 +107,9 @@ END; ```SQL create or replace FUNCTION GET_COOL_NUMBER - RETURN NUMBER + RETURN NUMBER IS cool_number NUMBER(11,2); -BEGIN +BEGIN cool_number := 12345; RETURN cool_number; END; @@ -124,15 +124,15 @@ END; You should see the following output: - 16:05:19.556 INFO [main][org.springframework.integration.Main] + 16:05:19.556 INFO [main][org.springframework.integration.samples.storedprocedure.Main] ========================================================= - + Welcome to Spring Integration's Stored Procedure/Function Sample for Oracle - + For more information please visit: http://www.springsource.org/spring-integration - + ========================================================= Please enter a choice and press : 1. Execute Sample 1 (Capitalize String) @@ -142,9 +142,9 @@ You should see the following output: Select **Opion 1**. ========================================================= - + Please press 'q + Enter' to quit the application. - + ========================================================= Please enter a string and press : hello world Converting String to Uppcase using Stored Procedure... @@ -190,10 +190,10 @@ end; ``` ```SQL -create or replace +create or replace FUNCTION find_all_coffee_beverages return types.cursortype AS - l_cursor types.cursorType; + l_cursor types.cursorType; BEGIN OPEN l_cursor FOR SELECT "ID", "COFFEE_NAME", "COFFEE_DESCRIPTION" FROM "COFFEE_BEVERAGES"; RETURN l_cursor; @@ -202,7 +202,7 @@ END; #### Find Specific Coffee Beverage ```SQL -create or replace +create or replace FUNCTION find_coffee(coffee_id IN integer) RETURN VARCHAR2 is description VARCHAR2(1000); begin @@ -211,7 +211,7 @@ begin end; ``` ### Execute the Sample - + * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - mvn package @@ -219,15 +219,15 @@ end; You should see the following output: - 16:05:19.556 INFO [main][org.springframework.integration.Main] + 16:05:19.556 INFO [main][org.springframework.integration.samples.storedprocedure.Main] ========================================================= - + Welcome to Spring Integration's Stored Procedure/Function Sample for Oracle - + For more information please visit: http://www.springsource.org/spring-integration - + ========================================================= Please enter a choice and press : 1. Execute Sample 1 (Capitalize String) diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 4b21e4f7..851da6ce 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -1,115 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - oracle-stored-procedures - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures Oracle - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - code.lds.org - https://code.lds.org/nexus/content/groups/main-repo - - - - - - - maven-eclipse-plugin - 2.8 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - org.springframework.integration.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - com.oracle - ojdbc6 - 11.2.0.3 - - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-oracle + 2.2.0.BUILD-SNAPSHOT + Oracle Stored Procedures Sample + Oracle Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + com.oracle + ojdbc6 + 11.2.0.3 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/Main.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 94% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/Main.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index eade4937..13366645 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/Main.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.samples.storedprocedure; import java.util.List; import java.util.Scanner; import org.apache.log4j.Logger; + import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; -import org.springframework.integration.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java index b752537f..21141b70 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; /** * diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java index da648bd8..14570281 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; import java.util.List; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.transaction.annotation.Transactional; diff --git a/basic/amqp/src/main/java/org/springframework/integration/service/StringConversionService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java similarity index 90% rename from basic/amqp/src/main/java/org/springframework/integration/service/StringConversionService.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java index c0434b24..e18be720 100644 --- a/basic/amqp/src/main/java/org/springframework/integration/service/StringConversionService.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; /** * Provides string manipulation services. @@ -28,4 +28,6 @@ public interface StringConversionService { */ String convertToUpperCase(String stringToConvert); + Integer getNumber(); + } diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java similarity index 86% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index 3f246061..bd50c249 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java deleted file mode 100644 index aba92fed..00000000 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2002-2010 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.integration.service; - -import org.springframework.integration.annotation.Payload; - -import java.util.Map; - -/** - * Provides string manipulation services. - */ -public interface StringConversionService { - - /** - * Converts a String to Upper Case. - * - * @param stringToConvert The string to convert to upper case - * @return The converted upper case string. - */ - String convertToUpperCase(String stringToConvert); - - Integer getNumber(); - -} diff --git a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml index c7decc01..fa30f6a7 100644 --- a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml +++ b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml @@ -14,7 +14,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.StringConversionService"> diff --git a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml index 54cc1dca..b996a0a5 100644 --- a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml +++ b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.CoffeeService"> @@ -39,18 +39,20 @@ request-channel="findAllProcedureRequestChannel" is-function="true" stored-procedure-name="FIND_ALL_COFFEE_BEVERAGES" expect-single-result="true" > - + - + + + diff --git a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java index ec4af2fc..639cda36 100644 --- a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** * Verify that the Spring Integration Application Context starts successfully. diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 027bdafb..f4ac1d38 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -1,112 +1,118 @@ - - 4.0.0 - - org.springframework.integration.samples - postgresql-stored-procedures - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures PostgreSQL - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - commons-dbcp - commons-dbcp - 1.4 - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-postgresql + 2.2.0.BUILD-SNAPSHOT + PostgreSQL Stored Procedures Sample + PostgreSQL Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + commons-pool + commons-pool + 1.5.4 + compile + + + commons-dbcp + commons-dbcp + 1.2.2 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + postgresql + postgresql + 9.1-901-1.jdbc4 + compile + + diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/Main.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 92% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/Main.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index a0503f98..f2fd9954 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/Main.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.samples.storedprocedure; import java.util.List; import java.util.Scanner; import org.apache.log4j.Logger; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; - -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java index b752537f..21141b70 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; /** * diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java index da648bd8..14570281 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; import java.util.List; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.transaction.annotation.Transactional; diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java similarity index 86% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index 3f246061..bd50c249 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index f8e0c2da..90d33564 100644 --- a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -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 http://www.springframework.org/schema/spring-integration-jdbc.xsd + http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/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"> @@ -27,7 +27,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.CoffeeService"> @@ -46,16 +46,18 @@ request-channel="findAllProcedureRequestChannel" expect-single-result="true" stored-procedure-name="FIND_ALL_COFFEE_BEVERAGES"> + row-mapper="coffeBeverageMapper" /> - + + + diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index dad27d6e..052fabd7 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -1,79 +1,106 @@ - - 4.0.0 - org.springframework.integration.samples - tcp-client-server-multiplex - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - TCP Client Server Multiplexing Sample - jar - - - 2.2.1 - - - - UTF-8 - 4.0.3.RELEASE - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + tcp-client-server-multiplex + 2.2.0.BUILD-SNAPSHOT + TCP Client Server Multiplexing Sample + TCP Client Server Multiplexing Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index bd25a77d..ed6e1d08 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -1,92 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - travel - Samples (Intermediate) - Travel Services - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - 4.0.3.RELEASE - org.springframework.integration.samples.travel.Main - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - org.springframework - spring-web - ${spring.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + travel + 2.2.0.BUILD-SNAPSHOT + Travel Services Sample + Travel Services Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework + spring-web + 4.0.3.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml old mode 100755 new mode 100644 index 96cd3bf6..2726ed1d --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -1,107 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - tx-synch - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - Transaction Synchronization - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - com.h2database - h2 - 1.3.166 - - - log4j - log4j - ${log4j.version} - - - org.mockito - mockito-all - 1.8.5 - - - - org.springframework - spring-test - ${spring.version} - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - org.springframework.integration.samples.advice.TransactionSynchronizationDemo - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + tx-synch + 2.2.0.BUILD-SNAPSHOT + Transaction Synchronization Sample + Transaction Synchronization Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + com.h2database + h2 + 1.3.175 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 86208e71..00000000 --- a/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 4.0.0 - org.springframework.integration.samples - samples-root - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples Root - http://www.springsource.org/spring-integration - pom - - - 2.2.1 - - - - basic - intermediate - advanced - applications - - - - Bamboo - https://build.springsource.org/browse/INTSAMPLES - - - - JIRA - https://jira.springsource.org/browse/INTSAMPLES - - - - https://github.com/SpringSource/spring-integration-samples - scm:git:git://github.com/SpringSource/spring-integration-samples.git - scm:git:ssh://git@github.com:SpringSource/spring-integration-samples.git - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..12f6d75f --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +rootProject.name = 'spring-integration-samples' + +['advanced', 'applications', 'basic', 'intermediate', 'dsl'].each { + def projectDir = new File(rootDir, it) + include ":${it}" + projectDir.eachDir { dir -> + include ":${dir.name}" + project(":${dir.name}").projectDir = new File(projectDir.absolutePath, dir.name) + if ('cafe' == dir.name) { + dir.eachDir { cafe -> + include ":${cafe.name}" + project(":${cafe.name}").projectDir = new File(dir.absolutePath, cafe.name) + } + } + } +}