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 00000000000..7073cdeb2b7 Binary files /dev/null and b/.wrapper/gradle-wrapper.jar differ 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 5b7809ca4a9..00000000000 Binary files a/docs/src/reference/resources/images/admon/caution.png and /dev/null differ 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 12c90f607a1..00000000000 Binary files a/docs/src/reference/resources/images/admon/important.png and /dev/null differ 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 5a4e5cb1893..00000000000 Binary files a/docs/src/reference/resources/images/admon/note-spr.jpg and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/note.png b/docs/src/reference/resources/images/admon/note.png deleted file mode 100644 index d0c3c645ab9..00000000000 Binary files a/docs/src/reference/resources/images/admon/note.png and /dev/null differ diff --git a/docs/src/reference/resources/images/admon/tip.png b/docs/src/reference/resources/images/admon/tip.png deleted file mode 100644 index 5c4aab3bb35..00000000000 Binary files a/docs/src/reference/resources/images/admon/tip.png and /dev/null differ 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 1c33db8f34a..00000000000 Binary files a/docs/src/reference/resources/images/admon/warning.png and /dev/null differ 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 9e7a87f7546..00000000000 Binary files a/docs/src/reference/resources/images/callouts/1.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/1.png b/docs/src/reference/resources/images/callouts/1.png deleted file mode 100644 index 7d473430b7b..00000000000 Binary files a/docs/src/reference/resources/images/callouts/1.png and /dev/null differ 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 e80f7f8e632..00000000000 Binary files a/docs/src/reference/resources/images/callouts/10.gif and /dev/null differ 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 997bbc8246a..00000000000 Binary files a/docs/src/reference/resources/images/callouts/10.png and /dev/null differ 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 67f91a239d6..00000000000 Binary files a/docs/src/reference/resources/images/callouts/11.gif and /dev/null differ 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 ce47dac3f52..00000000000 Binary files a/docs/src/reference/resources/images/callouts/11.png and /dev/null differ 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 54c4b42f190..00000000000 Binary files a/docs/src/reference/resources/images/callouts/12.gif and /dev/null differ 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 31daf4e2f25..00000000000 Binary files a/docs/src/reference/resources/images/callouts/12.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/12.svg b/docs/src/reference/resources/images/callouts/12.svg deleted file mode 100644 index 9794044c718..00000000000 --- a/docs/src/reference/resources/images/callouts/12.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - - 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 dd5d7d9b643..00000000000 Binary files a/docs/src/reference/resources/images/callouts/13.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/13.png b/docs/src/reference/resources/images/callouts/13.png deleted file mode 100644 index 14021a89c2e..00000000000 Binary files a/docs/src/reference/resources/images/callouts/13.png and /dev/null differ 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 3d7a952a310..00000000000 Binary files a/docs/src/reference/resources/images/callouts/14.gif and /dev/null differ 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 64014b75fe2..00000000000 Binary files a/docs/src/reference/resources/images/callouts/14.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/14.svg b/docs/src/reference/resources/images/callouts/14.svg deleted file mode 100644 index 469aa974876..00000000000 --- a/docs/src/reference/resources/images/callouts/14.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - -]> - - - - - - - - - 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 1c9183d5bb6..00000000000 Binary files a/docs/src/reference/resources/images/callouts/15.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/15.png b/docs/src/reference/resources/images/callouts/15.png deleted file mode 100644 index 0d65765fcf1..00000000000 Binary files a/docs/src/reference/resources/images/callouts/15.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/15.svg b/docs/src/reference/resources/images/callouts/15.svg deleted file mode 100644 index 8202233ef05..00000000000 --- a/docs/src/reference/resources/images/callouts/15.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - - 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 94d42a30f99..00000000000 Binary files a/docs/src/reference/resources/images/callouts/2.gif and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/2.png b/docs/src/reference/resources/images/callouts/2.png deleted file mode 100644 index 5d09341b2f6..00000000000 Binary files a/docs/src/reference/resources/images/callouts/2.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/2.svg b/docs/src/reference/resources/images/callouts/2.svg deleted file mode 100644 index 07d03395d03..00000000000 --- a/docs/src/reference/resources/images/callouts/2.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - -]> - - - - - - - - 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 dd3541a1bc2..00000000000 Binary files a/docs/src/reference/resources/images/callouts/3.gif and /dev/null differ 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 ef7b7004715..00000000000 Binary files a/docs/src/reference/resources/images/callouts/3.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/3.svg b/docs/src/reference/resources/images/callouts/3.svg deleted file mode 100644 index 918be806f47..00000000000 --- a/docs/src/reference/resources/images/callouts/3.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - 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 4bcbf7e31a1..00000000000 Binary files a/docs/src/reference/resources/images/callouts/4.gif and /dev/null differ 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 adb8364eb5d..00000000000 Binary files a/docs/src/reference/resources/images/callouts/4.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/4.svg b/docs/src/reference/resources/images/callouts/4.svg deleted file mode 100644 index 8eb6a53b3b1..00000000000 --- a/docs/src/reference/resources/images/callouts/4.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -]> - - - - - - - - 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 1c62b4f9209..00000000000 Binary files a/docs/src/reference/resources/images/callouts/5.gif and /dev/null differ 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 4d7eb460021..00000000000 Binary files a/docs/src/reference/resources/images/callouts/5.png and /dev/null differ 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 23bc5555d2a..00000000000 Binary files a/docs/src/reference/resources/images/callouts/6.gif and /dev/null differ 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 0ba694af6c0..00000000000 Binary files a/docs/src/reference/resources/images/callouts/6.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/6.svg b/docs/src/reference/resources/images/callouts/6.svg deleted file mode 100644 index 783a0b9d774..00000000000 --- a/docs/src/reference/resources/images/callouts/6.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - 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 e55ce89585a..00000000000 Binary files a/docs/src/reference/resources/images/callouts/7.gif and /dev/null differ 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 472e96f8ac3..00000000000 Binary files a/docs/src/reference/resources/images/callouts/7.png and /dev/null differ diff --git a/docs/src/reference/resources/images/callouts/7.svg b/docs/src/reference/resources/images/callouts/7.svg deleted file mode 100644 index 59b3714b564..00000000000 --- a/docs/src/reference/resources/images/callouts/7.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -]> - - - - - - - - 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 49375e09f4c..00000000000 Binary files a/docs/src/reference/resources/images/callouts/8.gif and /dev/null differ 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 5e60973c213..00000000000 Binary files a/docs/src/reference/resources/images/callouts/8.png and /dev/null differ 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 da12a4fe282..00000000000 Binary files a/docs/src/reference/resources/images/callouts/9.gif and /dev/null differ 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 a0676d26cc2..00000000000 Binary files a/docs/src/reference/resources/images/callouts/9.png and /dev/null differ 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