From f30da932e8e66be57b79415caa2c8e0f95065499 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 8 Nov 2011 14:38:53 -0800 Subject: [PATCH] INT-2388 Update Gradle build This is a significant update to the build system, including the changes listed below. README.md has been updated with instructions on the most important day-to-day commands. - Eliminate buildSrc submodule In favor of using the new bundlor and docbook-reference plugins. The net effect is a large reduction in number of lines of build code. Common docbook resources, stylesheets, etc are stored directly in the docbook plugin. This means that --recursive is no longer required when cloning and there will never be a need to use `git submodule` commands. README files have been updated to reflect. Use of the new bundlor plugin also means the removal of template.mf files from the source tree in favor of an inline approach. See build.gradle for details. Bundlor 'import templates' are built up programmatically and kept physically close to gradle dependency declarations, leading to more convenience when changing these values and hopefully fewer errors / version inconsistencies over time. Certain tests depended on the presence of template.mf files, all of which have recently been removed from the source tree in favor of the new bundlor plugin which allows for inlining bundlor configuration within the Gradle build script. These tests now create temp files using the java.io.File API instead. - Upgrade to Gradle 1.0-milestone-6 The m6 release is significantly faster when resolving dependencies and has a number of valuable new features over the earlier m3 version. Review the release notes for Gradle 1.0-milestone-6 online for full details. - Switch to repo.springsource.org repository Previously the project build declared as many repositories as necessary to resolve all project dependencies. Now depending on a single 'virtual repository' defined within the SpringSource Artifactory instance at http://repo.springsource.org. Currently, the virtual repository in use is 'libs-milestone', which allows for the resolution of all "milestone-or-better" versions of all S2 and third-party dependencies. Should snapshot dependencies become required, this value may be changed from 'libs-milestone' to 'libs-snapshot'. To build only against GA releases, change the value to 'libs-release'. - New build plan(s) Spring Integration build plans have been updated to use the Artifactory Bamboo plugin and publish to repo.springsource.org. Build plans have names like 2.1.x to reflect the version under development, not necessarily the name of the branch, as this may change over time and across major releases. - Improve release process As mentioned above, Spring Integration will now use the Artifactory Bamboo plugin to publish releases and also use Artifactory's support for pushing builds directly into Maven Central via oss.sonatype.org. Generate poms that contain all necessary fields for onboarding at Maven central (scm, developers, organization, licenses, etc). Generate -source and -javadoc poms to comply with Maven Central onboarding rules (and for general good practice anyway). Generation of PGP signatures, sha1 and md5 checksums are all handled automatically by Artifactory. These are also requirements for automated entry into Maven Central. - Remove source-level pom generation Automatic generation of Maven poms suitable for use in building Spring Integration is no longer supported. Generation and publication of poms for the purpose of dependency management remains supported. Sonar support has to date depended on these poms, but will be switched over to use the Gradle Sonar plugin shortly. - Eliminate docs subproject Move docs/src to the root of the project and eliminate docs as a formal subproject. This simplifies the build in a number of ways, including removing the need for distinguishing between 'subprojects' and 'javaprojects' as well as allowing users to build both 'api' and 'reference' docs without qualifying with a ':docs' prefix. Also rename the src/info directory to src/dist to better reflect that these files are packaged with the distribution. For example, the readme.txt there is really the distribution readme, distinct from the README.md at the root of the project which is for building from source, etc. --- .gitmodules | 3 - .wrapper/gradle-wrapper.jar | Bin 0 -> 41270 bytes .wrapper/gradle-wrapper.properties | 6 + README.md | 35 +- build.gradle | 784 +++++++++++++++--- buildSrc | 1 - docs/src/info/readme.txt | 36 - .../src/reference/resources/css/highlight.css | 35 - docs/src/reference/resources/css/html.css | 421 ---------- docs/src/reference/resources/css/manual.css | 69 -- .../reference/resources/css/stylesheet.css | 99 --- .../resources/images/admon/caution.png | Bin 1250 -> 0 bytes .../resources/images/admon/important.png | Bin 722 -> 0 bytes .../resources/images/admon/note-spr.jpg | Bin 1319 -> 0 bytes .../reference/resources/images/admon/note.png | Bin 490 -> 0 bytes .../reference/resources/images/admon/tip.png | Bin 449 -> 0 bytes .../resources/images/admon/warning.png | Bin 1241 -> 0 bytes .../reference/resources/images/callouts/1.gif | Bin 889 -> 0 bytes .../reference/resources/images/callouts/1.png | Bin 329 -> 0 bytes .../reference/resources/images/callouts/1.svg | 15 - .../resources/images/callouts/10.gif | Bin 929 -> 0 bytes .../resources/images/callouts/10.png | Bin 361 -> 0 bytes .../resources/images/callouts/10.svg | 18 - .../resources/images/callouts/11.gif | Bin 202 -> 0 bytes .../resources/images/callouts/11.png | Bin 565 -> 0 bytes .../resources/images/callouts/11.svg | 16 - .../resources/images/callouts/12.gif | Bin 210 -> 0 bytes .../resources/images/callouts/12.png | Bin 617 -> 0 bytes .../resources/images/callouts/12.svg | 18 - .../resources/images/callouts/13.gif | Bin 209 -> 0 bytes .../resources/images/callouts/13.png | Bin 623 -> 0 bytes .../resources/images/callouts/13.svg | 20 - .../resources/images/callouts/14.gif | Bin 205 -> 0 bytes .../resources/images/callouts/14.png | Bin 411 -> 0 bytes .../resources/images/callouts/14.svg | 17 - .../resources/images/callouts/15.gif | Bin 210 -> 0 bytes .../resources/images/callouts/15.png | Bin 640 -> 0 bytes .../resources/images/callouts/15.svg | 19 - .../resources/images/callouts/16.svg | 20 - .../resources/images/callouts/17.svg | 17 - .../resources/images/callouts/18.svg | 21 - .../resources/images/callouts/19.svg | 20 - .../reference/resources/images/callouts/2.gif | Bin 907 -> 0 bytes .../reference/resources/images/callouts/2.png | Bin 353 -> 0 bytes .../reference/resources/images/callouts/2.svg | 17 - .../resources/images/callouts/20.svg | 20 - .../resources/images/callouts/21.svg | 18 - .../resources/images/callouts/22.svg | 20 - .../resources/images/callouts/23.svg | 22 - .../resources/images/callouts/24.svg | 19 - .../resources/images/callouts/25.svg | 21 - .../resources/images/callouts/26.svg | 22 - .../resources/images/callouts/27.svg | 19 - .../resources/images/callouts/28.svg | 23 - .../resources/images/callouts/29.svg | 22 - .../reference/resources/images/callouts/3.gif | Bin 914 -> 0 bytes .../reference/resources/images/callouts/3.png | Bin 350 -> 0 bytes .../reference/resources/images/callouts/3.svg | 19 - .../resources/images/callouts/30.svg | 22 - .../reference/resources/images/callouts/4.gif | Bin 907 -> 0 bytes .../reference/resources/images/callouts/4.png | Bin 345 -> 0 bytes .../reference/resources/images/callouts/4.svg | 16 - .../reference/resources/images/callouts/5.gif | Bin 916 -> 0 bytes .../reference/resources/images/callouts/5.png | Bin 348 -> 0 bytes .../reference/resources/images/callouts/5.svg | 18 - .../reference/resources/images/callouts/6.gif | Bin 218 -> 0 bytes .../reference/resources/images/callouts/6.png | Bin 355 -> 0 bytes .../reference/resources/images/callouts/6.svg | 19 - .../reference/resources/images/callouts/7.gif | Bin 907 -> 0 bytes .../reference/resources/images/callouts/7.png | Bin 344 -> 0 bytes .../reference/resources/images/callouts/7.svg | 16 - .../reference/resources/images/callouts/8.gif | Bin 918 -> 0 bytes .../reference/resources/images/callouts/8.png | Bin 357 -> 0 bytes .../reference/resources/images/callouts/8.svg | 20 - .../reference/resources/images/callouts/9.gif | Bin 923 -> 0 bytes .../reference/resources/images/callouts/9.png | Bin 357 -> 0 bytes .../reference/resources/images/callouts/9.svg | 19 - .../reference/resources/xsl/html-custom.xsl | 145 ---- .../resources/xsl/html-single-custom.xsl | 142 ---- .../reference/resources/xsl/pdf-custom.xsl | 487 ----------- gradle.properties | 44 +- gradlew | 107 ++- gradlew.bat | 52 +- pom.xml | 38 - settings.gradle | 17 - spring-integration-amqp/pom.xml | 206 ----- spring-integration-amqp/template.mf | 15 - spring-integration-core/pom.xml | 181 ---- spring-integration-core/template.mf | 12 - spring-integration-event/pom.xml | 161 ---- spring-integration-event/template.mf | 13 - spring-integration-feed/pom.xml | 179 ---- spring-integration-feed/template.mf | 18 - spring-integration-file/pom.xml | 161 ---- spring-integration-file/template.mf | 16 - spring-integration-ftp/pom.xml | 174 ---- .../FtpSendingMessageHandlerTests.java | 25 +- spring-integration-ftp/template.mf | 16 - spring-integration-gemfire/pom.xml | 191 ----- spring-integration-gemfire/template.mf | 16 - spring-integration-groovy/pom.xml | 167 ---- spring-integration-groovy/template.mf | 11 - spring-integration-http/pom.xml | 200 ----- spring-integration-http/template.mf | 20 - spring-integration-ip/pom.xml | 167 ---- spring-integration-ip/template.mf | 15 - spring-integration-jdbc/build.gradle | 1 - spring-integration-jdbc/pom.xml | 207 ----- spring-integration-jdbc/template.mf | 12 - spring-integration-jms/pom.xml | 191 ----- spring-integration-jms/template.mf | 16 - spring-integration-jmx/pom.xml | 173 ---- spring-integration-jmx/template.mf | 12 - spring-integration-mail/pom.xml | 174 ---- spring-integration-mail/template.mf | 16 - spring-integration-mongodb/pom.xml | 197 ----- spring-integration-mongodb/template.mf | 16 - spring-integration-redis/pom.xml | 197 ----- spring-integration-redis/template.mf | 15 - spring-integration-rmi/pom.xml | 167 ---- spring-integration-rmi/template.mf | 14 - spring-integration-scripting/pom.xml | 173 ---- spring-integration-scripting/template.mf | 11 - spring-integration-security/pom.xml | 185 ----- spring-integration-security/template.mf | 15 - spring-integration-sftp/pom.xml | 186 ----- .../SftpSendingMessageHandlerTests.java | 23 +- spring-integration-sftp/template.mf | 16 - spring-integration-stream/pom.xml | 155 ---- spring-integration-stream/template.mf | 11 - spring-integration-test/pom.xml | 155 ---- spring-integration-test/template.mf | 14 - spring-integration-twitter/pom.xml | 204 ----- spring-integration-twitter/template.mf | 20 - spring-integration-ws/pom.xml | 232 ------ spring-integration-ws/template.mf | 18 - spring-integration-xml/pom.xml | 196 ----- spring-integration-xml/template.mf | 18 - spring-integration-xmpp/pom.xml | 186 ----- spring-integration-xmpp/template.mf | 15 - .../api/doc-files/th-background.png | Bin {docs/src => src}/api/overview.html | 3 +- {docs/src => src}/api/spring-javadoc.css | 0 {docs/src/info => src/dist}/changelog.txt | 0 {docs/src/info => src/dist}/license.txt | 0 {docs/src/info => src/dist}/notice.txt | 0 src/dist/readme.txt | 13 + .../reference/docbook/aggregator.xml | 0 {docs/src => src}/reference/docbook/amqp.xml | 0 .../src => src}/reference/docbook/bridge.xml | 0 {docs/src => src}/reference/docbook/chain.xml | 0 .../reference/docbook/changes-1.0-2.0.xml | 0 .../reference/docbook/changes-2.0-2.1.xml | 0 .../reference/docbook/channel-adapter.xml | 0 .../src => src}/reference/docbook/channel.xml | 0 .../reference/docbook/claim-check.xml | 0 .../reference/docbook/configuration.xml | 0 .../reference/docbook/content-enrichment.xml | 0 .../reference/docbook/control-bus.xml | 0 .../src => src}/reference/docbook/delayer.xml | 0 .../reference/docbook/endpoint.xml | 0 {docs/src => src}/reference/docbook/event.xml | 0 {docs/src => src}/reference/docbook/feed.xml | 0 {docs/src => src}/reference/docbook/file.xml | 0 .../src => src}/reference/docbook/filter.xml | 0 {docs/src => src}/reference/docbook/ftp.xml | 0 .../src => src}/reference/docbook/gateway.xml | 0 .../src => src}/reference/docbook/gemfire.xml | 0 .../src => src}/reference/docbook/groovy.xml | 0 .../src => src}/reference/docbook/history.xml | 0 {docs/src => src}/reference/docbook/http.xml | 0 .../reference/docbook}/images/bank-router.jpg | Bin .../reference/docbook}/images/cafe-eip.png | Bin .../reference/docbook}/images/chain.png | Bin .../reference/docbook}/images/channel.jpg | Bin .../reference/docbook}/images/gateway.jpg | Bin .../docbook}/images/handler-endpoint.jpg | Bin .../docbook}/images/loan-broker-eip.png | Bin .../reference/docbook}/images/logo.png | Bin .../reference/docbook}/images/message.jpg | Bin .../docbook}/images/quotes-aggregator.jpg | Bin .../reference/docbook}/images/router.jpg | Bin .../docbook}/images/source-endpoint.jpg | Bin .../spring-integration-amqp-sample-graph.png | Bin .../docbook}/images/target-endpoint.jpg | Bin .../reference/docbook}/images/tickmark.png | Bin {docs/src => src}/reference/docbook/index.xml | 0 {docs/src => src}/reference/docbook/ip.xml | 0 {docs/src => src}/reference/docbook/jdbc.xml | 0 {docs/src => src}/reference/docbook/jms.xml | 0 {docs/src => src}/reference/docbook/jmx.xml | 0 {docs/src => src}/reference/docbook/mail.xml | 0 .../docbook/message-construction.xml | 0 .../reference/docbook/message-history.xml | 0 .../reference/docbook/message-publishing.xml | 0 .../reference/docbook/message-routing.xml | 0 .../reference/docbook/message-store.xml | 0 .../docbook/message-transformation.xml | 0 .../src => src}/reference/docbook/message.xml | 0 .../reference/docbook/messaging-channels.xml | 0 .../reference/docbook/messaging-endpoints.xml | 0 .../src => src}/reference/docbook/mongodb.xml | 0 .../reference/docbook/overview.xml | 0 .../src => src}/reference/docbook/preface.xml | 0 {docs/src => src}/reference/docbook/redis.xml | 0 .../reference/docbook/resequencer.xml | 0 .../reference/docbook/resource.xml | 0 .../reference/docbook/resources.xml | 0 {docs/src => src}/reference/docbook/rmi.xml | 0 .../src => src}/reference/docbook/router.xml | 0 .../src => src}/reference/docbook/samples.xml | 0 .../reference/docbook/scripting.xml | 0 .../reference/docbook/security.xml | 0 .../reference/docbook/service-activator.xml | 0 {docs/src => src}/reference/docbook/sftp.xml | 0 .../reference/docbook/splitter.xml | 0 .../src => src}/reference/docbook/stream.xml | 0 .../reference/docbook/system-management.xml | 0 .../reference/docbook/transactions.xml | 0 .../reference/docbook/transformer.xml | 0 .../src => src}/reference/docbook/twitter.xml | 0 .../reference/docbook/whats-new.xml | 0 {docs/src => src}/reference/docbook/ws.xml | 0 {docs/src => src}/reference/docbook/xml.xml | 0 {docs/src => src}/reference/docbook/xmpp.xml | 0 225 files changed, 808 insertions(+), 7507 deletions(-) delete mode 100644 .gitmodules create mode 100644 .wrapper/gradle-wrapper.jar create mode 100644 .wrapper/gradle-wrapper.properties delete mode 160000 buildSrc delete mode 100644 docs/src/info/readme.txt delete mode 100644 docs/src/reference/resources/css/highlight.css delete mode 100644 docs/src/reference/resources/css/html.css delete mode 100644 docs/src/reference/resources/css/manual.css delete mode 100644 docs/src/reference/resources/css/stylesheet.css delete mode 100644 docs/src/reference/resources/images/admon/caution.png delete mode 100644 docs/src/reference/resources/images/admon/important.png delete mode 100644 docs/src/reference/resources/images/admon/note-spr.jpg delete mode 100644 docs/src/reference/resources/images/admon/note.png delete mode 100644 docs/src/reference/resources/images/admon/tip.png delete mode 100644 docs/src/reference/resources/images/admon/warning.png delete mode 100644 docs/src/reference/resources/images/callouts/1.gif delete mode 100644 docs/src/reference/resources/images/callouts/1.png delete mode 100644 docs/src/reference/resources/images/callouts/1.svg delete mode 100644 docs/src/reference/resources/images/callouts/10.gif delete mode 100644 docs/src/reference/resources/images/callouts/10.png delete mode 100644 docs/src/reference/resources/images/callouts/10.svg delete mode 100644 docs/src/reference/resources/images/callouts/11.gif delete mode 100644 docs/src/reference/resources/images/callouts/11.png delete mode 100644 docs/src/reference/resources/images/callouts/11.svg delete mode 100644 docs/src/reference/resources/images/callouts/12.gif delete mode 100644 docs/src/reference/resources/images/callouts/12.png delete mode 100644 docs/src/reference/resources/images/callouts/12.svg delete mode 100644 docs/src/reference/resources/images/callouts/13.gif delete mode 100644 docs/src/reference/resources/images/callouts/13.png delete mode 100644 docs/src/reference/resources/images/callouts/13.svg delete mode 100644 docs/src/reference/resources/images/callouts/14.gif delete mode 100644 docs/src/reference/resources/images/callouts/14.png delete mode 100644 docs/src/reference/resources/images/callouts/14.svg delete mode 100644 docs/src/reference/resources/images/callouts/15.gif delete mode 100644 docs/src/reference/resources/images/callouts/15.png delete mode 100644 docs/src/reference/resources/images/callouts/15.svg delete mode 100644 docs/src/reference/resources/images/callouts/16.svg delete mode 100644 docs/src/reference/resources/images/callouts/17.svg delete mode 100644 docs/src/reference/resources/images/callouts/18.svg delete mode 100644 docs/src/reference/resources/images/callouts/19.svg delete mode 100644 docs/src/reference/resources/images/callouts/2.gif delete mode 100644 docs/src/reference/resources/images/callouts/2.png delete mode 100644 docs/src/reference/resources/images/callouts/2.svg delete mode 100644 docs/src/reference/resources/images/callouts/20.svg delete mode 100644 docs/src/reference/resources/images/callouts/21.svg delete mode 100644 docs/src/reference/resources/images/callouts/22.svg delete mode 100644 docs/src/reference/resources/images/callouts/23.svg delete mode 100644 docs/src/reference/resources/images/callouts/24.svg delete mode 100644 docs/src/reference/resources/images/callouts/25.svg delete mode 100644 docs/src/reference/resources/images/callouts/26.svg delete mode 100644 docs/src/reference/resources/images/callouts/27.svg delete mode 100644 docs/src/reference/resources/images/callouts/28.svg delete mode 100644 docs/src/reference/resources/images/callouts/29.svg delete mode 100644 docs/src/reference/resources/images/callouts/3.gif delete mode 100644 docs/src/reference/resources/images/callouts/3.png delete mode 100644 docs/src/reference/resources/images/callouts/3.svg delete mode 100644 docs/src/reference/resources/images/callouts/30.svg delete mode 100644 docs/src/reference/resources/images/callouts/4.gif delete mode 100644 docs/src/reference/resources/images/callouts/4.png delete mode 100644 docs/src/reference/resources/images/callouts/4.svg delete mode 100644 docs/src/reference/resources/images/callouts/5.gif delete mode 100644 docs/src/reference/resources/images/callouts/5.png delete mode 100644 docs/src/reference/resources/images/callouts/5.svg delete mode 100644 docs/src/reference/resources/images/callouts/6.gif delete mode 100644 docs/src/reference/resources/images/callouts/6.png delete mode 100644 docs/src/reference/resources/images/callouts/6.svg delete mode 100644 docs/src/reference/resources/images/callouts/7.gif delete mode 100644 docs/src/reference/resources/images/callouts/7.png delete mode 100644 docs/src/reference/resources/images/callouts/7.svg delete mode 100644 docs/src/reference/resources/images/callouts/8.gif delete mode 100644 docs/src/reference/resources/images/callouts/8.png delete mode 100644 docs/src/reference/resources/images/callouts/8.svg delete mode 100644 docs/src/reference/resources/images/callouts/9.gif delete mode 100644 docs/src/reference/resources/images/callouts/9.png delete mode 100644 docs/src/reference/resources/images/callouts/9.svg delete mode 100644 docs/src/reference/resources/xsl/html-custom.xsl delete mode 100644 docs/src/reference/resources/xsl/html-single-custom.xsl delete mode 100644 docs/src/reference/resources/xsl/pdf-custom.xsl delete mode 100644 pom.xml delete mode 100644 spring-integration-amqp/pom.xml delete mode 100644 spring-integration-amqp/template.mf delete mode 100644 spring-integration-core/pom.xml delete mode 100644 spring-integration-core/template.mf delete mode 100644 spring-integration-event/pom.xml delete mode 100644 spring-integration-event/template.mf delete mode 100644 spring-integration-feed/pom.xml delete mode 100644 spring-integration-feed/template.mf delete mode 100644 spring-integration-file/pom.xml delete mode 100644 spring-integration-file/template.mf delete mode 100644 spring-integration-ftp/pom.xml delete mode 100644 spring-integration-ftp/template.mf delete mode 100644 spring-integration-gemfire/pom.xml delete mode 100644 spring-integration-gemfire/template.mf delete mode 100644 spring-integration-groovy/pom.xml delete mode 100644 spring-integration-groovy/template.mf delete mode 100644 spring-integration-http/pom.xml delete mode 100644 spring-integration-http/template.mf delete mode 100644 spring-integration-ip/pom.xml delete mode 100644 spring-integration-ip/template.mf delete mode 100644 spring-integration-jdbc/pom.xml delete mode 100644 spring-integration-jdbc/template.mf delete mode 100644 spring-integration-jms/pom.xml delete mode 100644 spring-integration-jms/template.mf delete mode 100644 spring-integration-jmx/pom.xml delete mode 100644 spring-integration-jmx/template.mf delete mode 100644 spring-integration-mail/pom.xml delete mode 100644 spring-integration-mail/template.mf delete mode 100644 spring-integration-mongodb/pom.xml delete mode 100644 spring-integration-mongodb/template.mf delete mode 100644 spring-integration-redis/pom.xml delete mode 100644 spring-integration-redis/template.mf delete mode 100644 spring-integration-rmi/pom.xml delete mode 100644 spring-integration-rmi/template.mf delete mode 100644 spring-integration-scripting/pom.xml delete mode 100644 spring-integration-scripting/template.mf delete mode 100644 spring-integration-security/pom.xml delete mode 100644 spring-integration-security/template.mf delete mode 100644 spring-integration-sftp/pom.xml delete mode 100644 spring-integration-sftp/template.mf delete mode 100644 spring-integration-stream/pom.xml delete mode 100644 spring-integration-stream/template.mf delete mode 100644 spring-integration-test/pom.xml delete mode 100644 spring-integration-test/template.mf delete mode 100644 spring-integration-twitter/pom.xml delete mode 100644 spring-integration-twitter/template.mf delete mode 100644 spring-integration-ws/pom.xml delete mode 100644 spring-integration-ws/template.mf delete mode 100644 spring-integration-xml/pom.xml delete mode 100644 spring-integration-xml/template.mf delete mode 100644 spring-integration-xmpp/pom.xml delete mode 100644 spring-integration-xmpp/template.mf rename {docs/src => src}/api/doc-files/th-background.png (100%) rename {docs/src => src}/api/overview.html (89%) rename {docs/src => src}/api/spring-javadoc.css (100%) rename {docs/src/info => src/dist}/changelog.txt (100%) rename {docs/src/info => src/dist}/license.txt (100%) rename {docs/src/info => src/dist}/notice.txt (100%) create mode 100644 src/dist/readme.txt rename {docs/src => src}/reference/docbook/aggregator.xml (100%) rename {docs/src => src}/reference/docbook/amqp.xml (100%) rename {docs/src => src}/reference/docbook/bridge.xml (100%) rename {docs/src => src}/reference/docbook/chain.xml (100%) rename {docs/src => src}/reference/docbook/changes-1.0-2.0.xml (100%) rename {docs/src => src}/reference/docbook/changes-2.0-2.1.xml (100%) rename {docs/src => src}/reference/docbook/channel-adapter.xml (100%) rename {docs/src => src}/reference/docbook/channel.xml (100%) rename {docs/src => src}/reference/docbook/claim-check.xml (100%) rename {docs/src => src}/reference/docbook/configuration.xml (100%) rename {docs/src => src}/reference/docbook/content-enrichment.xml (100%) rename {docs/src => src}/reference/docbook/control-bus.xml (100%) rename {docs/src => src}/reference/docbook/delayer.xml (100%) rename {docs/src => src}/reference/docbook/endpoint.xml (100%) rename {docs/src => src}/reference/docbook/event.xml (100%) rename {docs/src => src}/reference/docbook/feed.xml (100%) rename {docs/src => src}/reference/docbook/file.xml (100%) rename {docs/src => src}/reference/docbook/filter.xml (100%) rename {docs/src => src}/reference/docbook/ftp.xml (100%) rename {docs/src => src}/reference/docbook/gateway.xml (100%) rename {docs/src => src}/reference/docbook/gemfire.xml (100%) rename {docs/src => src}/reference/docbook/groovy.xml (100%) rename {docs/src => src}/reference/docbook/history.xml (100%) rename {docs/src => src}/reference/docbook/http.xml (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/bank-router.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/cafe-eip.png (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/chain.png (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/channel.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/gateway.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/handler-endpoint.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/loan-broker-eip.png (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/logo.png (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/message.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/quotes-aggregator.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/router.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/source-endpoint.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/spring-integration-amqp-sample-graph.png (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/target-endpoint.jpg (100%) rename {docs/src/reference/resources => src/reference/docbook}/images/tickmark.png (100%) rename {docs/src => src}/reference/docbook/index.xml (100%) rename {docs/src => src}/reference/docbook/ip.xml (100%) rename {docs/src => src}/reference/docbook/jdbc.xml (100%) rename {docs/src => src}/reference/docbook/jms.xml (100%) rename {docs/src => src}/reference/docbook/jmx.xml (100%) rename {docs/src => src}/reference/docbook/mail.xml (100%) rename {docs/src => src}/reference/docbook/message-construction.xml (100%) rename {docs/src => src}/reference/docbook/message-history.xml (100%) rename {docs/src => src}/reference/docbook/message-publishing.xml (100%) rename {docs/src => src}/reference/docbook/message-routing.xml (100%) rename {docs/src => src}/reference/docbook/message-store.xml (100%) rename {docs/src => src}/reference/docbook/message-transformation.xml (100%) rename {docs/src => src}/reference/docbook/message.xml (100%) rename {docs/src => src}/reference/docbook/messaging-channels.xml (100%) rename {docs/src => src}/reference/docbook/messaging-endpoints.xml (100%) rename {docs/src => src}/reference/docbook/mongodb.xml (100%) rename {docs/src => src}/reference/docbook/overview.xml (100%) rename {docs/src => src}/reference/docbook/preface.xml (100%) rename {docs/src => src}/reference/docbook/redis.xml (100%) rename {docs/src => src}/reference/docbook/resequencer.xml (100%) rename {docs/src => src}/reference/docbook/resource.xml (100%) rename {docs/src => src}/reference/docbook/resources.xml (100%) rename {docs/src => src}/reference/docbook/rmi.xml (100%) rename {docs/src => src}/reference/docbook/router.xml (100%) rename {docs/src => src}/reference/docbook/samples.xml (100%) rename {docs/src => src}/reference/docbook/scripting.xml (100%) rename {docs/src => src}/reference/docbook/security.xml (100%) rename {docs/src => src}/reference/docbook/service-activator.xml (100%) rename {docs/src => src}/reference/docbook/sftp.xml (100%) rename {docs/src => src}/reference/docbook/splitter.xml (100%) rename {docs/src => src}/reference/docbook/stream.xml (100%) rename {docs/src => src}/reference/docbook/system-management.xml (100%) rename {docs/src => src}/reference/docbook/transactions.xml (100%) rename {docs/src => src}/reference/docbook/transformer.xml (100%) rename {docs/src => src}/reference/docbook/twitter.xml (100%) rename {docs/src => src}/reference/docbook/whats-new.xml (100%) rename {docs/src => src}/reference/docbook/ws.xml (100%) rename {docs/src => src}/reference/docbook/xml.xml (100%) rename {docs/src => src}/reference/docbook/xmpp.xml (100%) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ac40a6c804a..00000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "buildSrc"] - path = buildSrc - url = git://github.com/SpringSource/spring-build-gradle.git diff --git a/.wrapper/gradle-wrapper.jar b/.wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7073cdeb2b78fd20b2e6673af9f64121065bd060 GIT binary patch literal 41270 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%0A1|5#tq>4BZ>zRCktN0#roOL5=z(T=br}2 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 b{c7N;rc4Yh89@ioxd~uEmwW**At3l4e-jqp literal 0 HcmV?d00001 diff --git a/.wrapper/gradle-wrapper.properties b/.wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..c25d7665be4 --- /dev/null +++ b/.wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Dec 21 17:31:27 CET 2011 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-6-bin.zip diff --git a/README.md b/README.md index 65998a57c7b..1a06e0e1097 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,29 @@ Spring Integration To check out the project and build from source, do the following: - git clone --recursive git://github.com/SpringSource/spring-integration.git + git clone git://github.com/SpringSource/spring-integration.git cd spring-integration ./gradlew build -> Note: the **--recursive** switch above is important, as spring-integration uses -> *git submodules*, which must themselves be cloned and initialized. If **--recursive** -> is omitted, the checkout becomes a multi-step process. +If you encounter out of memory errors during the build, increase available heap and permgen for Gradle: -If you encounter heap space errors during the build, increase the heap size for Gradle: + GRADLE_OPTS='-XX:MaxPermSize=1024m -Xmx1024m' - GRADLE_OPTS="-Xmx1024m" +To build and install jars into your local Maven cache: + + ./gradlew install + +To build api Javadoc (results will be in `build/api`): + + ./gradlew api + +To build reference documentation (results will be in `build/reference`): + + ./gradlew reference + +To build complete distribution including `-dist`, `-docs`, and `-schema` zip files (results will be in `build/distributions`) + + ./gradlew dist # Using Eclipse @@ -36,14 +48,6 @@ To generate IDEA metadata (.iml and .ipr files), do the following: ./gradlew idea -# Generating JavaDoc - -To build the JavaDoc, do the following from within the root directory: - - ./gradlew :docs:api - -The result will be available in **'docs/build/api'**. - # OSGI Notes 1. Dependency on Third Party Bundles @@ -69,4 +73,5 @@ The result will be available in **'docs/build/api'**. # Resources -For more information, please visit the Spring Integration website at: [http://www.springsource.org/spring-integration](http://www.springsource.org/spring-integration) \ No newline at end of file +For more information, please visit the Spring Integration website at: +[http://www.springsource.org/spring-integration](http://www.springsource.org/spring-integration) diff --git a/build.gradle b/build.gradle index 6137e72270a..c8c0ce0fadf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,118 +1,38 @@ -/* - * 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. - */ - -import org.springframework.build.Version - -// ----------------------------------------------------------------------------- -// Main gradle build file for Spring Integration -// -// - run `./gradlew(.bat) build` to kick off a complete compile-test-package -// -// @author Chris Beams -// @author Mark Fisher -// @author Oleg Zhurakousky -// ----------------------------------------------------------------------------- - -// ----------------------------------------------------------------------------- -// Configuration for the root project -// ----------------------------------------------------------------------------- -// used for artifact names, building doc upload urls, etc. description = 'Spring Integration' -abbreviation = 'INT' apply plugin: 'base' apply plugin: 'idea' -def buildSrcDir = "$rootDir/buildSrc" -apply from: "$buildSrcDir/wrapper.gradle" -apply from: "$buildSrcDir/maven-root-pom.gradle" - -// Tie pom generation into the standard build lifecycle (INT-1609) -assemble.dependsOn generatePom - +buildscript { + repositories { + maven { url 'https://repo.springsource.org/plugins-release' } + } + dependencies { + classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.0' + classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.0' + } +} -// ----------------------------------------------------------------------------- -// Configuration for all projects including this one (the root project) -// -// @see settings.gradle for list of all subprojects -// ----------------------------------------------------------------------------- allprojects { - // group will translate to groupId during pom generation and deployment group = 'org.springframework.integration' - // version will be used in maven pom generation as well as determining - // where artifacts should be deployed, based on release type of snapshot, - // milestone or release. - // @see org.springframework.build.Version under buildSrc/ for more info - // @see gradle.properties for the declaration of this property. - version = new Version(springIntegrationVersion) - - // default set of maven repositories to be used when resolving dependencies repositories { - //mavenRepo name: 'SpringSource Snapshot Repository', urls: 'http://maven.springframework.org/snapshot' - mavenRepo name: 'SpringSource Milestone Repository', urls: 'http://maven.springframework.org/milestone' - mavenCentral() - // only really necessary for artifacts not yet in Maven Central, i.e. immediately post-release - mavenRepo name: 'SpringSource Release Repository', urls: 'http://maven.springframework.org/release' - // needed for bundlor: - mavenRepo name: 'SpringSource Release Bundle Repository', urls: 'http://repository.springsource.com/maven/bundles/release' - // needed for external dependencies required by bundlor: - mavenRepo name: 'SpringSource External Bundle Repository', urls: 'http://repository.springsource.com/maven/bundles/external' + maven { url 'http://repo.springsource.org/libs-milestone' } + maven { url 'http://repo.springsource.org/plugins-release' } // for bundlor } } - -// ----------------------------------------------------------------------------- -// Create collections of subprojects - each will receive their own configuration -// - all subprojects that start with spring-integration-* are 'java projects' -// - documentation-related subprojects are not collected here -// -// @see configure(*) sections below -// ----------------------------------------------------------------------------- -javaprojects = subprojects.findAll { project -> - project.path.startsWith(':spring-integration-') -} - - -// ----------------------------------------------------------------------------- -// Configuration for all java subprojects -// ----------------------------------------------------------------------------- -configure(javaprojects) { - - apply plugin: 'java' // tasks for conventional java lifecycle - apply plugin: 'maven' // `gradle install` to push jars to local .m2 cache - apply plugin: 'eclipse' // `gradle eclipse` to generate .classpath/.project - apply plugin: 'idea' // `gradle idea` to generate .ipr/.iml - apply plugin: 'bundlor' // all core projects should be OSGi-compliant +subprojects { subproject -> + apply plugin: 'java' + apply plugin: 'maven' + apply plugin: 'eclipse' + apply plugin: 'idea' + apply plugin: 'bundlor' // ensure JDK 5 compatibility (GRADLE-18; INT-1578) sourceCompatibility=1.5 targetCompatibility=1.5 - // set up dedicated directories for jars and source jars. - // this makes it easier when putting together the distribution - libsBinDir = new File(libsDir, 'bin') - libsSrcDir = new File(libsDir, 'src') - - // add tasks for creating source jars and generating poms etc - apply from: "$buildSrcDir/maven-deployment.gradle" - - // add tasks for finding and publishing .xsd files - apply from: "$buildSrcDir/schema-publication.gradle" - aspectjVersion = '1.6.8' cglibVersion = '2.2' commonsNetVersion = '3.0.1' @@ -156,21 +76,45 @@ configure(javaprojects) { xLintArg = '-Xlint:all' [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] - // Tie pom generation into the standard build lifecycle (INT-1609) - assemble.dependsOn generatePom - test { // suppress all console output during testing unless running `gradle -i` logging.captureStandardOutput(LogLevel.INFO) } -} + bundlor { + enabled = true + failOnWarnings = true + bundleManifestVersion = 2 + bundleVendor = 'SpringSource' + bundleName = project.description + bundleVersion = project.version + importTemplate = [ + 'org.apache.log4j.*;version="['+log4jVersion+'], 2.0.0)"' + ] + } + + task sourcesJar(type: Jar) { + classifier = 'sources' + from sourceSets.main.allJava + } + + task javadocJar(type: Jar) { + classifier = 'javadoc' + from javadoc + } + + artifacts { + archives sourcesJar + archives javadocJar + } + + install { + repositories.mavenInstaller { + customizePom(pom, subproject) + } + } +} -// ----------------------------------------------------------------------------- -// Configuration for each individual core java subproject -// -// @see configure(javaprojects) above for general config -// ----------------------------------------------------------------------------- project('spring-integration-amqp') { description = 'Spring Integration AMQP Support' dependencies { @@ -188,6 +132,24 @@ project('spring-integration-amqp') { testCompile project(":spring-integration-stream") testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.amqp' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.apache.commons.lang.*;version="[2.5.0, 3.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.transaction.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.springframework.amqp.*;version="[1.0.0, 2.0.0)"', + 'org.aopalliance.*;version="[1.0.0, 2.0.0)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-core') { @@ -200,15 +162,38 @@ project('spring-integration-core') { testCompile "org.aspectj:aspectjrt:$aspectjVersion" testCompile "org.aspectj:aspectjweaver:$aspectjVersion" } + bundlor { + bundleSymbolicName = 'org.springframework.integration' + importTemplate += [ + 'org.springframework.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.transaction;version="[3.0.5, 4.0.0)";resolution:=optional', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.aopalliance.*;version="[1.0.0, 2.0.0)"', + 'org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-event') { - description = 'Spring Integration Event Support' + description = 'Spring Integration ApplicationEvent Support' dependencies { compile project(":spring-integration-core") compile "org.springframework:spring-context:$springVersion" testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.event' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-feed') { @@ -222,6 +207,23 @@ project('spring-integration-feed') { compile "net.java.dev.rome:rome:1.0.0" testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.feed' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.apache.commons.lang.*;version="[2.5.0, 3.0.0)"', + 'org.apache.commons.net.*;version="[2.0.0, 3.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'com.sun.syndication.*;version="[1.0.0, 2.0.0)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-file') { @@ -231,6 +233,22 @@ project('spring-integration-file') { compile "org.springframework:spring-context:$springVersion" testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.file' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.transaction.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.springframework.util.xml;version="[3.0.5, 4.0.0)"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-ftp') { @@ -242,15 +260,29 @@ project('spring-integration-ftp') { compile("javax.activation:activation:$javaxActivationVersion") { optional = true } testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.ftp' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.apache.commons.net.*;version="[2.0.0, 3.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } - project('spring-integration-gemfire') { description = 'Spring Integration GemFire Support' - test{ - forkEvery = 1 - systemProperties['gemfire.disableShutdownHook'] = 'true' - } + test { + forkEvery = 1 + systemProperties['gemfire.disableShutdownHook'] = 'true' + } dependencies { compile project(":spring-integration-core") compile ("org.springframework.data:spring-data-gemfire:$springGemfireVersion") { @@ -262,8 +294,21 @@ project('spring-integration-gemfire') { testCompile project(":spring-integration-stream") testCompile project(":spring-integration-test") } - repositories { - mavenRepo urls: 'http://dist.gemstone.com/maven/release' // for gemfire + bundlor { + bundleSymbolicName = 'org.springframework.integration.gemfire' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.data.gemfire.*;version="[1.0.1, 2.0.0)"', + 'com.gemstone.gemfire.*;version="[6.5.1, 7.0.0)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] } } @@ -275,6 +320,16 @@ project('spring-integration-groovy') { compile "org.codehaus.groovy:groovy-all:$groovyVersion" compile "org.springframework:spring-context-support:$springVersion" } + bundlor { + bundleSymbolicName = 'org.springframework.integration.groovy' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.*;version="[3.0.5, 4.0.0)"', + 'groovy.*;version="[1.7.3, 2.0.0)"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-http') { @@ -294,6 +349,25 @@ project('spring-integration-http') { compile ("net.java.dev.rome:rome:1.0.0") { optional = true } testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.http' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.http.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.validation.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.web.*;version="[3.0.5, 4.0.0)";resolution:=optional', + 'org.apache.commons.httpclient.*;version="[3.0.5, 4.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional', + 'javax.xml.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-ip') { @@ -304,6 +378,21 @@ project('spring-integration-ip') { runtime project(":spring-integration-stream") testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.ip' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.springframework.jmx.*;version="[3.0.5, 4.0.0)"', + 'org.w3c.dom.*;version="0"', + 'javax.net.*;version="0"' + ] + } } project('spring-integration-jdbc') { @@ -320,6 +409,17 @@ project('spring-integration-jdbc') { testCompile "org.aspectj:aspectjrt:$aspectjVersion" testCompile "org.aspectj:aspectjweaver:$aspectjVersion" } + bundlor { + bundleSymbolicName = 'org.springframework.integration.jdbc' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.*;version="[3.0.5, 4.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.aopalliance.*;version="[1.0.0, 2.0.0)"', + 'javax.sql.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } // suppress derby localization jar path warnings during test compilation compileTestJava.options.compilerArgs = ["${xLintArg},-path"] @@ -335,10 +435,26 @@ project('spring-integration-jms') { testCompile project(":spring-integration-test") testCompile ("org.apache.activemq:activemq-core:5.3.0") { exclude group: 'org.springframework', module: 'spring-context' - } - + } + testCompile "org.springframework:spring-oxm:$springVersion" } + bundlor { + bundleSymbolicName = 'org.springframework.integration.jms' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.jms.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.transaction.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-jmx') { @@ -350,6 +466,17 @@ project('spring-integration-jmx') { compile "org.springframework:spring-context:$springVersion" testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.jmx' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.*;version="[3.0.5, 4.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.aopalliance.*;version="[1.0.0, 2.0.0)"', + 'javax.management.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-mail') { @@ -361,6 +488,23 @@ project('spring-integration-mail') { compile("javax.activation:activation:$javaxActivationVersion") { optional = true } testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.mail' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.mail.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util.*;version="[3.0.5, 4.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'javax.mail.*;version="[1.4.0, 2.0.0)"', + 'com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional', + 'org.w3c.dom.*;version="0"' + ] + } // suppress javax.activation path warnings [compileJava,compileTestJava]*.options*.compilerArgs = ["${xLintArg},-path"] @@ -382,6 +526,24 @@ project('spring-integration-mongodb') { } testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.mongodb' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.springframework.jmx.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.data.mongodb.*;version="[1.0.0, 2.0.0)"', + 'org.springframework.data.mapping.*;version="[1.0.0, 2.0.0)"', + 'com.mongodb.*;version="[2.4.0, 2.5.0]"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-redis') { @@ -389,8 +551,8 @@ project('spring-integration-redis') { dependencies { compile project(":spring-integration-core") compile "org.springframework:spring-tx:$springVersion" - compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion") - compile("org.codehaus.jackson:jackson-core-asl:$jacksonVersion") + compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion") + compile("org.codehaus.jackson:jackson-core-asl:$jacksonVersion") compile ("org.springframework.data:spring-data-redis:$springDataRedisVersion") { exclude group: 'org.springframework', module: 'spring-core' exclude group: 'org.springframework', module: 'spring-context-support' @@ -399,6 +561,21 @@ project('spring-integration-redis') { } testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.redis' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.springframework.data.redis.*;version="[1.0.0, 2.0.0)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-rmi') { @@ -409,6 +586,19 @@ project('spring-integration-rmi') { compile "org.springframework:spring-context:$springVersion" testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.rmi' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.remoting.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.w3c.dom.*;version="0"' + ] + } // suppress deprecation warnings (@SuppressWarnings("deprecation") is not enough for javac) compileJava.options.compilerArgs = ["${xLintArg},-deprecation"] @@ -423,6 +613,16 @@ project('spring-integration-scripting') { testCompile("org.codehaus.groovy:groovy-all:$groovyVersion") testCompile("org.python:jython-standalone:2.5.2") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.scripting' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.*;version="[3.0.5, 4.0.0)"', + 'org.w3c.dom.*;version="0"', + 'javax.script.*;version="0"' + ] + } } project('spring-integration-security') { @@ -438,6 +638,20 @@ project('spring-integration-security') { exclude group: 'org.springframework', module: 'spring-support' } } + bundlor { + bundleSymbolicName = 'org.springframework.integration.security' + importTemplate += [ + 'org.aopalliance.*;version="[1.0.0, 2.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.aop.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.core;version="[3.0.5, 4.0.0)"', + 'org.springframework.util.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.security.*;version="[3.0.3, 4.0.0)"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-sftp') { @@ -451,6 +665,21 @@ project('spring-integration-sftp') { compile("javax.activation:activation:$javaxActivationVersion") { optional = true } testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.sftp' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'com.jcraft.jsch.*;version="[0.1.41, 0.1.50)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-stream') { @@ -459,6 +688,16 @@ project('spring-integration-stream') { compile project(":spring-integration-core") compile "org.springframework:spring-context:$springVersion" } + bundlor { + bundleSymbolicName = 'org.springframework.integration.stream' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-test') { @@ -470,6 +709,19 @@ project('spring-integration-test') { compile "org.springframework:spring-context:$springVersion" compile "org.springframework:spring-test:$springVersion" } + bundlor { + bundleSymbolicName = 'org.springframework.integration.test' + importTemplate += [ + 'org.apache.tools.ant.*;version="[1.7.0, 2.0.0)"', + 'org.springframework.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'junit.framework.*;version="[4.6.0, 4.7.0)"', + 'org.junit.*;version="[4.6.0, 4.7.0)"', + 'org.mockito.*;version="[1.6.0, 2.0.0)"', + 'org.hamcrest.*;version="[1.1.0, 1.1.0]"', + 'org.objenesis.*;version="[1.0.0, 2.0.0)"' + ] + } } project('spring-integration-twitter') { @@ -489,6 +741,25 @@ project('spring-integration-twitter') { compile("javax.activation:activation:$javaxActivationVersion") { optional = true } testCompile project(":spring-integration-test") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.twitter' + importTemplate += [ + 'org.aopalliance.*;version="[1.0.0, 2.0.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.aop.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.social.*;version="[1.0.0, 1.1.0)"', + 'org.springframework.security.crypto.*;version="[3.1.0, 3.2.0)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } } project('spring-integration-ws') { @@ -500,8 +771,8 @@ project('spring-integration-ws') { compile "org.springframework:spring-web:$springVersion" compile ("org.springframework.ws:spring-ws-core:$springWsVersion") { exclude group: 'org.springframework', module: 'spring-webmvc' - exclude group: 'org.springframework', module: 'spring-web' - exclude group: 'org.springframework', module: 'spring-context-support' + exclude group: 'org.springframework', module: 'spring-web' + exclude group: 'org.springframework', module: 'spring-context-support' } compile("javax.xml.soap:saaj-api:1.3") { optional = true @@ -513,6 +784,25 @@ project('spring-integration-ws') { testCompile "stax:stax-api:1.0.1" testCompile "xstream:xstream:1.2.2" } + bundlor { + bundleSymbolicName = 'org.springframework.integration.ws' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.core.convert;version="[3.0.5, 4.0.0)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.web.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.oxm;version="[1.5.9, 3.1.0)"', + 'org.springframework.ws.*;version="[2.0.0, 2.1.0)"', + 'org.springframework.xml.*;version="[1.5.9, 2.1.0)"', + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.w3c.dom.*;version="0"', + 'javax.xml.*;version="0"' + ] + } // suppress saaj path warnings [compileJava,compileTestJava]*.options*.compilerArgs = ["${xLintArg},-path"] @@ -525,13 +815,30 @@ project('spring-integration-xml') { compile "org.springframework:spring-context:$springVersion" compile "org.springframework:spring-oxm:$springVersion" compile ("org.springframework.ws:spring-xml:$springWsVersion") { - exclude group: 'org.springframework', module: 'spring-beans' - exclude group: 'org.springframework', module: 'spring-core' + exclude group: 'org.springframework', module: 'spring-beans' + exclude group: 'org.springframework', module: 'spring-core' } compile("javax.activation:activation:$javaxActivationVersion") { optional = true } testCompile project(":spring-integration-test") testCompile "xmlunit:xmlunit:1.3" } + bundlor { + bundleSymbolicName = 'org.springframework.integration.xml' + importTemplate += [ + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.oxm;version="[1.5.9, 3.1.0)";resolution:=optional', + 'org.springframework.xml.*;version="[1.5.9, 2.1.0)"', + 'org.apache.commons.logging.*;version="[1.0, 2.0)"', + 'org.w3c.dom.*;version="0"', + 'org.xml.sax.*;version="0"', + 'javax.xml.*;version="0"' + ] + } } project('spring-integration-xmpp') { @@ -545,17 +852,236 @@ project('spring-integration-xmpp') { testCompile project(":spring-integration-test") testCompile project(":spring-integration-stream") } + bundlor { + bundleSymbolicName = 'org.springframework.integration.xmpp' + importTemplate += [ + 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', + 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', + 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.context;version="[3.0.5, 4.0.0)"', + 'org.springframework.core.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.util;version="[3.0.5, 4.0.0)"', + 'org.jivesoftware.*;version="[3.0.5, 4.0.0)"', + 'javax.*;version="0"', + 'org.w3c.dom.*;version="0"' + ] + } // suppress smack path warnings [compileJava,compileTestJava]*.options*.compilerArgs = ["${xLintArg},-path"] } -// ----------------------------------------------------------------------------- -// Configuration for the docs subproject -// ----------------------------------------------------------------------------- -project('docs') { - apply from: "$buildSrcDir/docs.gradle" +apply plugin: 'docbook-reference' + +reference { + sourceDir = file('src/reference/docbook') +} + +task api(type: Javadoc) { + group = 'Documentation' + description = 'Generates aggregated Javadoc API documentation.' + options.overview = 'src/api/overview.html' + options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED + source subprojects.collect { project -> + project.sourceSets.main.allJava + } + destinationDir = new File(buildDir, "api") + classpath = files(subprojects.collect { project -> + project.sourceSets.main.compileClasspath + }) +} + +task schemaZip(type: Zip) { + group = 'Distribution' + classifier = 'schema' + description = "Builds -${classifier} archive containing all " + + "XSDs for deployment at static.springframework.org/schema." + + subprojects.each { subproject -> + def Properties schemas = new Properties(); + def shortName = subproject.name.replaceFirst("${rootProject.name}-", '') + if (subproject.name.endsWith("-core")) { + shortName = '' + } + + subproject.sourceSets.main.resources.find { + it.path.endsWith('META-INF/spring.schemas') + }?.withInputStream { schemas.load(it) } + + for (def key : schemas.keySet()) { + File xsdFile = subproject.sourceSets.main.resources.find { + it.path.endsWith(schemas.get(key)) + } + assert xsdFile != null + into ("integration/${shortName}") { + from xsdFile.path + } + } + } +} + +task docsZip(type: Zip) { + group = 'Distribution' + classifier = 'docs' + description = "Builds -${classifier} archive containing api and reference " + + "for deployment at static.springframework.org/spring-integration/docs." + + from('src/dist') { + include 'changelog.txt' + } + + from (api) { + into 'api' + } + + from (reference) { + into 'reference' + } +} + +task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) { + group = 'Distribution' + classifier = 'dist' + description = "Builds -${classifier} archive, containing all jars and docs, " + + "suitable for community download page." + + baseDir = "${project.name}-${project.version}"; + + from('src/dist') { + include 'readme.txt' + include 'license.txt' + include 'notice.txt' + into "${baseDir}" + } + + from(zipTree(docsZip.archivePath)) { + into "${baseDir}/docs" + } + + from(zipTree(schemaZip.archivePath)) { + into "${baseDir}/schema" + } + + subprojects.each { subproject -> + into ("${baseDir}/libs") { + from subproject.jar + from subproject.sourcesJar + from subproject.javadocJar + } + } +} + +// Create an optional "with dependencies" distribution. +// Not published by default; only for use when building from source. +task depsZip(type: Zip, dependsOn: distZip) { zipTask -> + group = 'Distribution' + classifier = 'dist-with-deps' + description = "Builds -${classifier} archive, containing everything " + + "in the -${distZip.classifier} archive plus all dependencies." + + from zipTree(distZip.archivePath) + + gradle.taskGraph.whenReady { taskGraph -> + if (taskGraph.hasTask(":${zipTask.name}")) { + def projectNames = rootProject.subprojects*.name + def artifacts = new HashSet() + subprojects.each { subproject -> + subproject.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each { artifact -> + def dependency = artifact.moduleVersion.id + if (!projectNames.contains(dependency.name)) { + artifacts << artifact.file + } + } + } + + zipTask.from(artifacts) { + into "${distZip.baseDir}/deps" + } + } + } +} + +artifacts { + archives distZip + archives docsZip + archives schemaZip +} + +task dist(dependsOn: assemble) { + group = 'Distribution' + description = 'Builds -dist, -docs and -schema distribution archives.' +} + +task wrapper(type: Wrapper) { + description = 'Generates gradlew[.bat] scripts' + gradleVersion = '1.0-milestone-6' + jarFile = '.wrapper/gradle-wrapper.jar' } -apply from: "$buildSrcDir/dist.gradle" -apply from: "$buildSrcDir/checks.gradle" +def customizePom(def pom, def gradleProject) { + pom.whenConfigured { generatedPom -> + // respect 'optional' and 'provided' dependencies + def deps = gradleProject.configurations.runtime.allDependencies + def optionalDeps = deps.findAll { dep -> + dep.asDynamicObject.hasProperty('optional') && dep.optional + } + def providedDeps = deps.findAll { dep -> + dep.asDynamicObject.hasProperty('provided') && dep.provided + } + generatedPom.dependencies.each { mavenDep -> + mavenDep.optional = optionalDeps.any { optionalDep -> + optionalDep.group == mavenDep.groupId && + optionalDep.name == mavenDep.artifactId && + optionalDep.version == mavenDep.version + } + boolean isProvided = providedDeps.any { providedDep -> + providedDep.group == mavenDep.groupId && + providedDep.name == mavenDep.artifactId && + providedDep.version == mavenDep.version + } + if (isProvided) { + mavenDep.scope = 'provided' + } + } + + // eliminate test-scoped dependencies (no need in maven central poms) + generatedPom.dependencies.removeAll { dep -> + dep.scope == 'test' + } + + // add all items necessary for maven central publication + generatedPom.project { + name = gradleProject.description + description = gradleProject.description + url = 'https://github.com/SpringSource/spring-integration' + organization { + name = 'SpringSource' + url = 'http://springsource.org' + } + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + url = 'https://github.com/SpringSource/spring-integration' + connection = 'scm:git:git://github.com/SpringSource/spring-integration' + developerConnection = 'scm:git:git://github.com/SpringSource/spring-integration' + } + developers { + developer { + id = 'markfisher' + name = 'Mark Fisher' + email = 'markfisher@vmware.com' + } + developer { + id = 'olegz' + name = 'Oleg Zhurakousky' + email = 'ozhurakousky@vmware.com' + } + } + } + } +} diff --git a/buildSrc b/buildSrc deleted file mode 160000 index db443164bf0..00000000000 --- a/buildSrc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit db443164bf02a122f771a2bf4ed72df932779652 diff --git a/docs/src/info/readme.txt b/docs/src/info/readme.txt deleted file mode 100644 index 647e5c86235..00000000000 --- a/docs/src/info/readme.txt +++ /dev/null @@ -1,36 +0,0 @@ -SPRING INTEGRATION 2.1.0 Release Candidate 2 ------------------------------------------------------------ - -To find out what has changed since any earlier releases, see 'changelog.txt'. - -Please consult the documentation located within the 'docs/reference' directory -of this release and also visit the official Spring Integration home at -http://www.springsource.org/spring-integration - -There you will find links to the forum, issue tracker, and several other resources. - -To check out the project and build from source, do the following: - - git clone --recursive git://github.com/SpringSource/spring-integration.git - cd spring-integration - ./gradlew build - -To generate Eclipse metadata (.classpath and .project files), do the following: - - ./gradlew eclipse - -Once complete, you may then import projects into Eclipse as usual: - - File->Import->Existing projects into workspace - -and point to the 'spring-integration' root directory. All projects should import free of errors. - -To generate IDEA metadata (.iml and .ipr files), do the following: - - ./gradlew idea - -To build the JavaDoc, do the following from within the root directory: - - ./gradlew :docs:api - -The result will be available in 'docs/build/api'. diff --git a/docs/src/reference/resources/css/highlight.css b/docs/src/reference/resources/css/highlight.css deleted file mode 100644 index ffefef72de8..00000000000 --- a/docs/src/reference/resources/css/highlight.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - code highlight CSS resemblign the Eclipse IDE default color schema - @author Costin Leau -*/ - -.hl-keyword { - color: #7F0055; - font-weight: bold; -} - -.hl-comment { - color: #3F5F5F; - font-style: italic; -} - -.hl-multiline-comment { - color: #3F5FBF; - font-style: italic; -} - -.hl-tag { - color: #3F7F7F; -} - -.hl-attribute { - color: #7F007F; -} - -.hl-value { - color: #2A00FF; -} - -.hl-string { - color: #2A00FF; -} \ No newline at end of file diff --git a/docs/src/reference/resources/css/html.css b/docs/src/reference/resources/css/html.css deleted file mode 100644 index 36297ac36db..00000000000 --- a/docs/src/reference/resources/css/html.css +++ /dev/null @@ -1,421 +0,0 @@ -body { - text-align: justify; - margin-right: 2em; - margin-left: 2em; -} - -a, - a[accesskey^ - -= -"h" -] -, -a[accesskey^ - -= -"n" -] -, -a[accesskey^ - -= -"u" -] -, -a[accesskey^ - -= -"p" -] -{ -font-family: Verdana, Arial, helvetica, sans-serif - -; -font-size: - -12 -px - -; -color: #003399 - -; -} - -a:active { - color: #003399; -} - -a:visited { - color: #888888; -} - -p { - font-family: Verdana, Arial, sans-serif; -} - -dt { - font-family: Verdana, Arial, sans-serif; - font-size: 12px; -} - -p, dl, dt, dd, blockquote { - color: #000000; - margin-bottom: 3px; - margin-top: 3px; - padding-top: 0px; -} - -ol, ul, p { - margin-top: 6px; - margin-bottom: 6px; -} - -p, blockquote { - font-size: 90%; -} - -p.releaseinfo { - font-size: 100%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; - padding-top: 10px; -} - -p.pubdate { - font-size: 120%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -td { - font-size: 80%; -} - -td, th, span { - color: #000000; -} - -td[width^ - -= -"40%" -] -{ -font-family: Verdana, Arial, helvetica, sans-serif - -; -font-size: - -12 -px - -; -color: #003399 - -; -} - -table[summary^ - -= -"Navigation header" -] -tbody tr th[colspan^ - -= -"3" -] -{ -font-family: Verdana, Arial, helvetica, sans-serif - -; -} - -blockquote { - margin-right: 0px; -} - -h1, h2, h3, h4, h6, H6 { - color: #000000; - font-weight: 500; - margin-top: 0px; - padding-top: 14px; - font-family: Verdana, Arial, helvetica, sans-serif; - margin-bottom: 0px; -} - -h2.title { - font-weight: 800; - margin-bottom: 8px; -} - -h2.subtitle { - font-weight: 800; - margin-bottom: 20px; -} - -.firstname, .surname { - font-size: 12px; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -table { - border-collapse: collapse; - border-spacing: 0; - border: 1px black; - empty-cells: hide; - margin: 10px 0px 30px 50px; - width: 90%; -} - -div.table { - margin: 30px 0px 30px 0px; - border: 1px dashed gray; - padding: 10px; -} - -div .table-contents table { - border: 1px solid black; -} - -div.table > p.title { - padding-left: 10px; -} - -table[summary^ - -= -"Navigation footer" -] -{ -border-collapse: collapse - -; -border-spacing: - -0 -; -border: - -1 -px black - -; -empty-cells: hide - -; -margin: - -0 -px - -; -width: - -100 -% -; -} - -table[summary^ - -= -"Note" -] -, -table[summary^ - -= -"Warning" -] -, -table[summary^ - -= -"Tip" -] -{ -border-collapse: collapse - -; -border-spacing: - -0 -; -border: - -1 -px black - -; -empty-cells: hide - -; -margin: - -10 -px - -0 -px - -10 -px - -- -20 -px - -; -width: - -100 -% -; -} - -td { - padding: 4pt; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -div.warning TD { - text-align: justify; -} - -h1 { - font-size: 150%; -} - -h2 { - font-size: 110%; -} - -h3 { - font-size: 100%; - font-weight: bold; -} - -h4 { - font-size: 90%; - font-weight: bold; -} - -h5 { - font-size: 90%; - font-style: italic; -} - -h6 { - font-size: 100%; - font-style: italic; -} - -tt { - font-size: 110%; - font-family: "Courier New", Courier, monospace; - color: #000000; -} - -.navheader, .navfooter { - border: none; -} - -div.navfooter table { - border: dashed gray; - border-width: 1px 1px 1px 1px; - background-color: #cde48d; -} - -pre { - font-size: 110%; - padding: 5px; - border-style: solid; - border-width: 1px; - border-color: #CCCCCC; - background-color: #f3f5e9; -} - -ul, ol, li { - list-style: disc; -} - -hr { - width: 100%; - height: 1px; - background-color: #CCCCCC; - border-width: 0px; - padding: 0px; -} - -.variablelist { - padding-top: 10px; - padding-bottom: 10px; - margin: 0; -} - -.term { - font-weight: bold; -} - -.mediaobject { - padding-top: 30px; - padding-bottom: 30px; -} - -.legalnotice { - font-family: Verdana, Arial, helvetica, sans-serif; - font-size: 12px; - font-style: italic; -} - -.sidebar { - float: right; - margin: 10px 0px 10px 30px; - padding: 10px 20px 20px 20px; - width: 33%; - border: 1px solid black; - background-color: #F4F4F4; - font-size: 14px; -} - -.property { - font-family: "Courier New", Courier, monospace; -} - -a code { - font-family: Verdana, Arial, monospace; - font-size: 12px; -} - -td code { - font-size: 110%; -} - -div.note * td, - div.tip * td, - div.warning * td, - div.calloutlist * td { - text-align: justify; - font-size: 100%; -} - -.programlisting .interfacename, - .programlisting .literal, - .programlisting .classname { - font-size: 95%; -} - -.title .interfacename, - .title .literal, - .title .classname { - font-size: 130%; -} - -/* everything in a is displayed in a coloured, comment-like font */ -.programlisting * .lineannotation, - .programlisting * .lineannotation * { - color: green; -} diff --git a/docs/src/reference/resources/css/manual.css b/docs/src/reference/resources/css/manual.css deleted file mode 100644 index 524d462211e..00000000000 --- a/docs/src/reference/resources/css/manual.css +++ /dev/null @@ -1,69 +0,0 @@ -@IMPORT url("highlight.css"); - -html { - padding: 0pt; - margin: 0pt; -} - -body { - margin-left: 10%; - margin-right: 10%; - font-family: Arial, Sans-serif; -} - -div { - margin: 0pt; -} - -p { - text-align: justify; -} - -hr { - border: 1px solid gray; - background: gray; -} - -h1,h2,h3,h4 { - color: #234623; - font-family: Arial, Sans-serif; -} - -pre { - line-height: 1.0; - color: black; -} - -pre.programlisting { - font-size: 10pt; - padding: 7pt 3pt; - border: 1pt solid black; - background: #eeeeee; - clear: both; -} - -div.table { - margin: 1em; - padding: 0.5em; - text-align: center; -} - -div.table table { - display: table; - width: 100%; -} - -div.table td { - padding-left: 7px; - padding-right: 7px; -} - -.sidebar { - float: right; - margin: 10px 0 10px 30px; - padding: 10px 20px 20px 20px; - width: 33%; - border: 1px solid black; - background-color: #F4F4F4; - font-size: 14px; -} diff --git a/docs/src/reference/resources/css/stylesheet.css b/docs/src/reference/resources/css/stylesheet.css deleted file mode 100644 index 77569070a95..00000000000 --- a/docs/src/reference/resources/css/stylesheet.css +++ /dev/null @@ -1,99 +0,0 @@ -@IMPORT url("highlight.css"); - -html { - padding: 0pt; - margin: 0pt; -} - -body { - margin-left: 10%; - margin-right: 10%; - font-family: Arial, Sans-serif; -} - -div { - margin: 0pt; -} - -p { - text-align: justify; -} - -hr { - border: 1px solid gray; - background: gray; -} - -h1,h2,h3,h4 { - color: #234623; - font-family: Arial, Sans-serif; -} - -pre { - line-height: 1.0; - color: black; -} - -pre.programlisting { - font-size: 10pt; - padding: 7pt 3pt; - border: 1pt solid black; - background: #eeeeee; - clear: both; -} - -div.table { - margin: 1em; - padding: 0.5em; - text-align: center; -} - -div.table table { - display: table; - width: 100%; -} - -div.table td { - padding-left: 7px; - padding-right: 7px; -} - -.sidebar { - float: right; - margin: 10px 0 10px 30px; - padding: 10px 20px 20px 20px; - width: 33%; - border: 1px solid black; - background-color: #F4F4F4; - font-size: 14px; -} - -.mediaobject { - padding-top: 30px; - padding-bottom: 30px; -} - -.legalnotice { - font-family: Verdana, Arial, helvetica, sans-serif; - font-size: 12px; - font-style: italic; -} - -p.releaseinfo { - font-size: 100%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; - padding-top: 10px; -} - -p.pubdate { - font-size: 120%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -span.productname { - font-size: 200%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} diff --git a/docs/src/reference/resources/images/admon/caution.png b/docs/src/reference/resources/images/admon/caution.png deleted file mode 100644 index 5b7809ca4a9c8d778087522e5ce04b6e90099595..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1250 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbQ|Pftew|C&U%V<=|it5MYpyU{F+K zFf?Rva$<;zVn|MA$j)XcE@r5%W@u>vqT-$&hMpcE*)wGd!;~q-Q>IkUnZqz=PVt;M zK*p3gbLK2v%CK~4^3tV1#?q}@8MbbX+PXD)>(;G%_cH9=n|$sZ!?|yxmE{-7;w@N47?rU=3X_NkV zU|o{PnRTZ;lXp4>+)hZU_|Lw%*va*6=<@jI@BP^`_OsZ?pZg-2AaGf|;i2L0<>du@ zeRrO4er03}pLSxdREd>pap^;~&E+}=JYKy#vHnLI=Z$}pPyA_`zG;G~<$`Br2do;7 z$Heivv0AeyJYVI({@6?X6r+V~XS2Cs!|bddDqJz@2lKf$~4dA1c%lfOT+5KMUSWi#X5(9ePxx_W1Bsf2+N)z4*}Q$iB}K{RAP diff --git a/docs/src/reference/resources/images/admon/important.png b/docs/src/reference/resources/images/admon/important.png deleted file mode 100644 index 12c90f607a1b27ddde0a7d922ae255e8c90e883e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmV;@0xkWCP)Gdz_qOoSb{LwMwNgp7=gl$4aErG%}mjHRWNrKOy`y@b8JoTa6ut*xc4t*y1SwY|N)#>U3Z&d%1> z*52OU=jZ3|@9+2b_y7O@tTMkk%M`~Kg@u8&dg_P^_0l3yQb639!jLZt^Lx<-O17UeeJ z-|=!77W(jGx&e#?FOku-gKofoU0$~4M+dhLFueEauP`}l7LV=;lsOdn%WHure=x;k`m0(bF&MU#) z-qv#^n8(MjB|ykioqII#+`g4no-MU=BK|Sahu_3M_-d*=7hq=~t?^}A)G7 zbairN0An*{V`DL9V>K}|HDobmIW;*pIW=W9HaTQ6F*7kTGI9=S@Bjb+07*qoM6N<$ Ef=i}M4FCWD diff --git a/docs/src/reference/resources/images/admon/note-spr.jpg b/docs/src/reference/resources/images/admon/note-spr.jpg deleted file mode 100644 index 5a4e5cb1893fc09ab162c083d2dca31a2a5cf2b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1319 zcmex=kR1VRQz zDF#+Bn}NZLQ5wz;V$^`DVPart&tzbMs)+*9AOJKOq#H^zEntGHP*}i>V1tzYzs=yx zz{JQ1LQFse1k9|=Ai&1L!pzFf#?H>p#>U3Z!Oh9e!NtMG#>vac#m&vb!^6(W%g4*Z z2V`=C3<2q72J2!cz#z!MpunKO%&5e`B*@4t$oT&VgFMhDtibRB1sN1D zGBLBT0$l`j2T;LQ0ig4lnVEo&Wn}>d1Y<2wo`FS>RY=j$kxe)-kzJ`!#HexNLJno8 zjR!@8E`CrkPAY2R|V^&07y2J$~}^+4C1KUw!=a`ODXD-+%o41@ado12e>1aG#<1 zOAzQUCSV+}u!H=?$W#u*%z`YeiiT`Lj)Clng~CckjT|CQ6Blkg$f;}`^g%SK=pvVx zipfLOk07sseMX$en#l4Q++zrT-D2QjW&}navmk>#!{0L>_aFN!e&E)F%X-%X_Fr-0 zOl>-L-{0v#c}IW}aFaRvK!Wy?yDI`0DJ>cYdvrJ*+$-V?E2?3Hx+!{AdoE?fhZe z(!UEApUzdiyF@Sg+@+K*7tghGrJwiKS4)N@nEg3WxP`xZ{cQ{X&WysmNN?lAM~`~F zJo;WzJ#GHtn_t7KWc`er3s#Fu>Pl6a{5iDazVIK`57#@tTE6dH^Q&xO>15M$^9#PM zH?%+UkRv?*+YI6Nu~S7~J(ElmHeLG0a7%KK>{3zH??%5^*+Uw>S|a{I3G(`akA%Z*KJweC&-84jB4f3SC-_}_j18M5bk zKiImjGsAQ>Kkt8rLyp<&Gk$gKx%`z;`nc>7qay*fOICbh5}bKZ_MjI33){;0gZ4M7 zAF{u>`_cHQoY4>756=(934QeMl{vZgRaI(}V_{w7nI6f82gY-shBMA)X>u@q{=lM| zcgiE%b?o0uZf#yJt(E&SQ{(pCsatZRUYFe3`8xEhddI=zoKakUx<%*TYW!zV{dIg( M`O}xF3;*8)05AOO_P4H$tJl=Pxd^1p6`8M?=jE( z!hchf6<8Mi`NHe6`iia69>!lxe4C2-S>+Wvj;l63k!MNSb9|1+f-i>irDi|a^uLl% z^#-f2#pQ2lC%m~9m9JWJZL3|T8FRX>A78<>cU{Z6XGFG336=OLGkw25|29|RG_k%U z>j|M}Ih2i#-w+9_ll{>(OzfJ4N{OX={Q&zNgO}j31DC;|ya^r9Fjd348&p+!^cT+^sws+=& zCu*T*mRNK3PE;$BNx$Fa_9(Y=&DoXLMFRd#U31O)<`W^F&-o=xbIqK-c?mr!bmn>! zky6TW;ML~4nXw$T{yra=OteL6G!=B;0=?;6;u=vBoS#-wo>-L1;Gm(b>6x3Dp6Z*J zo|&AjV4`QFXQ5zesc&GRZ(yj9T$EW{Qt6OeSzMBtte0A>mr`1gpI4%noS!>!m*Ngk zP=bxiOwUU!DFvFBnrfM1VQy}0X_lO7WM-b2nq**TZkb|inr2~`WR#dJWc*7VsEZGz hD*$LMgOO>4k%_i}w!yxSoa=!y44$rjF6*2UngF(YpwIvS diff --git a/docs/src/reference/resources/images/admon/warning.png b/docs/src/reference/resources/images/admon/warning.png deleted file mode 100644 index 1c33db8f34a8b42b373179b46a2d8d8a10e061a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1241 zcmeHH+e?!H6#vDtmgHCxG{Q}12(7`~)|MMe^RnTlY0JD#q1sIwW1DTCqzzwWg@Q=t zBC2Iceu@w4LHM97Gb5%*E%9MN*%m}jvs!{N@Pd8$H}vS?TsRzlzr#5kPPe|YG%fXL zDu6VdR$WC$&Oc)^X#ZjK-7LU>{!F!o39xr+d_Vw5fMTEwpb-s#9q<5Nzz6gIepyU?Lctpr{ZK zVzWaWPAC)#17S8h%;AIuf(Q_yeIybEqS0s^i1YdJcsv0ln9M{Xkpz;-I_^=P))~D~!!Hvpq{Dl8O{rN@cECkt>#DncX%I(O&3i_YgL-$m$VU zT3cLBLS%M1`o{TBX}S|Tbhc)vk!Yp)%rdDd&my(RPsxl%lU$)tC?(1~WuEwClUQn! n$Q8O{Mxt@ukkcT{K0> diff --git a/docs/src/reference/resources/images/callouts/1.gif b/docs/src/reference/resources/images/callouts/1.gif deleted file mode 100644 index 9e7a87f75461ce41cc91ee68246c7bfb47d37ca3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 889 zcmV-<1BU!ZNk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0RaC1EC2ui01N;O000P90RIW3lmh~U9GnCyi~#@uf)ov7ENlpX zku!=C88uXL?%qX;j2KcZ^)Vs>iU2s3ba;}YN|XphHhhUuqsx_y{>fxi3!_4aC;>=R P_%9>^1UV=v3C}X^4DKU-G|w_t}fLBA)Suv#nrW z!^h2QnY_`l!BOq-UXEX{m2up>JTQkX)2m zTvF+fTUlI^nXH#utd~++ke^qgmzgTe~DWM4ffP81J diff --git a/docs/src/reference/resources/images/callouts/1.svg b/docs/src/reference/resources/images/callouts/1.svg deleted file mode 100644 index e2e87dc5268..00000000000 --- a/docs/src/reference/resources/images/callouts/1.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/10.gif b/docs/src/reference/resources/images/callouts/10.gif deleted file mode 100644 index e80f7f8e632e72463866c08beba2bfb3b17221e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 929 zcmV;S177?`Nk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0Ra90EC2ui01N;O000Pn0R0K%lmi2V9E=1i%mD!d00b!@#8`-+ zR;?7?dYzM!!e6Nn@BUe=1z?Uh0F0D8bXLpS8~`!?g^1x00Ly!00ATo+13^ue?{bFV z2|%UITFwXo$ng(Dj8XuOGO`ANk~5V4ascSX2|}-X)?#!Ns5RIspO!hirf Dy0E(c diff --git a/docs/src/reference/resources/images/callouts/10.png b/docs/src/reference/resources/images/callouts/10.png deleted file mode 100644 index 997bbc8246a316e040e0804174ba260e219d7d33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQWtZ~+OvdJMW|Y+^UT?O-M{rKJsmzxdayJ{ zDCQA!%%@7Jj$q%-wf8e0_jRx8Dqi$}^?K=?6FriQFLv>>oc^CE+aVHhW3=nZ+fQ4!M=ZC7H>3sl|FJr3LwU zC3?yExf6FO?f@F61vV}-Juk7O6lk8Yg;}bFaZ-|HQc7Azopr01?u8M*si- diff --git a/docs/src/reference/resources/images/callouts/10.svg b/docs/src/reference/resources/images/callouts/10.svg deleted file mode 100644 index 4740f587bd2..00000000000 --- a/docs/src/reference/resources/images/callouts/10.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/11.gif b/docs/src/reference/resources/images/callouts/11.gif deleted file mode 100644 index 67f91a239d66d622f8d254539b6fd580efa42b02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmZ?wbhEHb%*^WQ z>bADF{{H^y)2Gj!J9p8dMeEkB+q`-6jvYIW9656K?Ac3~F5SL;`|;z)Z{EE5@ZrP1 zfB*i&fZ|UUMn(pC1|5)1AUhdY-5;oT-OT9fVPH5?qIP(rnuCecF;(8lY%CHJA0|%J x(XwN3776fTXisr6DR7$1b@7l?>`pt$t64n;p&ZEvzI<6|A|t-7MudsM8UU#vRD1vc diff --git a/docs/src/reference/resources/images/callouts/11.png b/docs/src/reference/resources/images/callouts/11.png deleted file mode 100644 index ce47dac3f52ac49017749a3fea53db57d006993c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1SD^YpWXnZI14-?iy0V%N{XE z)7O>#600DeuDZ?5tOl@ql94%{~0TwC?8m~C^ZqJRG}m@H-L1 z5L@scq?{XUcxG{OP9jig5ySQaTl#^*93bKF#G<^+ymW>G($Cs~V(bw8rA5i93}62@ zzlJGu&d<$F%`0K}c4pdspcorSSx9C{PAbEScbC)|7#JBmT^vIy=9KoYUDZ+`aP)jU z&ny=ErrK^#Gw!AcR}pdfMERuV^@&0$@(#^6b8c@rn^6RWX3pUb z4*6@PZ+H0#u=rjsXzS?6n6*sBGbHqGTU%mCsH?n#%j;eD^2}qe=iX*J@VQ3BRpz+u z{PX#N(^9X${`$90+;!pWs>o@z_n8G)7Uo7PJz`jrS+)QE@=PWHmc~UIw=WmUe73o7 z>^bR(M752aYoNg~ozu7U7&{(U>{s!;bn#f?ItjL^o`e{*EOQHqO;ccnz9hLK5@2cAyw@AaPFL~Cp#02|E|4xeQteNtB7waMs QVCXP-y85}Sb4q9e0GRUFb^rhX diff --git a/docs/src/reference/resources/images/callouts/11.svg b/docs/src/reference/resources/images/callouts/11.svg deleted file mode 100644 index 09a0b2cf71c..00000000000 --- a/docs/src/reference/resources/images/callouts/11.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/12.gif b/docs/src/reference/resources/images/callouts/12.gif deleted file mode 100644 index 54c4b42f1901629a81924c2f0f59338104adeedd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmZ?wbhEHb(-#rlzKzo}S5*C(oKSYw6OZn>TOXy?ghOBS+4hIdl8=?Z=NFfBN+4-@kwVQGw!5 z7Dh$}c?KP@O+Y&tSp6TUNBM5@Ncv^za9iq?NB~b`s?Q`L(SI(T+y_1#WZ*J!SfIpc y)1^D>K$0MX%p%4Hwu?TqL@qKHD9DJsXySU9#jCf<|A~QyiNVJ`b^kdT8LR=FrC4|X diff --git a/docs/src/reference/resources/images/callouts/12.png b/docs/src/reference/resources/images/callouts/12.png deleted file mode 100644 index 31daf4e2f25b6712499ee32de9c2e3b050b691ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1SD^YpWXnZI14-?iy0V%N{XE z)7O>#600De9$%>2LVd81Yeb1-X-P(Y5yQ%LXFPyHJS9LOm(=3qqRfJl%=|nCVNOM5 zpg0#u+&RCXvM4h>ql94%{~0TwC?8m~C^ZqJRG}m@H-L1 z5L@scq?{XUcxG{OP9jig5ySQaTl#^*93bKF#G<^+ymW>G($Cs~V(bw8rA5i93}62@ zzlJGu&d<$F%`0K}c4pdspcorSSx9C{PAbEScbC)|7#JBmT^vIy=Cn>wTzx1(qV@bS z0hYvspf(--lM>otrqbK$7p{3DzJ|+KN8%5ows)AI?zWk_n>jwEHXrTJecpEW_0xL= z?}N`*R`T~d2{AN${y8T#GEn4hUb&52^}Op@TW4{oc)A6)%$5=G}h# z?O{QLj@aRcAIf&y&OiUN=H2gq=_}V|pWfuReDV|{jwXw~>#w)I|9$ - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/13.gif b/docs/src/reference/resources/images/callouts/13.gif deleted file mode 100644 index dd5d7d9b6439affca376bcd60785d528a24ce425..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?wbhEHbB&V9x4V*B03xgoIf)x xP}6;KaKZ)#6?t!lhL!-83*8xv4m?aeZ4A@2c0{pEJ&`E!{XE z)7O>#600Dep5bGK9wD%hYeb1-X-P(Y5yQ%LXFPyHJS9LOm(=3qqRfJl%=|nCVNOM5 zpg0#u+&RCXvM4h>ql94%{~0TwC?8m~C^ZqJRG}m@H-L1 z5L@scq?{XUcxG{OP9jig5ySQaTl#^*93bKF#G<^+ymW>G($Cs~V(bw8rA5i93}62@ zzlJGu&d<$F%`0K}c4pdspcorSSx9C{PAbEScbC)|7#JBmT^vIy=Cn>w>~AWNX^a2R zbkveVY|45D7UnZ&JtjPwvdCCscZp0EA*0()#GOw)UH4-^&)y^E*4%UC)*|J}q_Ss;tN`nd8$>x9$_Xb^O2EpX&@C ZI46EzbLxq-voTO7gQu&X%Q~loCIF_C`w;*D diff --git a/docs/src/reference/resources/images/callouts/13.svg b/docs/src/reference/resources/images/callouts/13.svg deleted file mode 100644 index 64268bb4fa2..00000000000 --- a/docs/src/reference/resources/images/callouts/13.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/14.gif b/docs/src/reference/resources/images/callouts/14.gif deleted file mode 100644 index 3d7a952a310523200521c1fa87b943637b5d1347..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmZ?wbhEHbgwv|=H~A1 z?x|C!&Y3f3>C&Z}Hf`Fwcki)d$4;F(b@l4iTeogKe*F0D+qWM-e*E|E-+v6C_>+Z^ zkwKn82V@h-P6k%52kLdAD!mz@3~xRxVRG8g@v!IkBvpn+%|^iofu1ZH;zuVO=~9sr r<5W2yU@F+%-l|kl%h$jrvB98Ei)orw&!RI?aaY=tCf$Ck$Y2cs9-Uok diff --git a/docs/src/reference/resources/images/callouts/14.png b/docs/src/reference/resources/images/callouts/14.png deleted file mode 100644 index 64014b75fe2e84d45ed861974c72462727979360..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmV;M0c8G(P)!ax*-PXaQ9e~6^e1gu=a6a&KSz}bR`+prYG9ayB$BDjWGfIE;t#wl!+ zR3S(jA%y#i_@eOOedXoc%RQe%L;wH~k+s%ZI~)!<=dD%?4MaplaU9QPGski2q3`>r z(}{j@0a$CLl+)={2vLWml*i-oa5#J}DW$gCZB~Z!(!M#)2St|1_V^0qpmCrBof=Y&NUas@LmfSw=)4B4f;8Fu)(eFsv24 zJzXxBrayquXcR?J - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/15.gif b/docs/src/reference/resources/images/callouts/15.gif deleted file mode 100644 index 1c9183d5bb619eb608a5b7543f042ae7fd18684b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmZ?wbhEHbi7h7121rhDKRRXS|PKBUy%7g1c%!6qXjM*TZ@!<7MXS&a1%XU+t0{XE z)7O>#600De0j~t#c`vY#Yeb1-X-P(Y5yQ%LXFPyHJS9LOm(=3qqRfJl%=|nCVNOM5 zpg0#u+&RCXvM4h>ql94%{~0TwC?8m~C^ZqJRG}m@H-L1 z5L@scq?{XUcxG{OP9jig5ySQaTl#^*93bKF#G<^+ymW>G($Cs~V(bw8rA5i93}62@ zzlJGu&d<$F%`0K}c4pdspcorSSx9C{PAbEScbC)|7#JBmT^vIy=9Eq_Jl&Ka(%QdX zh{H8O%#_7)Tc@t$mM`p4(Ne7omR*~(>gd8_8AZH{=3ms$Fmzm^yL@_+(#aQQ5>7QW z>3g2fIsH(ugM)!V$x4Rr_+!J_XU%4xbz0aE;^N{m@42Z|@0S@TQ=WbP`TMV5Ok;<| z^Ihv+@6tQ{sciRF9dD7Nr=KobwJJ68zJK$<1Pd9rz%4O)*;}Jzj&~nTGMecz>B%lV zK|`fmIc8mp-h8iSXiGFW=C(L+XH4DRxZQX87^-dLuD>odo6YLT@Sw)dfBEIG)v2@6 zR)%mL7GRj1x-&v&+2q@A%a&h0`Lw7|#(w_!tgT!PoJ|+re`l - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/16.svg b/docs/src/reference/resources/images/callouts/16.svg deleted file mode 100644 index 01d6bf8164f..00000000000 --- a/docs/src/reference/resources/images/callouts/16.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/17.svg b/docs/src/reference/resources/images/callouts/17.svg deleted file mode 100644 index 0a04c5560eb..00000000000 --- a/docs/src/reference/resources/images/callouts/17.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/18.svg b/docs/src/reference/resources/images/callouts/18.svg deleted file mode 100644 index 1cb891b34dc..00000000000 --- a/docs/src/reference/resources/images/callouts/18.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/19.svg b/docs/src/reference/resources/images/callouts/19.svg deleted file mode 100644 index e6fbb179fc2..00000000000 --- a/docs/src/reference/resources/images/callouts/19.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/2.gif b/docs/src/reference/resources/images/callouts/2.gif deleted file mode 100644 index 94d42a30f99b87314127dcd44e6162c2fdf26e6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 907 zcmV;619bdHNk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0RaC1EC2ui01N;O000PR0RIW3lmh~U9GnCyi~#^ZiVzKBECdk3 z+PQbeAOMias9`B<6z_Eez=$EqJq^9piin`0%NY0OG(^zSrIK^CY9cU6@*c{UBiGy; h6C(zOhK&9(xaY7e*=hH)_rZeB4|imU1$R#1`!P>&$poQl;nzm}mD5ZFopaX|GsS%q*{P~< z;WtmO%lhToBL0i}yfkaOt?EN=nkLNGuU`ywhI5H)L`iUdT1k0gQ7VIjhO(w-Zen_> zZ(@38a<+nro{^q~f~BRtfrY+-p+a&|W^qZSLvCepNoKNMYO!8QX+eHoiC%Jk?!;Y+ zJAlS%fsM;d&r2*R1)67JkeZlkYGj#gX_9E3W@4U_nw*@Ln38B@k(iuhnUeN2e - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/20.svg b/docs/src/reference/resources/images/callouts/20.svg deleted file mode 100644 index ccbfd403193..00000000000 --- a/docs/src/reference/resources/images/callouts/20.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/21.svg b/docs/src/reference/resources/images/callouts/21.svg deleted file mode 100644 index 93ec53fdd99..00000000000 --- a/docs/src/reference/resources/images/callouts/21.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/22.svg b/docs/src/reference/resources/images/callouts/22.svg deleted file mode 100644 index f48c5f3fd1e..00000000000 --- a/docs/src/reference/resources/images/callouts/22.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/23.svg b/docs/src/reference/resources/images/callouts/23.svg deleted file mode 100644 index 66242129571..00000000000 --- a/docs/src/reference/resources/images/callouts/23.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/24.svg b/docs/src/reference/resources/images/callouts/24.svg deleted file mode 100644 index a3d552535ff..00000000000 --- a/docs/src/reference/resources/images/callouts/24.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/25.svg b/docs/src/reference/resources/images/callouts/25.svg deleted file mode 100644 index 56614a979a5..00000000000 --- a/docs/src/reference/resources/images/callouts/25.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/26.svg b/docs/src/reference/resources/images/callouts/26.svg deleted file mode 100644 index 56faeaca300..00000000000 --- a/docs/src/reference/resources/images/callouts/26.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/27.svg b/docs/src/reference/resources/images/callouts/27.svg deleted file mode 100644 index a75c8121595..00000000000 --- a/docs/src/reference/resources/images/callouts/27.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/28.svg b/docs/src/reference/resources/images/callouts/28.svg deleted file mode 100644 index 7f8cf1a3501..00000000000 --- a/docs/src/reference/resources/images/callouts/28.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/29.svg b/docs/src/reference/resources/images/callouts/29.svg deleted file mode 100644 index cb63adf1fe0..00000000000 --- a/docs/src/reference/resources/images/callouts/29.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/3.gif b/docs/src/reference/resources/images/callouts/3.gif deleted file mode 100644 index dd3541a1bc25307e41416082525903a2337a2a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 914 zcmV;D18w|ANk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0Ra90EC2ui01N;O000PY0R0K1lmh~U9GnCyi~#^ajvNR8#8?Ob zf;Vg4oI#N2j}ZU>bIu`v@NdmWMhq*as95r2jEElrv^r-ECIXlrbBwuXvSCUs9sxM3 o+a%2oj3IhTFJI8abOaK4? diff --git a/docs/src/reference/resources/images/callouts/3.png b/docs/src/reference/resources/images/callouts/3.png deleted file mode 100644 index ef7b70047158970cf4e09f1bab2954d39c2d596b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQF0kK0(Y1u|9Rc(19XFPiEBhjaDG}zd16s2gM)^$re|(qda7?? zdS-IAf{C7yo`r&?rM`iMzJZ}aa#3b+Nu@(>WpPPnvR-PjUP@^}eqM=Qa(?c_U5Yz^ z#%Y0#%S_KpEGY$=XJL?(l#*ybuErX#^g`ttQfwn - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/30.svg b/docs/src/reference/resources/images/callouts/30.svg deleted file mode 100644 index dc43ba1e3cc..00000000000 --- a/docs/src/reference/resources/images/callouts/30.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/4.gif b/docs/src/reference/resources/images/callouts/4.gif deleted file mode 100644 index 4bcbf7e31a17497e65fa0ccc9756961130be6ac7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 907 zcmV;619bdHNk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0Ra90EC2ui01N;O000PR0R0JUB_%})C8Y!^R05!33J3slENlos z$-g-bCAOjn;oL=vlo&Q_Rq7qahA}WS)N&5Oy^{bCs0?8;#XUwUV=^4`uV>FvD1lN0 h@RA}Ue>sMFTjNk+(xCuSC=|#k1_T5#jtUG206WA?slNaK diff --git a/docs/src/reference/resources/images/callouts/4.png b/docs/src/reference/resources/images/callouts/4.png deleted file mode 100644 index adb8364eb5d21ecdd4086e16110b62ddcb42aa4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQ3r>K)tuC)r#2`iJ>Prt42#Ndx#Uc~1)>aw z3jE@Q4|!9Z%lVv}- zc=48cF7H)t`(Ck`^+mtha~Np7bBSw2NpOBzNqJ&XDuaWDvZiNlVtT4?VtQtBwt|VC zk)DNurKP@sg}#BILUK`NaY>~^Ze?*vX0l#tv0h4PL4IC|UUGi!#9fLzfW~Qojmu2W zODrh`nrE42VU(7fm~5G9U~HM3l#*m_WNcxOXkuz - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/5.gif b/docs/src/reference/resources/images/callouts/5.gif deleted file mode 100644 index 1c62b4f920936c063c93d8551158a80500dfefbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 916 zcmV;F18e+8Nk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0Ra90EC2ui01N;O000Pa0R0K%lmi2V9E=1i%z+?9iV!If#8?O* z$G>+Nl>kWLuM~ia{}6l}$w(u}R?Y~C1P}wmM~j4%oa6KnflB}(2z_MquBJ%{T0T-b q_c4Y?mj9H5@J4B;zZ@S4y}MTm!bXY!5Uk{=&>tm+5)%px2mm_@=(0fo diff --git a/docs/src/reference/resources/images/callouts/5.png b/docs/src/reference/resources/images/callouts/5.png deleted file mode 100644 index 4d7eb460021e845981861d77614539314f553993..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQEX4g z+-vfUhb0A>b04=Im{6XiQd1v%r%>h0$G8U7E1If8OQ!N~xOYY5h0NDT$p9(iZ?Q&e z18-(+l~J8O`)kc}e&uL$eW&>P-#`~Qm$*ih1m~xflqVLYGB{``YkKA;rl!p+yCFkc(+@-h!Xq*<< zxXkpt#FA2=d1VEBsYynrsitN|Y01eJ$;p;U#>wWX2KP5v&I9V=1L+C? fTFYQ)RAFeOZJ=$?lDoSWD8u0C>gTe~DWM4f^}upZ diff --git a/docs/src/reference/resources/images/callouts/5.svg b/docs/src/reference/resources/images/callouts/5.svg deleted file mode 100644 index ca7a9f22f63..00000000000 --- a/docs/src/reference/resources/images/callouts/5.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/6.gif b/docs/src/reference/resources/images/callouts/6.gif deleted file mode 100644 index 23bc5555d2a467d6c3025d7f334a2b5546bd4fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmZ?wbhEHbqb0L)3{T$ zGFay|aIp&P&{^Zgxx_WmLz?s!{{N9Xg1xktx)&MH` BUFZM+ diff --git a/docs/src/reference/resources/images/callouts/6.png b/docs/src/reference/resources/images/callouts/6.png deleted file mode 100644 index 0ba694af6c07d947d219b45a629bd32c60a0f5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQ*)Bra@SU# zmiz#bR~{$s2si{S(aY|Z}Vd7tb ouUmn-_&~Y>fYve?8dVq?X&Y!8wB+ut1 - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/7.gif b/docs/src/reference/resources/images/callouts/7.gif deleted file mode 100644 index e55ce89585a8d5f80cc1a83df537578983a4d8e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 907 zcmV;619bdHNk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0Ra90EC2ui01N;O000PR0R0K9B_%})C9MQ1lmY=mLkJLZDAWR= z)xV4XtO1DOuNQ!iA2FPx2!IkvkhMI1%n<`504eucencSiqqSNt5uD8NPm0SJI6pGF hhrlHxe@Z^q3i>gHLLn}jDip{m2Lc2sjtUG206SSyt84%O diff --git a/docs/src/reference/resources/images/callouts/7.png b/docs/src/reference/resources/images/callouts/7.png deleted file mode 100644 index 472e96f8ac36862c5645732f2fff19d06ee11a8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQu%w%U~xZhnMEEs6JbBSw2NpOBzNqJ&XDuaWDvZiNlVtT4?VtQtBwt|VC zk)DNurKP@sg}#BILUK`NaY>~^Ze?*vX0l#tv0h4PL4IC|UUGi!#9fLzfW~Qojmu2W zODrh`nrCEbVQgk$XkwI@Y+{_8nv`N>YGIaQkz#0QY@Te9lBQ<)awbq0A4pdK&{_sV bqY6VKZ3AtCmfYR7Kp6&4S3j3^P6 - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/8.gif b/docs/src/reference/resources/images/callouts/8.gif deleted file mode 100644 index 49375e09f4cc6397837fbb494c6c3cb1bca7091b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 918 zcmV;H18Mw6Nk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0Ra90EC2ui01N;O000Pc0R0JUB_%}&DWwD|R0041gb)pLC=}AL zls9X=AOMKruT(=N_cWfH(~uHF0760{c(%ZJL2W6v;Y7A diff --git a/docs/src/reference/resources/images/callouts/8.png b/docs/src/reference/resources/images/callouts/8.png deleted file mode 100644 index 5e60973c213b37df93666c5a00724f34493974ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQu&S`V$cAh@R~F=4@V4jxkzlaQrcFYWK{)(`o5XZnut z=nE4SU2g1ZW%;@@I$>_e3F8a=8WK~|CVXt1DqisQxtIX|`YW_n&?Nh#1gQ}d)$LrYTw(_{nVG)tp2V+#}WG*e^KRLdkoLz7g? qn(IA84Qgo42`r6v<+Hvch>@C7(8A5T-G@yGywn*$#_oy diff --git a/docs/src/reference/resources/images/callouts/8.svg b/docs/src/reference/resources/images/callouts/8.svg deleted file mode 100644 index c1803a3c0d7..00000000000 --- a/docs/src/reference/resources/images/callouts/8.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/images/callouts/9.gif b/docs/src/reference/resources/images/callouts/9.gif deleted file mode 100644 index da12a4fe2825716c78f2d23c2f87afde98d3dd3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 923 zcmV;M17!S1Nk%w1VGIBa0O$Vz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW0Ra90EC2ui01N;O000Ph0R0JUB_%}&DXj!56aoMM1PBdtC{zLf zK`U$LN=5Y7s^J`O2r%5!(vT8G0Hrztu%;0}4h#+VfE3xQVaSFMdc8Y$u9i)PHW47O xMyX+pmO}1@Q1UNFLq`6b0%-N`-I|6e6vnXG5I_uX3jI-v0Rce_r~(5506VSIvSt7P diff --git a/docs/src/reference/resources/images/callouts/9.png b/docs/src/reference/resources/images/callouts/9.png deleted file mode 100644 index a0676d26cc2ff1de12c4ecdeefb44a0d71bc6bde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQNRqa;^5&H%t0&v*|C|wdb9$wI zR@+N9#RIowg@Uqn&z-__Tzhhz!sG|vTxA7?=O|Y?u(d4T{!RM9c7chr6d%1?R=i16 z?@Ic{f32YJFJnVhX)qGzOMplv!L->5yAlT#}irms+fsQd*FoSE84k zpF44v;trs3T43Wc)AJHbN`dAXo0u6Hr<$gkq?lM38ycjV7+5A5Sr{ayr5c%-n;95g pF*H#D>f!_G3IJNmU}#ifXryhRZP1dtyA~+J;OXk;vd$@?2>@J{cB%jX diff --git a/docs/src/reference/resources/images/callouts/9.svg b/docs/src/reference/resources/images/callouts/9.svg deleted file mode 100644 index bc149d3cb21..00000000000 --- a/docs/src/reference/resources/images/callouts/9.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/docs/src/reference/resources/xsl/html-custom.xsl b/docs/src/reference/resources/xsl/html-custom.xsl deleted file mode 100644 index 575267e3c75..00000000000 --- a/docs/src/reference/resources/xsl/html-custom.xsl +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - '5' - '1' - - - 1 - - - 1 - - - 1 - 0 - 1 - - - - images/admon/ - .png - - 120 - images/callouts/ - .png - - - css/manual.css - text/css - book toc,title - - text-align: left - - - - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Begin Google Analytics code - - - End Google Analytics code - - - - - Begin LoopFuse code - - - End LoopFuse code - - - \ No newline at end of file diff --git a/docs/src/reference/resources/xsl/html-single-custom.xsl b/docs/src/reference/resources/xsl/html-single-custom.xsl deleted file mode 100644 index 264d9a81f04..00000000000 --- a/docs/src/reference/resources/xsl/html-single-custom.xsl +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - 1 - - - 1 - - - 1 - 0 - 1 - - - - images/admon/ - .png - - 120 - images/callouts/ - .png - - - css/manual.css - text/css - book toc,title - - text-align: left - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Begin Google Analytics code - - -End Google Analytics code - - - - -Begin LoopFuse code - - -End LoopFuse code - - - \ No newline at end of file diff --git a/docs/src/reference/resources/xsl/pdf-custom.xsl b/docs/src/reference/resources/xsl/pdf-custom.xsl deleted file mode 100644 index e8a09a139fe..00000000000 --- a/docs/src/reference/resources/xsl/pdf-custom.xsl +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - - - - - - '1' - images/admon/ - .png - - - - - 24pt - - - - - - - - - - - - - - - - - - - - -5em - -5em - - - - - - book toc,title - - - - - - - - - - - - - - - - - please define productname in your docbook file! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - 1 - - - - - 0 - 0 - 0 - - - - false - - - 11 - 8 - - - 1.4 - - - - left - bold - - - pt - - - - - - - - - - - - - - - 0.8em - 0.8em - 0.8em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.6em - 0.6em - 0.6em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.4em - 0.4em - 0.4em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.3em - 0.3em - 0.3em - - - pt - - 0.1em - 0.1em - 0.1em - - - - - - - - 4pt - 4pt - 4pt - 4pt - - - - 0.1pt - 0.1pt - - - - - - - - - - - - - - - - - - pt - - - - - 1em - 1em - 1em - 0.1em - 0.1em - 0.1em - - #444444 - solid - 0.1pt - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - - - - 1 - - #F0F0F0 - - - - 0.1em - 0.1em - 0.1em - 0.1em - 0.1em - 0.1em - - - - 0.5em - 0.5em - 0.5em - 0.1em - 0.1em - 0.1em - always - - - - - - normal - italic - - - pt - - false - 0.1em - 0.1em - 0.1em - - - - - - 0 - 1 - - - 90 - - - - - - figure after - example after - equation before - table before - procedure before - - - - 1 - - 0pt - - - 3 - - - - - - - - - - - - - - - - true - - - diff --git a/gradle.properties b/gradle.properties index 0ed664faff9..331739fb844 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,43 +1 @@ -# 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. - - -# ------------------------------------------------------------------------------ -# version to be applied to all projects in this multi-project build. this is -# the one and only location version changes need to be made. -# ------------------------------------------------------------------------------ -springIntegrationVersion=2.1.0.BUILD-SNAPSHOT - -# ------------------------------------------------------------------------------ -# build system user roles -# role may be either 'developer' or 'buildmaster' -# ------------------------------------------------------------------------------ -role=developer - -# ------------------------------------------------------------------------------ -# for buildmasters: create a $HOME/.gradle/gradle.properties with the following -# properties. They'll be necessary uploading artifacts to s3, maven repos, and -# static.springframework.org. By placing them in your home directory, there's -# no need to change/check in this file. Remember that properties can also be -# specified at the gradle command line with -P, e.g.: -Prole=buildmaster -# ------------------------------------------------------------------------------ -# role = buildmaster # overrides default 'role = developer' above -# s3AccessKey= -# s3SecretAccessKey= -# docsHost=static.springsource.org -# remoteDocRoot=/var/www/domains/springframework.org/static/htdocs -# sshHost=static.springsource.org -# sshUsername= -# sshPrivateKey= +version=2.1.0.BUILD-SNAPSHOT diff --git a/gradlew b/gradlew index 04a4781a279..9826a9b5551 100755 --- a/gradlew +++ b/gradlew @@ -1,16 +1,16 @@ #!/bin/bash ############################################################################## -## ## -## Gradle wrapper script for UN*X ## -## ## +## +## Gradle start up script for UN*X +## ############################################################################## -# Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together. -# GRADLE_OPTS="$GRADLE_OPTS -Xmx512m" -# JAVA_OPTS="$JAVA_OPTS -Xmx512m" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" -GRADLE_APP_NAME=Gradle +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -42,54 +42,51 @@ case "`uname`" in ;; esac -# Attempt to set JAVA_HOME if it's not already set. -if [ -z "$JAVA_HOME" ] ; then - if $darwin ; then - [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home" - [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home" - else - javaExecutable="`which javac`" - [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME." - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME." - javaExecutable="`readlink -f \"$javaExecutable\"`" - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - export JAVA_HOME="$javaHome" - fi -fi - # For Cygwin, ensure paths are in UNIX format before anything is touched. if $cygwin ; then - [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` fi -STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain -CLASSPATH=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.jar -WRAPPER_PROPERTIES=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.properties +# 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/.wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. -if [ -z "$JAVACMD" ] ; then - 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 [ -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" + JAVACMD="$JAVA_HOME/bin/java" fi -fi -if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + 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 -if [ -z "$JAVA_HOME" ] ; then - warn "JAVA_HOME environment variable is not set" fi # Increase the maximum file descriptors if we can. @@ -108,15 +105,15 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then fi fi -# For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name +# For Darwin, add APP_NAME to the JAVA_OPTS as -Xdock:name if $darwin; then - JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME" + JAVA_OPTS="$JAVA_OPTS -Xdock:name=$APP_NAME" # we may also want to set -Xdock:image fi # For Cygwin, switch paths to Windows format before running java if $cygwin ; then - JAVA_HOME=`cygpath --path --mixed "$JAVA_HOME"` + APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` # We build the pattern for arguments to be converted via cygpath @@ -143,7 +140,7 @@ if $cygwin ; then eval `echo args$i`="\"$arg\"" fi i=$((i+1)) - done + done case $i in (0) set -- ;; (1) set -- "$args0" ;; @@ -158,11 +155,11 @@ if $cygwin ; then esac fi -GRADLE_APP_BASE_NAME=`basename "$0"` +# 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" $JAVA_OPTS $GRADLE_OPTS \ - -classpath "$CLASSPATH" \ - -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \ - -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \ - $STARTER_MAIN_CLASS \ - "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index b7108f8b12c..9b0bb6acda6 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,24 +1,37 @@ @if "%DEBUG%" == "" @echo off @rem ########################################################################## -@rem ## -@rem Gradle startup script for Windows ## -@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 Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together. -@rem set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m -@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512m +@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=.\ +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 -if not defined JAVA_HOME goto init +%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 @@ -29,14 +42,14 @@ 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. -echo. -goto end + +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 +if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -56,27 +69,22 @@ set CMD_LINE_ARGS=%$ :execute @rem Setup the command line -set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain -set CLASSPATH=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.jar -set WRAPPER_PROPERTIES=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.properties - -set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%" +set CLASSPATH=%APP_HOME%\.wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS% +"%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 -if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1 - +: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 "%ERRORLEVEL%" -exit /b "%ERRORLEVEL%" +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega \ No newline at end of file +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 76076b00067..00000000000 --- a/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration - 2.1.0.BUILD-SNAPSHOT - pom - Spring Integration - - spring-integration-amqp - spring-integration-core - spring-integration-event - spring-integration-feed - spring-integration-file - spring-integration-ftp - spring-integration-gemfire - spring-integration-groovy - spring-integration-http - spring-integration-ip - spring-integration-jdbc - spring-integration-jms - spring-integration-jmx - spring-integration-mail - spring-integration-mongodb - spring-integration-redis - spring-integration-rmi - spring-integration-scripting - spring-integration-security - spring-integration-sftp - spring-integration-stream - spring-integration-test - spring-integration-twitter - spring-integration-ws - spring-integration-xml - spring-integration-xmpp - - diff --git a/settings.gradle b/settings.gradle index dcf01a2a5ba..e5fc2d3a78d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,22 +1,5 @@ -/* - * 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. - */ - rootProject.name = 'spring-integration' -include 'docs' include 'spring-integration-amqp' include 'spring-integration-core' include 'spring-integration-event' diff --git a/spring-integration-amqp/pom.xml b/spring-integration-amqp/pom.xml deleted file mode 100644 index e7bf7600eb4..00000000000 --- a/spring-integration-amqp/pom.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-amqp - 2.1.0.BUILD-SNAPSHOT - Spring Integration AMQP Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - - - org.springframework.amqp - spring-rabbit - 1.0.0.RELEASE - compile - - - spring-context - org.springframework - - - spring-tx - org.springframework - - - spring-aop - org.springframework - - - spring-core - org.springframework - - - spring-beans - org.springframework - - - spring-oxm - org.springframework - - - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 - compile - true - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-amqp/template.mf b/spring-integration-amqp/template.mf deleted file mode 100644 index 7011237cb4e..00000000000 --- a/spring-integration-amqp/template.mf +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.amqp -Bundle-Name: Spring Integration AMQP Support -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.apache.commons.lang.*;version="[2.5.0, 3.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.springframework.amqp.*;version="[1.0.0, 2.0.0)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml deleted file mode 100644 index 74f0748e954..00000000000 --- a/spring-integration-core/pom.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - Spring Integration Core - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework - spring-aop - 3.0.7.RELEASE - compile - - - org.aspectj - aspectjweaver - 1.6.8 - test - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - true - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.codehaus.jackson - jackson-mapper-asl - 1.8.3 - compile - true - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - org.aspectj - aspectjrt - 1.6.8 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-core/template.mf b/spring-integration-core/template.mf deleted file mode 100644 index 300c9ffa693..00000000000 --- a/spring-integration-core/template.mf +++ /dev/null @@ -1,12 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration -Bundle-Name: Spring Integration Core -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.*;version="[3.0.5, 4.0.0)", - org.springframework.transaction;version="[3.0.5, 4.0.0)";resolution:=optional, - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.aopalliance.*;version="[1.0.0, 2.0.0)", - org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.w3c.dom.*;version="0" diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml deleted file mode 100644 index 53624ecad1a..00000000000 --- a/spring-integration-event/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-event - 2.1.0.BUILD-SNAPSHOT - Spring Integration Event Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-event/template.mf b/spring-integration-event/template.mf deleted file mode 100644 index 021323a9817..00000000000 --- a/spring-integration-event/template.mf +++ /dev/null @@ -1,13 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.event -Bundle-Name: Spring Integration ApplicationEvent Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.expression.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.w3c.dom.*;version="0" diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml deleted file mode 100644 index 8bd517a9952..00000000000 --- a/spring-integration-feed/pom.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-feed - 2.1.0.BUILD-SNAPSHOT - Spring Integration RSS Feed Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - net.java.dev.rome - rome-fetcher - 1.0.0 - compile - - - junit - junit - - - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - net.java.dev.rome - rome - 1.0.0 - compile - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-feed/template.mf b/spring-integration-feed/template.mf deleted file mode 100644 index 9d56cdca69c..00000000000 --- a/spring-integration-feed/template.mf +++ /dev/null @@ -1,18 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.feed -Bundle-Name: Spring Integration RSS Feed Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.apache.commons.lang.*;version="[2.5.0, 3.0.0)", - org.apache.commons.net.*;version="[2.0.0, 3.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - com.sun.syndication.*;version="[1.0.0, 2.0.0)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml deleted file mode 100644 index d27841206ce..00000000000 --- a/spring-integration-file/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - Spring Integration File Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-file/template.mf b/spring-integration-file/template.mf deleted file mode 100644 index 73f985f7961..00000000000 --- a/spring-integration-file/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.file -Bundle-Name: Spring Integration File Adapters -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.transaction.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.springframework.util.xml;version="[3.0.5, 4.0.0)", - org.w3c.dom.*;version="0" diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml deleted file mode 100644 index e2dffc3c771..00000000000 --- a/spring-integration-ftp/pom.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-ftp - 2.1.0.BUILD-SNAPSHOT - Spring Integration FTP Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context-support - 3.0.7.RELEASE - compile - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - commons-net - commons-net - 3.0.1 - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - javax.activation - activation - 1.1.1 - compile - true - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTests.java index c31cfccd05d..1b76c6312a1 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTests.java @@ -98,21 +98,26 @@ public String generateFileName(Message message) { @Test public void testHandleFileMessage() throws Exception { - File file = new File("remote-target-dir/template.mf.test"); - if (file.exists()){ - file.delete(); - } - assertFalse(file.exists()); - FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sessionFactory); - handler.setRemoteDirectoryExpression(new LiteralExpression("remote-target-dir")); - handler.setFileNameGenerator(new FileNameGenerator() { + File targetDir = new File("remote-target-dir"); + assertTrue("target directory does not exist: " + targetDir.getName(), targetDir.exists()); + + FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sessionFactory); + handler.setRemoteDirectoryExpression(new LiteralExpression(targetDir.getName())); + handler.setFileNameGenerator(new FileNameGenerator() { public String generateFileName(Message message) { return ((File)message.getPayload()).getName() + ".test"; } }); handler.afterPropertiesSet(); - handler.handleMessage(new GenericMessage(new File("template.mf"))); - assertTrue(file.exists()); + + File srcFile = File.createTempFile("testHandleFileMessage", ".tmp"); + srcFile.deleteOnExit(); + + File destFile = new File(targetDir, srcFile.getName() + ".test"); + destFile.deleteOnExit(); + + handler.handleMessage(new GenericMessage(srcFile)); + assertTrue("destination file was not created", destFile.exists()); } diff --git a/spring-integration-ftp/template.mf b/spring-integration-ftp/template.mf deleted file mode 100644 index 39b5d94ad11..00000000000 --- a/spring-integration-ftp/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.ftp -Bundle-Name: Spring Integration SFTP Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.apache.commons.net.*;version="[2.0.0, 3.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-gemfire/pom.xml b/spring-integration-gemfire/pom.xml deleted file mode 100644 index 5ffca355873..00000000000 --- a/spring-integration-gemfire/pom.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-gemfire - 2.1.0.BUILD-SNAPSHOT - Spring Integration GemFire Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - http://dist.gemstone.com/maven/release - http://dist.gemstone.com/maven/release/ - - - - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - - - org.springframework.data - spring-data-gemfire - 1.1.0.RELEASE - compile - - - spring-context-support - org.springframework - - - spring-tx - org.springframework - - - spring-core - org.springframework - - - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-gemfire/template.mf b/spring-integration-gemfire/template.mf deleted file mode 100644 index c471f224d7e..00000000000 --- a/spring-integration-gemfire/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.gemfire -Bundle-Name: Spring Integration GemFire Support -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.expression.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.springframework.data.gemfire.*;version="[1.0.1, 2.0.0)", - com.gemstone.gemfire.*;version="[6.5.1, 7.0.0)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml deleted file mode 100644 index 2da5a772425..00000000000 --- a/spring-integration-groovy/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-groovy - 2.1.0.BUILD-SNAPSHOT - Spring Integration Groovy Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context-support - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.codehaus.groovy - groovy-all - 1.8.5 - compile - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.springframework.integration - spring-integration-scripting - 2.1.0.BUILD-SNAPSHOT - compile - - - org.mockito - mockito-all - 1.9.0 - test - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-groovy/template.mf b/spring-integration-groovy/template.mf deleted file mode 100644 index fab9b236573..00000000000 --- a/spring-integration-groovy/template.mf +++ /dev/null @@ -1,11 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.groovy -Bundle-Name: Spring Integration Groovy Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.*;version="[3.0.5, 4.0.0)", - groovy.*;version="[1.7.3, 2.0.0)", - org.w3c.dom.*;version="0" diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml deleted file mode 100644 index 28fae3c4b12..00000000000 --- a/spring-integration-http/pom.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-http - 2.1.0.BUILD-SNAPSHOT - Spring Integration HTTP Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - net.java.dev.rome - rome-fetcher - 1.0.0 - compile - - - junit - junit - - - true - - - javax.servlet - servlet-api - 2.4 - provided - - - log4j - log4j - 1.2.12 - test - - - org.springframework - spring-webmvc - 3.0.7.RELEASE - compile - - - cglib - cglib-nodep - 2.2 - test - - - org.easymock - easymock - 2.3 - test - - - commons-httpclient - commons-httpclient - 3.1 - compile - - - junit - junit - - - true - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - net.java.dev.rome - rome - 1.0.0 - compile - true - - - - UTF8 - - diff --git a/spring-integration-http/template.mf b/spring-integration-http/template.mf deleted file mode 100644 index b9f9d8aa2aa..00000000000 --- a/spring-integration-http/template.mf +++ /dev/null @@ -1,20 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.http -Bundle-Name: Spring Integration HTTP Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context.*;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.expression.*;version="[3.0.5, 4.0.0)", - org.springframework.http.*;version="[3.0.5, 4.0.0)", - org.springframework.util.*;version="[3.0.5, 4.0.0)", - org.springframework.validation.*;version="[3.0.5, 4.0.0)", - org.springframework.web.*;version="[3.0.5, 4.0.0)";resolution:=optional, - org.apache.commons.httpclient.*;version="[3.0.5, 4.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, - javax.xml.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml deleted file mode 100644 index 1fcca80078f..00000000000 --- a/spring-integration-ip/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-ip - 2.1.0.BUILD-SNAPSHOT - Spring Integration IP Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - runtime - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-ip/template.mf b/spring-integration-ip/template.mf deleted file mode 100644 index eb90c7aa5c7..00000000000 --- a/spring-integration-ip/template.mf +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.ip -Bundle-Name: Spring Integration TCP/UDP Adapters -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.w3c.dom.*;version="0", - javax.net.*;version="0" diff --git a/spring-integration-jdbc/build.gradle b/spring-integration-jdbc/build.gradle index 9bbfcaa3230..124a1196f02 100644 --- a/spring-integration-jdbc/build.gradle +++ b/spring-integration-jdbc/build.gradle @@ -11,7 +11,6 @@ task generateSql { group = "Build" description = "Generates schema creation and drop scripts for supported databases." - repositories { mavenRepo urls: 'http://objectstyle.org/maven2/' } configurations { vpp } dependencies { vpp 'foundrylogic.vpp:vpp:2.2.1' } diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml deleted file mode 100644 index 24c65cf408a..00000000000 --- a/spring-integration-jdbc/pom.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-jdbc - 2.1.0.BUILD-SNAPSHOT - Spring Integration JDBC Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - http://objectstyle.org/maven2/ - http://objectstyle.org/maven2/ - - - - - org.springframework - spring-jdbc - 3.0.7.RELEASE - compile - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework - spring-aop - 3.0.7.RELEASE - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.aspectj - aspectjweaver - 1.6.8 - test - - - org.apache.derby - derby - 10.5.3.0_1 - test - - - com.h2database - h2 - 1.3.160 - test - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - hsqldb - hsqldb - 1.8.0.10 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - org.aspectj - aspectjrt - 1.6.8 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-jdbc/template.mf b/spring-integration-jdbc/template.mf deleted file mode 100644 index 4fd38578565..00000000000 --- a/spring-integration-jdbc/template.mf +++ /dev/null @@ -1,12 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.jdbc -Bundle-Name: Spring Integration JDBC Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.*;version="[3.0.5, 4.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.aopalliance.*;version="[1.0.0, 2.0.0)", - javax.sql.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml deleted file mode 100644 index 2a79de71a3e..00000000000 --- a/spring-integration-jms/pom.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-jms - 2.1.0.BUILD-SNAPSHOT - Spring Integration JMS Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.apache.activemq - activemq-core - 5.3.0 - test - - - spring-context - org.springframework - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1 - provided - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework - spring-oxm - 3.0.7.RELEASE - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - org.springframework - spring-jms - 3.0.7.RELEASE - compile - - - - UTF8 - - diff --git a/spring-integration-jms/template.mf b/spring-integration-jms/template.mf deleted file mode 100644 index 9e4c89103b2..00000000000 --- a/spring-integration-jms/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.jms -Bundle-Name: Spring Integration JMS Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.jms.*;version="[3.0.5, 4.0.0)", - org.springframework.transaction.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional, - org.w3c.dom.*;version="0" diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml deleted file mode 100644 index 4e8fcbf3791..00000000000 --- a/spring-integration-jmx/pom.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-jmx - 2.1.0.BUILD-SNAPSHOT - Spring Integration JMX Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.aspectj - aspectjweaver - 1.6.8 - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - org.aspectj - aspectjrt - 1.6.8 - compile - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-jmx/template.mf b/spring-integration-jmx/template.mf deleted file mode 100644 index b77f2318f96..00000000000 --- a/spring-integration-jmx/template.mf +++ /dev/null @@ -1,12 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.jmx -Bundle-Name: Spring Integration JMX Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.*;version="[3.0.5, 4.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.aopalliance.*;version="[1.0.0, 2.0.0)", - javax.management.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml deleted file mode 100644 index 012e76aee7f..00000000000 --- a/spring-integration-mail/pom.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-mail - 2.1.0.BUILD-SNAPSHOT - Spring Integration Mail Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context-support - 3.0.7.RELEASE - compile - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - javax.activation - activation - 1.1.1 - compile - true - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - javax.mail - mail - 1.4.4 - provided - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-mail/template.mf b/spring-integration-mail/template.mf deleted file mode 100644 index 383a8679540..00000000000 --- a/spring-integration-mail/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.mail -Bundle-Name: Spring Integration Mail Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.mail.*;version="[3.0.5, 4.0.0)", - org.springframework.util.*;version="[3.0.5, 4.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.mail.*;version="[1.4.0, 2.0.0)", - com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional, - org.w3c.dom.*;version="0" diff --git a/spring-integration-mongodb/pom.xml b/spring-integration-mongodb/pom.xml deleted file mode 100644 index c9020f2869d..00000000000 --- a/spring-integration-mongodb/pom.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-mongodb - 2.1.0.BUILD-SNAPSHOT - Spring Integration MongoDB Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - org.springframework.data - spring-data-mongodb - 1.0.0.RELEASE - compile - - - spring-context - org.springframework - - - spring-asm - org.springframework - - - spring-expression - org.springframework - - - spring-tx - org.springframework - - - spring-aop - org.springframework - - - spring-core - org.springframework - - - spring-beans - org.springframework - - - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-mongodb/template.mf b/spring-integration-mongodb/template.mf deleted file mode 100644 index adf546f98ad..00000000000 --- a/spring-integration-mongodb/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.mongodb -Bundle-Name: Spring Integration MongoDB Support -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.expression.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.springframework.data.document.mongodb.*;version="[1.0.0, 2.0.0)", - com.mongodb.*;version="[2.4.0, 2.5.0]", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-redis/pom.xml b/spring-integration-redis/pom.xml deleted file mode 100644 index d4215056d98..00000000000 --- a/spring-integration-redis/pom.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-redis - 2.1.0.BUILD-SNAPSHOT - Spring Integration Redis Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - - - org.codehaus.jackson - jackson-core-asl - 1.9.2 - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.springframework.data - spring-data-redis - 1.0.0.RELEASE - compile - - - spring-context-support - org.springframework - - - spring-tx - org.springframework - - - spring-core - org.springframework - - - spring-beans - org.springframework - - - - - org.easymock - easymockclassextension - 2.3 - test - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-redis/template.mf b/spring-integration-redis/template.mf deleted file mode 100644 index ce25bdaf378..00000000000 --- a/spring-integration-redis/template.mf +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.redis -Bundle-Name: Spring Integration Redis Support -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.expression.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.springframework.data.keyvalue.redis.*;version="[1.0.0, 2.0.0)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml deleted file mode 100644 index ab5aef47a8b..00000000000 --- a/spring-integration-rmi/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-rmi - 2.1.0.BUILD-SNAPSHOT - Spring Integration RMI Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework - spring-aop - 3.0.7.RELEASE - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-rmi/template.mf b/spring-integration-rmi/template.mf deleted file mode 100644 index a10c4f3e825..00000000000 --- a/spring-integration-rmi/template.mf +++ /dev/null @@ -1,14 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.rmi -Bundle-Name: Spring Integration RMI Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.remoting.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.w3c.dom.*;version="0" diff --git a/spring-integration-scripting/pom.xml b/spring-integration-scripting/pom.xml deleted file mode 100644 index f2c667ecd17..00000000000 --- a/spring-integration-scripting/pom.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-scripting - 2.1.0.BUILD-SNAPSHOT - Spring Integration Scripting Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.python - jython-standalone - 2.5.2 - test - - - org.jruby - jruby - 1.6.3 - test - - - org.easymock - easymock - 2.3 - test - - - org.codehaus.groovy - groovy-all - 1.8.5 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-scripting/template.mf b/spring-integration-scripting/template.mf deleted file mode 100644 index fe874990064..00000000000 --- a/spring-integration-scripting/template.mf +++ /dev/null @@ -1,11 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.scripting -Bundle-Name: Spring Integration Scripting Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.*;version="[3.0.5, 4.0.0)", - org.w3c.dom.*;version="0", - javax.script.*;version="0" diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml deleted file mode 100644 index 6afbdd6ef11..00000000000 --- a/spring-integration-security/pom.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-security - 2.1.0.BUILD-SNAPSHOT - Spring Integration Security Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework - spring-aop - 3.0.7.RELEASE - compile - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-tx - 3.0.7.RELEASE - compile - - - org.springframework.security - spring-security-config - 3.1.0.RELEASE - compile - - - spring-support - org.springframework - - - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - org.springframework.security - spring-security-core - 3.1.0.RELEASE - compile - - - spring-support - org.springframework - - - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-security/template.mf b/spring-integration-security/template.mf deleted file mode 100644 index 9215dacb466..00000000000 --- a/spring-integration-security/template.mf +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.security -Bundle-Name: Spring Integration Security Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.aopalliance.*;version="[1.0.0, 2.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.aop.*;version="[3.0.5, 4.0.0)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.core;version="[3.0.5, 4.0.0)", - org.springframework.util.*;version="[3.0.5, 4.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.security.*;version="[3.0.3, 4.0.0)", - org.w3c.dom.*;version="0" diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml deleted file mode 100644 index 607ccafc3c6..00000000000 --- a/spring-integration-sftp/pom.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-sftp - 2.1.0.BUILD-SNAPSHOT - Spring Integration SFTP Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context-support - 3.0.7.RELEASE - compile - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - javax.activation - activation - 1.1.1 - compile - true - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - com.jcraft - jsch - 0.1.45 - compile - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java index d52cc27f36c..b39928d7f38 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java @@ -52,19 +52,24 @@ public class SftpSendingMessageHandlerTests { @Test public void testHandleFileMessage() throws Exception { - File file = new File("remote-target-dir", "template.mf.test"); - if (file.exists()){ - file.delete(); - } - SessionFactory sessionFactory = new TestSftpSessionFactory(); - FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sessionFactory); + File targetDir = new File("remote-target-dir"); + assertTrue("target directory does not exist: " + targetDir.getName(), targetDir.exists()); + + SessionFactory sessionFactory = new TestSftpSessionFactory(); + FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sessionFactory); + handler.setRemoteDirectoryExpression(new LiteralExpression(targetDir.getName())); DefaultFileNameGenerator fGenerator = new DefaultFileNameGenerator(); fGenerator.setExpression("payload + '.test'"); handler.setFileNameGenerator(fGenerator); - handler.setRemoteDirectoryExpression(new LiteralExpression("remote-target-dir")); - handler.handleMessage(new GenericMessage(new File("template.mf"))); - assertTrue(new File("remote-target-dir", "template.mf.test").exists()); + File srcFile = File.createTempFile("testHandleFileMessage", ".tmp", new File(".")); + srcFile.deleteOnExit(); + + File destFile = new File(targetDir, srcFile.getName() + ".test"); + destFile.deleteOnExit(); + + handler.handleMessage(new GenericMessage(srcFile)); + assertTrue("destination file was not created", destFile.exists()); } @Test diff --git a/spring-integration-sftp/template.mf b/spring-integration-sftp/template.mf deleted file mode 100644 index c8049cdf7ce..00000000000 --- a/spring-integration-sftp/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.sftp -Bundle-Name: Spring Integration SFTP Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - com.jcraft.jsch.*;version="[0.1.41, 0.1.50)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml deleted file mode 100644 index 3daf266a7e2..00000000000 --- a/spring-integration-stream/pom.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - Spring Integration Stream Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-stream/template.mf b/spring-integration-stream/template.mf deleted file mode 100644 index 2b936809195..00000000000 --- a/spring-integration-stream/template.mf +++ /dev/null @@ -1,11 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.stream -Bundle-Name: Spring Integration Stream Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.w3c.dom.*;version="0" diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml deleted file mode 100644 index b7ebca3badf..00000000000 --- a/spring-integration-test/pom.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - Spring Integration Test Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-test - 3.0.7.RELEASE - compile - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - compile - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - junit - junit-dep - 4.8.2 - compile - - - - UTF8 - - diff --git a/spring-integration-test/template.mf b/spring-integration-test/template.mf deleted file mode 100644 index 724a965a047..00000000000 --- a/spring-integration-test/template.mf +++ /dev/null @@ -1,14 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.test -Bundle-Name: Spring Integration Test Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.tools.ant.*;version="[1.7.0, 2.0.0)", - org.springframework.*;version="[3.0.5, 4.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - junit.framework.*;version="[4.6.0, 4.7.0)", - org.junit.*;version="[4.6.0, 4.7.0)", - org.mockito.*;version="[1.6.0, 2.0.0)", - org.hamcrest.*;version="[1.1.0, 1.1.0]", - org.objenesis.*;version="[1.0.0, 2.0.0)" diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml deleted file mode 100644 index 3d6583d570c..00000000000 --- a/spring-integration-twitter/pom.xml +++ /dev/null @@ -1,204 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-twitter - 2.1.0.BUILD-SNAPSHOT - Spring Integration Twitter Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-web - 3.0.7.RELEASE - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - javax.activation - activation - 1.1.1 - compile - true - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - org.springframework.social - spring-social-twitter - 1.0.1.RELEASE - compile - - - spring-context - org.springframework - - - spring-asm - org.springframework - - - spring-web - org.springframework - - - spring-expression - org.springframework - - - spring-aop - org.springframework - - - spring-core - org.springframework - - - spring-beans - org.springframework - - - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-twitter/template.mf b/spring-integration-twitter/template.mf deleted file mode 100644 index 15d3972f2ec..00000000000 --- a/spring-integration-twitter/template.mf +++ /dev/null @@ -1,20 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.twitter -Bundle-Name: Spring Integration Twitter Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.aopalliance.*;version="[1.0.0, 2.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.aop.*;version="[3.0.5, 4.0.0)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.social.*;version="[1.0.0, 1.1.0)", - org.springframework.security.crypto.*;version="[3.1.0, 3.2.0)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml deleted file mode 100644 index 6eb0a6f064e..00000000000 --- a/spring-integration-ws/pom.xml +++ /dev/null @@ -1,232 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-ws - 2.1.0.BUILD-SNAPSHOT - Spring Integration Web Services Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - com.sun.xml.messaging.saaj - saaj-impl - 1.3 - compile - true - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-web - 3.0.7.RELEASE - compile - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - xstream - xstream - 1.2.2 - test - - - javax.xml.soap - saaj-api - 1.3 - compile - - - activation - javax.activation - - - true - - - org.springframework.ws - spring-ws-core - 2.0.3.RELEASE - compile - - - spring-web - org.springframework - - - spring-webmvc - org.springframework - - - spring-context-support - org.springframework - - - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - stax - stax-api - 1.0.1 - test - - - javax.activation - activation - 1.1.1 - compile - true - - - org.springframework - spring-oxm - 3.0.7.RELEASE - compile - - - org.springframework - spring-expression - 3.0.7.RELEASE - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-ws/template.mf b/spring-integration-ws/template.mf deleted file mode 100644 index 9604a19f4d7..00000000000 --- a/spring-integration-ws/template.mf +++ /dev/null @@ -1,18 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.ws -Bundle-Name: Spring Integration Web Services Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.expression;version="[3.0.5, 4.0.0)", - org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.springframework.oxm;version="[1.5.9, 3.1.0)", - org.springframework.ws.*;version="[2.0.0, 2.1.0)", - org.springframework.xml.*;version="[1.5.9, 2.1.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.w3c.dom.*;version="0", - javax.xml.*;version="0" diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml deleted file mode 100644 index 4f9fcfb1965..00000000000 --- a/spring-integration-xml/pom.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-xml - 2.1.0.BUILD-SNAPSHOT - Spring Integration XML Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - xmlunit - xmlunit - 1.3 - test - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.springframework - spring-context - 3.0.7.RELEASE - compile - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework.ws - spring-xml - 2.0.3.RELEASE - compile - - - spring-core - org.springframework - - - spring-beans - org.springframework - - - - - javax.activation - activation - 1.1.1 - compile - true - - - org.springframework - spring-oxm - 3.0.7.RELEASE - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.9.0 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-xml/template.mf b/spring-integration-xml/template.mf deleted file mode 100644 index 0bbc25fd1c3..00000000000 --- a/spring-integration-xml/template.mf +++ /dev/null @@ -1,18 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.xml -Bundle-Name: Spring Integration XML Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.context.expression.*;version="[3.0.5, 4.0.0)", - org.springframework.expression.*;version="[3.0.5, 4.0.0)", - org.springframework.util.*;version="[3.0.5, 4.0.0)", - org.springframework.oxm;version="[1.5.9, 3.1.0)";resolution:=optional, - org.springframework.xml.*;version="[1.5.9, 2.1.0)", - org.apache.commons.logging.*;version="[1.0, 2.0)", - org.w3c.dom.*;version="0", - org.xml.sax.*;version="0", - javax.xml.*;version="0" diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml deleted file mode 100644 index 5e04c238f58..00000000000 --- a/spring-integration-xmpp/pom.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-xmpp - 2.1.0.BUILD-SNAPSHOT - Spring Integration XMPP Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ - - - SpringSource Milestone Repository - http://maven.springframework.org/milestone/ - - - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ - - - - - org.springframework - spring-context-support - 3.0.7.RELEASE - compile - - - org.springframework - spring-test - 3.0.7.RELEASE - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - cglib - cglib-nodep - 2.2 - test - - - log4j - log4j - 1.2.12 - test - - - org.igniterealtime.smack - smackx - 3.2.1 - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - javax.activation - activation - 1.1.1 - compile - true - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - test - - - org.mockito - mockito-all - 1.9.0 - test - - - org.igniterealtime.smack - smack - 3.2.1 - compile - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-xmpp/template.mf b/spring-integration-xmpp/template.mf deleted file mode 100644 index 62627b63f7b..00000000000 --- a/spring-integration-xmpp/template.mf +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.xmpp -Bundle-Name: Spring Integration XMPP Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.0.5, 4.0.0)", - org.springframework.context;version="[3.0.5, 4.0.0)", - org.springframework.core.*;version="[3.0.5, 4.0.0)", - org.springframework.util;version="[3.0.5, 4.0.0)", - org.jivesoftware.*;version="[3.0.5, 4.0.0)", - javax.*;version="0", - org.w3c.dom.*;version="0" diff --git a/docs/src/api/doc-files/th-background.png b/src/api/doc-files/th-background.png similarity index 100% rename from docs/src/api/doc-files/th-background.png rename to src/api/doc-files/th-background.png diff --git a/docs/src/api/overview.html b/src/api/overview.html similarity index 89% rename from docs/src/api/overview.html rename to src/api/overview.html index bff49987f68..fb0198ba995 100644 --- a/docs/src/api/overview.html +++ b/src/api/overview.html @@ -14,7 +14,8 @@

If you are interested in commercial training, consultancy, and - support for Spring Integration, please visit + support for Spring Integration, please visit + http://www.springsource.com

diff --git a/docs/src/api/spring-javadoc.css b/src/api/spring-javadoc.css similarity index 100% rename from docs/src/api/spring-javadoc.css rename to src/api/spring-javadoc.css diff --git a/docs/src/info/changelog.txt b/src/dist/changelog.txt similarity index 100% rename from docs/src/info/changelog.txt rename to src/dist/changelog.txt diff --git a/docs/src/info/license.txt b/src/dist/license.txt similarity index 100% rename from docs/src/info/license.txt rename to src/dist/license.txt diff --git a/docs/src/info/notice.txt b/src/dist/notice.txt similarity index 100% rename from docs/src/info/notice.txt rename to src/dist/notice.txt diff --git a/src/dist/readme.txt b/src/dist/readme.txt new file mode 100644 index 00000000000..3e275792826 --- /dev/null +++ b/src/dist/readme.txt @@ -0,0 +1,13 @@ +SPRING INTEGRATION 2.1.0 Release Candidate 2 +----------------------------------------------------------- + +To find out what has changed since any earlier releases, see 'changelog.txt'. + +Please consult the documentation located within the 'docs/reference' directory +of this release and also visit the official Spring Integration home at +http://www.springsource.org/spring-integration + +There you will find links to the forum, issue tracker, and several other resources. + +See https://github.com/SpringSource/spring-integration#readme for additional +information including instructions on building from source. diff --git a/docs/src/reference/docbook/aggregator.xml b/src/reference/docbook/aggregator.xml similarity index 100% rename from docs/src/reference/docbook/aggregator.xml rename to src/reference/docbook/aggregator.xml diff --git a/docs/src/reference/docbook/amqp.xml b/src/reference/docbook/amqp.xml similarity index 100% rename from docs/src/reference/docbook/amqp.xml rename to src/reference/docbook/amqp.xml diff --git a/docs/src/reference/docbook/bridge.xml b/src/reference/docbook/bridge.xml similarity index 100% rename from docs/src/reference/docbook/bridge.xml rename to src/reference/docbook/bridge.xml diff --git a/docs/src/reference/docbook/chain.xml b/src/reference/docbook/chain.xml similarity index 100% rename from docs/src/reference/docbook/chain.xml rename to src/reference/docbook/chain.xml diff --git a/docs/src/reference/docbook/changes-1.0-2.0.xml b/src/reference/docbook/changes-1.0-2.0.xml similarity index 100% rename from docs/src/reference/docbook/changes-1.0-2.0.xml rename to src/reference/docbook/changes-1.0-2.0.xml diff --git a/docs/src/reference/docbook/changes-2.0-2.1.xml b/src/reference/docbook/changes-2.0-2.1.xml similarity index 100% rename from docs/src/reference/docbook/changes-2.0-2.1.xml rename to src/reference/docbook/changes-2.0-2.1.xml diff --git a/docs/src/reference/docbook/channel-adapter.xml b/src/reference/docbook/channel-adapter.xml similarity index 100% rename from docs/src/reference/docbook/channel-adapter.xml rename to src/reference/docbook/channel-adapter.xml diff --git a/docs/src/reference/docbook/channel.xml b/src/reference/docbook/channel.xml similarity index 100% rename from docs/src/reference/docbook/channel.xml rename to src/reference/docbook/channel.xml diff --git a/docs/src/reference/docbook/claim-check.xml b/src/reference/docbook/claim-check.xml similarity index 100% rename from docs/src/reference/docbook/claim-check.xml rename to src/reference/docbook/claim-check.xml diff --git a/docs/src/reference/docbook/configuration.xml b/src/reference/docbook/configuration.xml similarity index 100% rename from docs/src/reference/docbook/configuration.xml rename to src/reference/docbook/configuration.xml diff --git a/docs/src/reference/docbook/content-enrichment.xml b/src/reference/docbook/content-enrichment.xml similarity index 100% rename from docs/src/reference/docbook/content-enrichment.xml rename to src/reference/docbook/content-enrichment.xml diff --git a/docs/src/reference/docbook/control-bus.xml b/src/reference/docbook/control-bus.xml similarity index 100% rename from docs/src/reference/docbook/control-bus.xml rename to src/reference/docbook/control-bus.xml diff --git a/docs/src/reference/docbook/delayer.xml b/src/reference/docbook/delayer.xml similarity index 100% rename from docs/src/reference/docbook/delayer.xml rename to src/reference/docbook/delayer.xml diff --git a/docs/src/reference/docbook/endpoint.xml b/src/reference/docbook/endpoint.xml similarity index 100% rename from docs/src/reference/docbook/endpoint.xml rename to src/reference/docbook/endpoint.xml diff --git a/docs/src/reference/docbook/event.xml b/src/reference/docbook/event.xml similarity index 100% rename from docs/src/reference/docbook/event.xml rename to src/reference/docbook/event.xml diff --git a/docs/src/reference/docbook/feed.xml b/src/reference/docbook/feed.xml similarity index 100% rename from docs/src/reference/docbook/feed.xml rename to src/reference/docbook/feed.xml diff --git a/docs/src/reference/docbook/file.xml b/src/reference/docbook/file.xml similarity index 100% rename from docs/src/reference/docbook/file.xml rename to src/reference/docbook/file.xml diff --git a/docs/src/reference/docbook/filter.xml b/src/reference/docbook/filter.xml similarity index 100% rename from docs/src/reference/docbook/filter.xml rename to src/reference/docbook/filter.xml diff --git a/docs/src/reference/docbook/ftp.xml b/src/reference/docbook/ftp.xml similarity index 100% rename from docs/src/reference/docbook/ftp.xml rename to src/reference/docbook/ftp.xml diff --git a/docs/src/reference/docbook/gateway.xml b/src/reference/docbook/gateway.xml similarity index 100% rename from docs/src/reference/docbook/gateway.xml rename to src/reference/docbook/gateway.xml diff --git a/docs/src/reference/docbook/gemfire.xml b/src/reference/docbook/gemfire.xml similarity index 100% rename from docs/src/reference/docbook/gemfire.xml rename to src/reference/docbook/gemfire.xml diff --git a/docs/src/reference/docbook/groovy.xml b/src/reference/docbook/groovy.xml similarity index 100% rename from docs/src/reference/docbook/groovy.xml rename to src/reference/docbook/groovy.xml diff --git a/docs/src/reference/docbook/history.xml b/src/reference/docbook/history.xml similarity index 100% rename from docs/src/reference/docbook/history.xml rename to src/reference/docbook/history.xml diff --git a/docs/src/reference/docbook/http.xml b/src/reference/docbook/http.xml similarity index 100% rename from docs/src/reference/docbook/http.xml rename to src/reference/docbook/http.xml diff --git a/docs/src/reference/resources/images/bank-router.jpg b/src/reference/docbook/images/bank-router.jpg similarity index 100% rename from docs/src/reference/resources/images/bank-router.jpg rename to src/reference/docbook/images/bank-router.jpg diff --git a/docs/src/reference/resources/images/cafe-eip.png b/src/reference/docbook/images/cafe-eip.png similarity index 100% rename from docs/src/reference/resources/images/cafe-eip.png rename to src/reference/docbook/images/cafe-eip.png diff --git a/docs/src/reference/resources/images/chain.png b/src/reference/docbook/images/chain.png similarity index 100% rename from docs/src/reference/resources/images/chain.png rename to src/reference/docbook/images/chain.png diff --git a/docs/src/reference/resources/images/channel.jpg b/src/reference/docbook/images/channel.jpg similarity index 100% rename from docs/src/reference/resources/images/channel.jpg rename to src/reference/docbook/images/channel.jpg diff --git a/docs/src/reference/resources/images/gateway.jpg b/src/reference/docbook/images/gateway.jpg similarity index 100% rename from docs/src/reference/resources/images/gateway.jpg rename to src/reference/docbook/images/gateway.jpg diff --git a/docs/src/reference/resources/images/handler-endpoint.jpg b/src/reference/docbook/images/handler-endpoint.jpg similarity index 100% rename from docs/src/reference/resources/images/handler-endpoint.jpg rename to src/reference/docbook/images/handler-endpoint.jpg diff --git a/docs/src/reference/resources/images/loan-broker-eip.png b/src/reference/docbook/images/loan-broker-eip.png similarity index 100% rename from docs/src/reference/resources/images/loan-broker-eip.png rename to src/reference/docbook/images/loan-broker-eip.png diff --git a/docs/src/reference/resources/images/logo.png b/src/reference/docbook/images/logo.png similarity index 100% rename from docs/src/reference/resources/images/logo.png rename to src/reference/docbook/images/logo.png diff --git a/docs/src/reference/resources/images/message.jpg b/src/reference/docbook/images/message.jpg similarity index 100% rename from docs/src/reference/resources/images/message.jpg rename to src/reference/docbook/images/message.jpg diff --git a/docs/src/reference/resources/images/quotes-aggregator.jpg b/src/reference/docbook/images/quotes-aggregator.jpg similarity index 100% rename from docs/src/reference/resources/images/quotes-aggregator.jpg rename to src/reference/docbook/images/quotes-aggregator.jpg diff --git a/docs/src/reference/resources/images/router.jpg b/src/reference/docbook/images/router.jpg similarity index 100% rename from docs/src/reference/resources/images/router.jpg rename to src/reference/docbook/images/router.jpg diff --git a/docs/src/reference/resources/images/source-endpoint.jpg b/src/reference/docbook/images/source-endpoint.jpg similarity index 100% rename from docs/src/reference/resources/images/source-endpoint.jpg rename to src/reference/docbook/images/source-endpoint.jpg diff --git a/docs/src/reference/resources/images/spring-integration-amqp-sample-graph.png b/src/reference/docbook/images/spring-integration-amqp-sample-graph.png similarity index 100% rename from docs/src/reference/resources/images/spring-integration-amqp-sample-graph.png rename to src/reference/docbook/images/spring-integration-amqp-sample-graph.png diff --git a/docs/src/reference/resources/images/target-endpoint.jpg b/src/reference/docbook/images/target-endpoint.jpg similarity index 100% rename from docs/src/reference/resources/images/target-endpoint.jpg rename to src/reference/docbook/images/target-endpoint.jpg diff --git a/docs/src/reference/resources/images/tickmark.png b/src/reference/docbook/images/tickmark.png similarity index 100% rename from docs/src/reference/resources/images/tickmark.png rename to src/reference/docbook/images/tickmark.png diff --git a/docs/src/reference/docbook/index.xml b/src/reference/docbook/index.xml similarity index 100% rename from docs/src/reference/docbook/index.xml rename to src/reference/docbook/index.xml diff --git a/docs/src/reference/docbook/ip.xml b/src/reference/docbook/ip.xml similarity index 100% rename from docs/src/reference/docbook/ip.xml rename to src/reference/docbook/ip.xml diff --git a/docs/src/reference/docbook/jdbc.xml b/src/reference/docbook/jdbc.xml similarity index 100% rename from docs/src/reference/docbook/jdbc.xml rename to src/reference/docbook/jdbc.xml diff --git a/docs/src/reference/docbook/jms.xml b/src/reference/docbook/jms.xml similarity index 100% rename from docs/src/reference/docbook/jms.xml rename to src/reference/docbook/jms.xml diff --git a/docs/src/reference/docbook/jmx.xml b/src/reference/docbook/jmx.xml similarity index 100% rename from docs/src/reference/docbook/jmx.xml rename to src/reference/docbook/jmx.xml diff --git a/docs/src/reference/docbook/mail.xml b/src/reference/docbook/mail.xml similarity index 100% rename from docs/src/reference/docbook/mail.xml rename to src/reference/docbook/mail.xml diff --git a/docs/src/reference/docbook/message-construction.xml b/src/reference/docbook/message-construction.xml similarity index 100% rename from docs/src/reference/docbook/message-construction.xml rename to src/reference/docbook/message-construction.xml diff --git a/docs/src/reference/docbook/message-history.xml b/src/reference/docbook/message-history.xml similarity index 100% rename from docs/src/reference/docbook/message-history.xml rename to src/reference/docbook/message-history.xml diff --git a/docs/src/reference/docbook/message-publishing.xml b/src/reference/docbook/message-publishing.xml similarity index 100% rename from docs/src/reference/docbook/message-publishing.xml rename to src/reference/docbook/message-publishing.xml diff --git a/docs/src/reference/docbook/message-routing.xml b/src/reference/docbook/message-routing.xml similarity index 100% rename from docs/src/reference/docbook/message-routing.xml rename to src/reference/docbook/message-routing.xml diff --git a/docs/src/reference/docbook/message-store.xml b/src/reference/docbook/message-store.xml similarity index 100% rename from docs/src/reference/docbook/message-store.xml rename to src/reference/docbook/message-store.xml diff --git a/docs/src/reference/docbook/message-transformation.xml b/src/reference/docbook/message-transformation.xml similarity index 100% rename from docs/src/reference/docbook/message-transformation.xml rename to src/reference/docbook/message-transformation.xml diff --git a/docs/src/reference/docbook/message.xml b/src/reference/docbook/message.xml similarity index 100% rename from docs/src/reference/docbook/message.xml rename to src/reference/docbook/message.xml diff --git a/docs/src/reference/docbook/messaging-channels.xml b/src/reference/docbook/messaging-channels.xml similarity index 100% rename from docs/src/reference/docbook/messaging-channels.xml rename to src/reference/docbook/messaging-channels.xml diff --git a/docs/src/reference/docbook/messaging-endpoints.xml b/src/reference/docbook/messaging-endpoints.xml similarity index 100% rename from docs/src/reference/docbook/messaging-endpoints.xml rename to src/reference/docbook/messaging-endpoints.xml diff --git a/docs/src/reference/docbook/mongodb.xml b/src/reference/docbook/mongodb.xml similarity index 100% rename from docs/src/reference/docbook/mongodb.xml rename to src/reference/docbook/mongodb.xml diff --git a/docs/src/reference/docbook/overview.xml b/src/reference/docbook/overview.xml similarity index 100% rename from docs/src/reference/docbook/overview.xml rename to src/reference/docbook/overview.xml diff --git a/docs/src/reference/docbook/preface.xml b/src/reference/docbook/preface.xml similarity index 100% rename from docs/src/reference/docbook/preface.xml rename to src/reference/docbook/preface.xml diff --git a/docs/src/reference/docbook/redis.xml b/src/reference/docbook/redis.xml similarity index 100% rename from docs/src/reference/docbook/redis.xml rename to src/reference/docbook/redis.xml diff --git a/docs/src/reference/docbook/resequencer.xml b/src/reference/docbook/resequencer.xml similarity index 100% rename from docs/src/reference/docbook/resequencer.xml rename to src/reference/docbook/resequencer.xml diff --git a/docs/src/reference/docbook/resource.xml b/src/reference/docbook/resource.xml similarity index 100% rename from docs/src/reference/docbook/resource.xml rename to src/reference/docbook/resource.xml diff --git a/docs/src/reference/docbook/resources.xml b/src/reference/docbook/resources.xml similarity index 100% rename from docs/src/reference/docbook/resources.xml rename to src/reference/docbook/resources.xml diff --git a/docs/src/reference/docbook/rmi.xml b/src/reference/docbook/rmi.xml similarity index 100% rename from docs/src/reference/docbook/rmi.xml rename to src/reference/docbook/rmi.xml diff --git a/docs/src/reference/docbook/router.xml b/src/reference/docbook/router.xml similarity index 100% rename from docs/src/reference/docbook/router.xml rename to src/reference/docbook/router.xml diff --git a/docs/src/reference/docbook/samples.xml b/src/reference/docbook/samples.xml similarity index 100% rename from docs/src/reference/docbook/samples.xml rename to src/reference/docbook/samples.xml diff --git a/docs/src/reference/docbook/scripting.xml b/src/reference/docbook/scripting.xml similarity index 100% rename from docs/src/reference/docbook/scripting.xml rename to src/reference/docbook/scripting.xml diff --git a/docs/src/reference/docbook/security.xml b/src/reference/docbook/security.xml similarity index 100% rename from docs/src/reference/docbook/security.xml rename to src/reference/docbook/security.xml diff --git a/docs/src/reference/docbook/service-activator.xml b/src/reference/docbook/service-activator.xml similarity index 100% rename from docs/src/reference/docbook/service-activator.xml rename to src/reference/docbook/service-activator.xml diff --git a/docs/src/reference/docbook/sftp.xml b/src/reference/docbook/sftp.xml similarity index 100% rename from docs/src/reference/docbook/sftp.xml rename to src/reference/docbook/sftp.xml diff --git a/docs/src/reference/docbook/splitter.xml b/src/reference/docbook/splitter.xml similarity index 100% rename from docs/src/reference/docbook/splitter.xml rename to src/reference/docbook/splitter.xml diff --git a/docs/src/reference/docbook/stream.xml b/src/reference/docbook/stream.xml similarity index 100% rename from docs/src/reference/docbook/stream.xml rename to src/reference/docbook/stream.xml diff --git a/docs/src/reference/docbook/system-management.xml b/src/reference/docbook/system-management.xml similarity index 100% rename from docs/src/reference/docbook/system-management.xml rename to src/reference/docbook/system-management.xml diff --git a/docs/src/reference/docbook/transactions.xml b/src/reference/docbook/transactions.xml similarity index 100% rename from docs/src/reference/docbook/transactions.xml rename to src/reference/docbook/transactions.xml diff --git a/docs/src/reference/docbook/transformer.xml b/src/reference/docbook/transformer.xml similarity index 100% rename from docs/src/reference/docbook/transformer.xml rename to src/reference/docbook/transformer.xml diff --git a/docs/src/reference/docbook/twitter.xml b/src/reference/docbook/twitter.xml similarity index 100% rename from docs/src/reference/docbook/twitter.xml rename to src/reference/docbook/twitter.xml diff --git a/docs/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml similarity index 100% rename from docs/src/reference/docbook/whats-new.xml rename to src/reference/docbook/whats-new.xml diff --git a/docs/src/reference/docbook/ws.xml b/src/reference/docbook/ws.xml similarity index 100% rename from docs/src/reference/docbook/ws.xml rename to src/reference/docbook/ws.xml diff --git a/docs/src/reference/docbook/xml.xml b/src/reference/docbook/xml.xml similarity index 100% rename from docs/src/reference/docbook/xml.xml rename to src/reference/docbook/xml.xml diff --git a/docs/src/reference/docbook/xmpp.xml b/src/reference/docbook/xmpp.xml similarity index 100% rename from docs/src/reference/docbook/xmpp.xml rename to src/reference/docbook/xmpp.xml