From ea3ba212494b72685b5b4b7808bd8fe0703b4836 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 20 May 2014 17:47:20 +0300 Subject: [PATCH] INTSAMPLES-122: Migrate to Gradle JIRA: https://jira.springsource.org/browse/INTSAMPLES-122 INTSAMPLES-122: Polishing INTSAMPLES-122: Add generated poms * Upgrade some dependencies INTSAMPLES-122: Cover Java/DSL sample INTSAMPLES-122: Upgrade to SI 4.0.1 & SF 4.0.5 INTSAMPLES-122: Polishing according PR comments Make gradlew executable --- .gitignore | 2 + advanced/advanced-testing-examples/pom.xml | 233 ++-- advanced/dynamic-ftp/pom.xml | 184 +-- advanced/pom.xml | 66 +- applications/cafe-scripted/pom.xml | 335 +++--- .../samples/cafe/demo/CafeDemoApp.java | 27 +- .../integration/samples/cafe/ScriptTests.java | 11 +- applications/cafe/cafe-amqp/pom.xml | 137 ++- applications/cafe/cafe-jms/pom.xml | 161 ++- applications/cafe/cafe-si/pom.xml | 151 ++- applications/cafe/pom.xml | 140 +-- applications/loan-broker/pom.xml | 158 ++- applications/loanshark/pom.xml | 610 ++++------ .../loanshark/biz/AccumulatorTests.java | 7 +- applications/pom.xml | 68 +- basic/amqp/pom.xml | 215 ++-- basic/control-bus/pom.xml | 158 ++- basic/enricher/pom.xml | 211 ++-- .../enricher/service/UserServiceTest.java | 4 +- basic/feed/pom.xml | 158 ++- basic/file/pom.xml | 156 ++- basic/ftp/pom.xml | 221 ++-- basic/helloworld/pom.xml | 183 +-- basic/http/pom.xml | 238 ++-- basic/jdbc/pom.xml | 216 ++-- basic/jms/pom.xml | 241 ++-- .../samples/jms/ChannelAdapterDemoTest.java | 4 +- .../samples/jms/GatewayDemoTest.java | 4 +- basic/jmx/pom.xml | 169 ++- basic/jpa/pom.xml | 277 +++-- basic/mail/pom.xml | 187 +-- basic/mongodb/pom.xml | 208 ++-- basic/oddeven/pom.xml | 183 +-- basic/pom.xml | 89 +- basic/quote/pom.xml | 156 ++- basic/sftp/pom.xml | 157 ++- .../SftpInboundReceiveSample-context.xml | 2 +- .../SftpOutboundTransferSample-context.xml | 2 +- basic/sftp/src/test/resources/user.properties | 3 +- basic/tcp-amqp/pom.xml | 241 ++-- basic/tcp-client-server/pom.xml | 204 ++-- basic/testing-examples/pom.xml | 254 ++-- .../externalgateway/WeatherMarshaller.java | 27 +- basic/twitter/pom.xml | 158 ++- basic/ws-inbound-gateway/pom.xml | 195 +-- .../samples/ws/InboundGatewayTests.java | 4 +- basic/ws-outbound-gateway/pom.xml | 187 +-- .../samples/ws/WebServiceDemoTestApp.java | 4 +- .../integration/temperatureConversion.xml | 2 +- basic/xml/pom.xml | 164 +-- basic/xmpp/pom.xml | 154 ++- build.gradle | 1045 +++++++++++++++++ dsl/si4demo/README.md | 6 +- dsl/si4demo/pom.xml | 61 - .../si4demo/annotations}/Application.java | 2 +- .../samples/si4demo}/dsl/Application.java | 2 +- .../samples/si4demo}/ApplicationTests.java | 6 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 50518 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 +++ gradlew.bat | 90 ++ intermediate/async-gateway/pom.xml | 159 ++- intermediate/dynamic-poller/pom.xml | 172 +-- intermediate/errorhandling/pom.xml | 162 ++- intermediate/file-processing/pom.xml | 158 ++- intermediate/mail-attachments/pom.xml | 244 ++-- intermediate/monitoring/pom.xml | 281 +++-- .../mvc/controller/HomeController.java | 3 +- .../model/TwitterMessage.java | 2 +- .../service/TwitterService.java | 3 +- .../service/impl/DummyTwitter.java | 0 .../SpringIntegrationTest.java | 9 +- .../service/impl/DefaultTwitterService.java | 6 +- intermediate/multipart-http/pom.xml | 221 ++-- intermediate/pom.xml | 85 +- intermediate/rest-http/pom.xml | 418 +++---- .../samples/rest/domain/jaxb.index | 0 .../main/webapp/WEB-INF/logs/rest-http.log | 267 +++++ intermediate/retry-and-more/pom.xml | 211 ++-- .../splitter-aggregator-reaper/pom.xml | 206 ++-- .../TestSplitterAggregator.java | 3 +- intermediate/stored-procedures-derby/pom.xml | 215 ++-- .../{ => samples/storedprocedure}/Main.java | 6 +- .../derby/DerbyStoredProcedures.java | 2 +- .../model/CoffeeBeverage.java | 2 +- .../service/CoffeeService.java | 4 +- .../support/CoffeBeverageMapper.java | 4 +- .../spring-integration-context.xml | 4 +- .../resources/derby-stored-procedures.sql | 4 +- .../integration/CoffeeServiceFindAllTest.java | 8 +- .../CoffeeServiceFindCoffeeTest.java | 6 +- intermediate/stored-procedures-ms/pom.xml | 228 ++-- .../samples/{ => storedprocedure}/Main.java | 4 +- .../service/StringConversionService.java | 2 +- .../spring-integration-context.xml | 2 +- .../samples/StringConversionServiceTest.java | 2 +- .../stored-procedures-oracle/README.md | 32 +- intermediate/stored-procedures-oracle/pom.xml | 219 ++-- .../{ => samples/storedprocedure}/Main.java | 9 +- .../model/CoffeeBeverage.java | 2 +- .../service/CoffeeService.java | 4 +- .../service/StringConversionService.java | 4 +- .../support/CoffeBeverageMapper.java | 4 +- .../service/StringConversionService.java | 37 - .../spring-integration-sample1-context.xml | 2 +- .../spring-integration-sample2-context.xml | 8 +- .../sts/StringConversionServiceTest.java | 2 +- .../stored-procedures-postgresql/pom.xml | 228 ++-- .../{ => samples/storedprocedure}/Main.java | 8 +- .../model/CoffeeBeverage.java | 2 +- .../service/CoffeeService.java | 4 +- .../support/CoffeBeverageMapper.java | 4 +- .../spring-integration-context.xml | 10 +- .../tcp-client-server-multiplex/pom.xml | 181 +-- intermediate/travel/pom.xml | 202 ++-- intermediate/tx-synch/pom.xml | 215 ++-- pom.xml | 40 - settings.gradle | 16 + 119 files changed, 7683 insertions(+), 5363 deletions(-) create mode 100644 build.gradle delete mode 100644 dsl/si4demo/pom.xml rename dsl/si4demo/src/main/java/{demo => org/springframework/integration/samples/si4demo/annotations}/Application.java (98%) rename dsl/si4demo/src/main/java/{ => org/springframework/integration/samples/si4demo}/dsl/Application.java (98%) rename dsl/si4demo/src/test/java/{demo => org/springframework/integration/samples/si4demo}/ApplicationTests.java (77%) create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat rename intermediate/monitoring/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/model/TwitterMessage.java (97%) rename intermediate/monitoring/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/service/TwitterService.java (94%) rename intermediate/monitoring/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/service/impl/DummyTwitter.java (100%) rename intermediate/monitoring/src/{test/java/org/springframework/integration => main/java/org/springintegration}/SpringIntegrationTest.java (91%) rename intermediate/rest-http/src/main/{java => resources}/org/springframework/integration/samples/rest/domain/jaxb.index (100%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/Main.java (93%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/jdbc/storedproc/derby/DerbyStoredProcedures.java (95%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/model/CoffeeBeverage.java (97%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/service/CoffeeService.java (89%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/support/CoffeBeverageMapper.java (86%) rename intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/{ => storedprocedure}/Main.java (95%) rename intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/{ => storedprocedure}/service/StringConversionService.java (93%) rename intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/Main.java (94%) rename intermediate/{stored-procedures-postgresql/src/main/java/org/springframework/integration => stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/model/CoffeeBeverage.java (97%) rename intermediate/{stored-procedures-postgresql/src/main/java/org/springframework/integration => stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/service/CoffeeService.java (89%) rename {basic/amqp/src/main/java/org/springframework/integration => intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/service/StringConversionService.java (90%) rename intermediate/{stored-procedures-postgresql/src/main/java/org/springframework/integration => stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/support/CoffeBeverageMapper.java (86%) delete mode 100644 intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java rename intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/Main.java (92%) rename intermediate/{stored-procedures-oracle/src/main/java/org/springframework/integration => stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure}/model/CoffeeBeverage.java (97%) rename intermediate/{stored-procedures-oracle/src/main/java/org/springframework/integration => stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure}/service/CoffeeService.java (89%) rename intermediate/{stored-procedures-oracle/src/main/java/org/springframework/integration => stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure}/support/CoffeBeverageMapper.java (86%) mode change 100755 => 100644 intermediate/tx-synch/pom.xml delete mode 100644 pom.xml create mode 100644 settings.gradle 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 0000000000000000000000000000000000000000..b979729db0ad460288cfe16f07072da7b1305e93 GIT binary patch literal 50518 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 literal 0 HcmV?d00001 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) + } + } + } +}