diff --git a/.gitignore b/.gitignore index 0ba3856cb0..e464d1cc17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,14 @@ *.iml *.ipr +*.iws *.sw? */src/main/java/META-INF .classpath .gradle -.idea .project .settings -.springBeans build derby.log -integration-repo lib logs pom.xml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..cb020daae3 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "buildSrc"] + path = buildSrc + url = git@github.com:cbeams/gradle-build.git diff --git a/build.gradle b/build.gradle index 25f1b5584f..572396d417 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,8 @@ * limitations under the License. */ +import org.springframework.build.Version + // ----------------------------------------------------------------------------- // Main gradle build file for Spring Integration // @@ -23,17 +25,22 @@ // @author Mark Fisher // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- // Configuration for the root project // ----------------------------------------------------------------------------- -apply from: "$rootDir/gradle/version.gradle" -apply plugin: 'idea' - // 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" + + + // ----------------------------------------------------------------------------- // Configuration for all projects including this one (the root project) // @@ -48,7 +55,7 @@ allprojects { // milestone or release. // @see org.springframework.build.Version under buildSrc/ for more info // @see gradle.properties for the declaration of this property. - version = createVersion(springIntegrationVersion) + version = new Version(springIntegrationVersion) // default set of maven repositories to be used when resolving dependencies repositories { @@ -70,20 +77,21 @@ allprojects { // // @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: '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 // ensure JDK 5 compatibility sourceCompatibility=1.5 @@ -94,10 +102,11 @@ configure(javaprojects) { libsBinDir = new File(libsDir, 'bin') libsSrcDir = new File(libsDir, 'src') - // all core projects should be OSGi-compliant bundles - // add the bundlor task to ensure proper manifests - apply from: "$rootDir/gradle/bundlor.gradle" - apply from: "$rootDir/gradle/maven-deployment.gradle" + // 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' @@ -408,24 +417,12 @@ project('spring-integration-xmpp') { } } -// add basic tasks like 'clean' and 'assemble' to the root project. e.g.: allows -// running `gradle clean` from the root project and deleting the build directory -apply plugin: 'base' - -// add tasks like 'distArchive' -apply from: "$rootDir/gradle/dist.gradle" - -// add tasks like 'snapshotDependencyCheck' -apply from: "${rootDir}/gradle/checks.gradle" - -// add 'generatePom' task to generate root pom with section -apply from: "$rootDir/gradle/maven-root-pom.gradle" - // ----------------------------------------------------------------------------- -// Import tasks related to releasing and managing the project -// depending on the role played by the current user. -// -// @see gradle.properties for more information on roles +// Configuration for the docs subproject // ----------------------------------------------------------------------------- -// add management tasks like `wrapper` for generating the gradlew* scripts -apply from: "$rootDir/gradle/wrapper.gradle" +project('docs') { + apply from: "$buildSrcDir/docs.gradle" +} + +apply from: "$buildSrcDir/dist.gradle" +apply from: "$buildSrcDir/checks.gradle" diff --git a/buildSrc b/buildSrc new file mode 160000 index 0000000000..7d83f72f53 --- /dev/null +++ b/buildSrc @@ -0,0 +1 @@ +Subproject commit 7d83f72f531676e5092a0b547a349271b76e6180 diff --git a/docs/build.gradle b/docs/build.gradle deleted file mode 100644 index b816d53880..0000000000 --- a/docs/build.gradle +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'base' -apply from: "$rootDir/gradle/docbook.gradle" - -description = "Spring Integration Documentation" - -task build(dependsOn: assemble) { - group = 'Build' - description = 'Builds reference and API documentation and archives' -} - - -/** - * Build aggregated JavaDoc HTML for all core project classes. Result is - * suitable for packaging into a distribution zip or viewing directly with - * a browser. - * - * @author Chris Beams - * @author Luke Taylor - * @see http://gradle.org/0.9-rc-1/docs/javadoc/org/gradle/api/tasks/javadoc/Javadoc.html - */ - task api(type: Javadoc) { - group = 'Documentation' - description = "Builds aggregated JavaDoc HTML for all core project classes." - - // this task is a bit ugly to configure. it was a user contribution, and - // Hans tells me it's on the roadmap to redesign it. - srcDir = file("${projectDir}/src/api") - destinationDir = file("${buildDir}/api") - tmpDir = file("${buildDir}/api-work") - optionsFile = file("${tmpDir}/apidocs/javadoc.options") - options.stylesheetFile = file("${srcDir}/spring-javadoc.css") - options.links = ["http://static.springframework.org/spring/docs/3.0.x/javadoc-api"] - options.overview = "${srcDir}/overview.html" - options.docFilesSubDirs = true - title = "Spring Integration ${version} API" - - // collect all the sources that will be included in the javadoc output - source javaprojects.collect {project -> - project.sourceSets.main.allJava - } - - // collect all main classpaths to be able to resolve @see refs, etc. - // this collection also determines the set of projects that this - // task dependsOn, thus the runtimeClasspath is used to ensure all - // projects are included, not just *dependencies* of all classes. - // this is awkward and took me a while to figure out. - classpath = files(javaprojects.collect {project -> - project.sourceSets.main.runtimeClasspath - }) - - // copy the images from the doc-files dir over to the target - doLast { task -> - copy { - from file("${task.srcDir}/doc-files") - into file("${task.destinationDir}/doc-files") - } - } -} - -/** - * Expand ${...} variables within docbook sources. This is a workaround - * accomodating the fact that the current docbook plugin has no way of - * parameterizing and replacing normal XML entities. - * - * Note that this task represents an implementation detail and it is - * unfortunate that it pollutes the listing of available tasks, e.g. - * during `gradle -t`. It's a good example of the need for 'task visibility' - - * a feature not yet implemented, but on the Gradle roadmap. - * - * @author Chris Beams - * @see http://jira.codehaus.org/browse/GRADLE-1026 - */ -task preprocessDocbookSources { - description = 'Expands ${...} variables within docbook sources.' - - doLast { - docbookSrcDir = file('src/reference/docbook') - docbookResourceDir = file('src/reference/resources/') - docbookWorkDir = file('build/reference-work') - - // copy everything but index.xml - copy { - into(docbookWorkDir) - from(docbookSrcDir) { exclude '**/index.xml' } - } - copy { - into(docbookWorkDir) - from(docbookResourceDir) - } - // copy index.xml and expand ${...} variables along the way - // e.g.: ${version} needs to be replaced in the header - copy { - into(docbookWorkDir) - from(docbookSrcDir) { include '**/index.xml' } - expand(version: "$version") - } - } -} - -// ----------------------------------------------------------------------------- -// Configure the three docbook* tasks that are added to the project by the -// 'docbook' plugin. -// ----------------------------------------------------------------------------- -task reference(dependsOn: [docbookHtml, docbookHtmlSingle, docbookPdf]) { - group = 'Documentation' - description = 'Generates all HTML and PDF reference documentation.' - - doLast { - // copy images and css into respective html dirs - ['html', 'htmlsingle'].each { dir -> - copy { - into "${buildDir}/reference/${dir}/images" - from "src/reference/resources/images" - } - copy { - into "${buildDir}/reference/${dir}/css" - from "src/reference/resources/css" - } - } - } -} - -[docbookHtml, docbookPdf, docbookHtmlSingle]*.sourceFileName = 'index.xml'; -[docbookHtml, docbookHtmlSingle, docbookPdf]*.dependsOn preprocessDocbookSources - -docbookHtml.stylesheet = file('src/reference/resources/xsl/html-custom.xsl') -docbookHtmlSingle.stylesheet = file('src/reference/resources/xsl/html-single-custom.xsl') -docbookPdf.stylesheet = file('src/reference/resources/xsl/pdf-custom.xsl') -def imagesDir = file('src/reference/resources/images'); -docbookPdf.admonGraphicsPath = "${imagesDir}/" - - -/** - * - * @see http://www.gradle.org/0.9-preview-3/docs/userguide/userguide_single.html#sec:copying_files - * @see http://www.gradle.org/0.9-preview-3/docs/javadoc/org/gradle/api/file/CopySpec.html - */ -docsSpec = copySpec { - into("${version}") { - from('src/info/changelog.txt') - } - - into("${version}/api") { - from(api.destinationDir) - } - - into("${version}/reference") { - from("${buildDir}/reference") - } -} - -task archive(type: Zip, dependsOn: [api, reference]) { - group = "Documentation" - description = "Create a zip archive of reference and API documentation." - - baseName = rootProject.name + '-docs' - - // drop it right in the root of the build dir for simplicity - destinationDir = buildDir - - // use the copy spec above to specify the contents of the zip - with docsSpec -} - -configurations { archives } -artifacts { archives archive } - -configurations { scpAntTask } -dependencies { - scpAntTask("org.apache.ant:ant-jsch:1.8.1") -} - -checkForProps(taskPath: project.path + ':uploadArchives', requiredProps: ['sshHost', 'sshUsername', 'sshPrivateKey']) - -uploadArchives { - def sshHost = project.properties.sshHost - def sshUsername = project.properties.sshUsername - def remoteSiteDir = '/var/www/domains/springframework.org/static/htdocs/' + rootProject.name - def docUrl = "http://${sshHost}/${rootProject.name}/docs/${version}" - def remoteDocsDir = "${remoteSiteDir}/docs/" - def fqRemoteDir = "${sshUsername}@${sshHost}:${remoteDocsDir}" - - group = 'Buildmaster' - description = "Uploads and unpacks documentation archive" + (sshHost ? " to ${docUrl}" : ": Host is not specified") - - uploadDescriptor = false - - repositories { - add(new org.apache.ivy.plugins.resolver.SshResolver()) { - name = 'sshHost: ' + sshHost // used for debugging - host = sshHost - user = sshUsername - if (project.hasProperty('sshPrivateKey')) { - keyFile = sshPrivateKey as File - } - addArtifactPattern "${remoteDocsDir}/${archive.archiveName}" - } - } - - configurations { scpAntTask } - dependencies { scpAntTask 'org.apache.ant:ant-jsch:1.8.1' } - - doFirst { - println "Uploading: ${archive.archivePath} to ${fqRemoteDir}" - } - - doLast { - project.ant { - taskdef(name: 'sshexec', - classname: 'org.apache.tools.ant.taskdefs.optional.ssh.SSHExec', - classpath: configurations.scpAntTask.asPath) - - // copy the archive, unpack it, then delete it - def unpackCommand = "cd ${remoteDocsDir} && rm -rf ${version} && unzip -qKo ${archive.archiveName} && rm ${archive.archiveName}" - def wildcardSymlinkCommand = "cd ${remoteDocsDir} && rm -f ${version.wildcardValue} && ln -s ${version} ${version.wildcardValue}" - def latestGASymlinkCommand = "cd ${remoteDocsDir} && rm -f latest-ga && ln -s ${version} latest-ga" - - println "Unpacking docs archive: (${unpackCommand})" - sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: unpackCommand) - if (version.releaseType != 'SNAPSHOT') { - println "Creating wildcard symlink: (${wildcardSymlinkCommand})" - sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: wildcardSymlinkCommand) - } - if (version.releaseType == 'RELEASE') { - println "Creating latest-ga symlink: (${latestGASymlinkCommand})" - sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: latestGASymlinkCommand) - } - println "UPLOAD SUCCESSFUL - validate by visiting ${docUrl}" - } - } -} diff --git a/docs/src/reference/docbook/.index.xml.swo b/docs/src/reference/docbook/.index.xml.swo deleted file mode 100644 index 782ad922c7..0000000000 Binary files a/docs/src/reference/docbook/.index.xml.swo and /dev/null differ diff --git a/gradle.properties b/gradle.properties index bdd574521c..4a026608fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,6 +36,7 @@ role=developer # s3AccessKey= # s3SecretAccessKey= # docsHost=static.springsource.org +# remoteDocRoot=/var/www/domains/springframework.org/static/htdocs # sshHost=static.springsource.org # sshUsername= # sshPrivateKey=>() - - javaprojects.each { project -> - project.sourceSets.main.compileClasspath.allDependencies.each { dep -> - if (dep.version.endsWith('SNAPSHOT')) { - if (snapshotDependencies[project] == null) - snapshotDependencies[project] = new ArrayList() - snapshotDependencies[project].add(dep) - } - } - } - - project.hasSnapshotDependencies = snapshotDependencies.size() > 0 - - if (project.hasSnapshotDependencies) { - println "The following snapshot dependencies were found:" - snapshotDependencies.each { entry -> - println "${entry.key} depends on:" - entry.value.each { dep -> - println " ${dep}" - } - } - } - } -} - - -/** - * Abort the build if any Java projects have snapshot dependencies. It important - * that any non-snapshot release be checked for snapshot dependencies before - * final publication, as snapshot dependencies may change and thus make the - * release unstable and/or unreproducable. - * - * This task will be added to the build lifecycle automatically if the release - * is non-snapshot. - * - * -PignoreSnapshotDependencies will bypass aborting the build. A use case for - * this option would be if a transitive dependency out of your control is a - * snapshot release and you wish to proceed with releasing anyway. - * - * @author Chris Beams - * @see snapshotDependencyReport - */ -task snapshotDependencyCheck(dependsOn: snapshotDependencyReport) { - group = 'Verification' - description = 'Aborts the build if any Java project has snapshot dependencies.' - - // bind to build lifecycle if we're a non-snapshot release - if (version.releaseType != 'SNAPSHOT') { - check.dependsOn snapshotDependencyCheck - } - - onlyIf { - project.hasSnapshotDependencies && - !project.hasProperty('ignoreSnapshotDependencies') - } - doFirst { - throw new GradleException( - "aborting '${name}' task due to snapshot dependencies. " - + "supply -PignoreSnapshotDependencies to override") - } -} diff --git a/gradle/dist.gradle b/gradle/dist.gradle deleted file mode 100644 index abedc6e963..0000000000 --- a/gradle/dist.gradle +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// ----------------------------------------------------------------------------- -// Task definitions related to releasing the project -// -// @author Chris Beams -// ----------------------------------------------------------------------------- - -// ensure that every project has been evaluated before this script -// this allows us to look up tasks below and dereference dynamically -// assigned properties like 'docsSpec' below -project.subprojects.each { project -> - evaluationDependsOn project.path -} - -task check { - group = 'Verification' -} - -task build(dependsOn: [check, assemble]) { - group = 'Build' -} - -/** - * Build the distribution zip file. - * - * @author Chris Beams - */ -task distArchive(type: Zip) { - group = 'Build' - - destinationDir = buildDir - archiveName = "${project.name}-${project.version}.zip" - checksumPath = "${destinationDir}/${archiveName}.sha1" - def zipRootDir = "${project.name}-${project.version}" - - description = "Builds the distribution zip file at ${project.relativePath(destinationDir)}/${archiveName}" - - // depend on all projects with an assemble task - dependsOn subprojects*.tasks*.matching { task -> task.name == 'assemble' } - - // we need the docsSpec to be defined before evaluating this task - project.evaluationDependsOn(':docs') - - // set up outputs for use by incremental build and by tasks like 'cleanDist' - // the archive zip file will be added automatically to outputs.files - // but we must add the sha1 checksum ourselves - outputs.files file(checksumPath) - - // configure the contents of the zip file. remember that this is a - // configuration phase event. no zip is being created yet. the Zip - // task we extend will do that for us during the execution phase. - into(zipRootDir) { - // add all jars from java subprojects - into('bin') { - from javaprojects.collect { project -> project.libsBinDir } - } - - // add all source jars from java subprojects - into('src') { - from javaprojects.collect { project -> project.libsSrcDir } - } - - into('') { - from('docs/src/info') - } - - into("docs/api") { - from("docs/build/api") - } - - into("docs/reference") { - from("docs/build/reference") - } - } - - // once the zip has been written, create a sha1 hash for it - // this will write out the file at ${checksumPath} - doLast { - ant.checksum(file: archivePath, algorithm: 'SHA1', fileext: '.sha1') - assert file(checksumPath).isFile(): "${checksumPath} was not created" - } -} - -/** - * Upload the distribution zip file. - * - * @author Luke Taylor - * @author Chris Beams - */ -task uploadArchives(overwrite: true, dependsOn: distArchive) { // base plugin adds one we need to overwrite - group = 'Buildmaster' - description = 'Uploads the distribution zip file.' - - configurations { antlibs } - dependencies { - antlibs "org.springframework.build:org.springframework.build.aws.ant:3.0.3.RELEASE", - "net.java.dev.jets3t:jets3t:0.6.1" - } - - def releaseType = version.releaseType.toString().toLowerCase() - - doLast() { - println "Uploading: ${distArchive.archivePath} to s3" - project.ant { - taskdef(resource: 'org/springframework/build/aws/ant/antlib.xml', - classpath: configurations.antlibs.asPath) - s3(accessKey: s3AccessKey, secretKey: s3SecretAccessKey) { - upload(bucketName: 'dist.springframework.org', file: distArchive.archivePath, - toFile: releaseType + "/${rootProject.abbreviation}/${distArchive.archiveName}", publicRead: 'true') { - metadata(name: 'project.name', value: 'Spring Integration') - metadata(name: 'release.type', value: releaseType) - metadata(name: 'bundle.version', value: version) - metadata(name: 'package.file.name', value: distArchive.archiveName) - } - upload(bucketName: 'dist.springframework.org', file: "${distArchive.archivePath}.sha1", - toFile: releaseType + "/${rootProject.abbreviation}/${distArchive.archiveName}.sha1", publicRead: 'true') - } - } - } -} - - - diff --git a/gradle/docbook.gradle b/gradle/docbook.gradle deleted file mode 100644 index 225e4033fe..0000000000 --- a/gradle/docbook.gradle +++ /dev/null @@ -1,315 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import org.xml.sax.XMLReader; -import org.xml.sax.InputSource; -import org.apache.xml.resolver.CatalogManager; -import org.apache.xml.resolver.tools.CatalogResolver; - -import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.*; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import java.util.zip.*; - -import org.apache.fop.apps.*; - -import org.gradle.api.logging.LogLevel; - -import com.icl.saxon.TransformerFactoryImpl; -import ch.qos.logback.classic.Level; -import org.slf4j.LoggerFactory; - -buildscript { - repositories { - mavenCentral() - mavenRepo name: 'Shibboleth Repo', urls: 'http://shibboleth.internet2.edu/downloads/maven2' - } - dependencies { - def fopDeps = ['org.apache.xmlgraphics:fop:0.95-1@jar', - 'org.apache.xmlgraphics:xmlgraphics-commons:1.3', - 'org.apache.xmlgraphics:batik-bridge:1.7@jar', - 'org.apache.xmlgraphics:batik-util:1.7@jar', - 'org.apache.xmlgraphics:batik-css:1.7@jar', - 'org.apache.xmlgraphics:batik-dom:1.7', - 'org.apache.xmlgraphics:batik-svg-dom:1.7@jar', - 'org.apache.avalon.framework:avalon-framework-api:4.3.1'] - - classpath 'org.apache.xerces:resolver:2.9.1', - 'saxon:saxon:6.5.3', - 'org.apache.xerces:xercesImpl:2.9.1', - fopDeps, - 'net.sf.xslthl:xslthl:2.0.1', - 'net.sf.docbook:docbook-xsl:1.75.2:resources@zip' - } - -} - -/** - * Gradle Docbook plugin implementation. - *

- * Creates three tasks: docbookHtml, docbookHtmlSingle and docbookPdf. - * Each task takes a single File on which it operates. - * - * @author Luke Taylor - */ -// Add the plugin tasks to the project -task docbookHtml(type: DocbookHtml) { - setDescription('Generates chunked docbook html output.') - xdir = 'html' - classpath = buildscript.configurations.classpath -} - -task docbookHtmlSingle(type: Docbook) { - setDescription('Generates single page docbook html output.') - xdir = 'htmlsingle' - classpath = buildscript.configurations.classpath -} - -task docbookPdf(type: DocbookFoPdf) { - setDescription('Generates PDF docbook output.') - extension = 'fo' - xdir = 'pdf' - classpath = buildscript.configurations.classpath -} - -/** - */ -public class Docbook extends DefaultTask { - @Input - String extension = 'html'; - - @Input - boolean XIncludeAware = true; - - @Input - boolean highlightingEnabled = true; - - String admonGraphicsPath; - - @InputDirectory - File sourceDirectory = new File(project.getProjectDir(), "build/reference-work"); - - @Input - String sourceFileName; - - @InputFile - File stylesheet; - - @OutputDirectory - File docsDir = new File(project.getBuildDir(), "reference"); - - @InputFiles - Configuration classpath - - @TaskAction - public final void transform() { - // the docbook tasks issue spurious content to the console. redirect to INFO level - // so it doesn't show up in the default log level of LIFECYCLE unless the user has - // run gradle with '-d' or '-i' switches -- in that case show them everything - switch (project.gradle.startParameter.logLevel) { - case LogLevel.DEBUG: - case LogLevel.INFO: - break; - default: - logging.captureStandardOutput(LogLevel.INFO) - logging.captureStandardError(LogLevel.INFO) - } - - SAXParserFactory factory = new org.apache.xerces.jaxp.SAXParserFactoryImpl(); - factory.setXIncludeAware(XIncludeAware); - docsDir.mkdirs(); - - File srcFile = new File(sourceDirectory, sourceFileName); - String outputFilename = srcFile.getName().substring(0, srcFile.getName().length() - 4) + '.' + extension; - - File oDir = new File(getDocsDir(), xdir) - File outputFile = new File(oDir, outputFilename); - - Result result = new StreamResult(outputFile.getAbsolutePath()); - CatalogResolver resolver = new CatalogResolver(createCatalogManager()); - InputSource inputSource = new InputSource(srcFile.getAbsolutePath()); - - XMLReader reader = factory.newSAXParser().getXMLReader(); - reader.setEntityResolver(resolver); - TransformerFactory transformerFactory = new TransformerFactoryImpl(); - transformerFactory.setURIResolver(resolver); - URL url = stylesheet.toURL(); - Source source = new StreamSource(url.openStream(), url.toExternalForm()); - Transformer transformer = transformerFactory.newTransformer(source); - - if (highlightingEnabled) { - File highlightingDir = new File(getProject().getBuildDir(), "highlighting"); - if (!highlightingDir.exists()) { - highlightingDir.mkdirs(); - extractHighlightFiles(highlightingDir); - } - - transformer.setParameter("highlight.xslthl.config", new File(highlightingDir, "xslthl-config.xml").toURI().toURL()); - - if (admonGraphicsPath != null) { - transformer.setParameter("admon.graphics", "1"); - transformer.setParameter("admon.graphics.path", admonGraphicsPath); - } - } - - preTransform(transformer, srcFile, outputFile); - - transformer.transform(new SAXSource(reader, inputSource), result); - - postTransform(outputFile); - } - - private void extractHighlightFiles(File toDir) { - File docbookZip = classpath.files.find { file -> file.name.contains('docbook-xsl-')}; - - if (docbookZip == null) { - throw new GradleException("Docbook zip file not found"); - } - - ZipFile zipFile = new ZipFile(docbookZip); - - Enumeration e = zipFile.entries(); - while (e.hasMoreElements()) { - ZipEntry ze = (ZipEntry) e.nextElement(); - if (ze.getName().matches(".*/highlighting/.*\\.xml")) { - String filename = ze.getName().substring(ze.getName().lastIndexOf("/highlighting/") + 14); - copyFile(zipFile.getInputStream(ze), new File(toDir, filename)); - } - } - } - - private void copyFile(InputStream source, File destFile) { - destFile.createNewFile(); - FileOutputStream to = null; - try { - to = new FileOutputStream(destFile); - byte[] buffer = new byte[4096]; - int bytesRead; - - while ((bytesRead = source.read(buffer)) > 0) { - to.write(buffer, 0, bytesRead); - } - } finally { - if (source != null) { - source.close(); - } - if (to != null) { - to.close(); - } - } - } - - protected void preTransform(Transformer transformer, File sourceFile, File outputFile) { - } - - protected void postTransform(File outputFile) { - } - - private CatalogManager createCatalogManager() { - CatalogManager manager = new CatalogManager(); - manager.setIgnoreMissingProperties(true); - ClassLoader classLoader = this.getClass().getClassLoader(); - StringBuilder builder = new StringBuilder(); - String docbookCatalogName = "docbook/catalog.xml"; - URL docbookCatalog = classLoader.getResource(docbookCatalogName); - - if (docbookCatalog == null) { - throw new IllegalStateException("Docbook catalog " + docbookCatalogName + " could not be found in " + classLoader); - } - - builder.append(docbookCatalog.toExternalForm()); - - Enumeration enumeration = classLoader.getResources("/catalog.xml"); - while (enumeration.hasMoreElements()) { - builder.append(';'); - URL resource = (URL) enumeration.nextElement(); - builder.append(resource.toExternalForm()); - } - String catalogFiles = builder.toString(); - manager.setCatalogFiles(catalogFiles); - return manager; - } -} - -/** - */ -class DocbookHtml extends Docbook { - - @Override - protected void preTransform(Transformer transformer, File sourceFile, File outputFile) { - String rootFilename = outputFile.getName(); - rootFilename = rootFilename.substring(0, rootFilename.lastIndexOf('.')); - transformer.setParameter("root.filename", rootFilename); - transformer.setParameter("base.dir", outputFile.getParent() + File.separator); - } -} - -/** - */ -class DocbookFoPdf extends Docbook { - - /** - * From the FOP usage guide - */ - @Override - protected void postTransform(File foFile) { - FopFactory fopFactory = FopFactory.newInstance(); - - OutputStream out = null; - final File pdfFile = getPdfOutputFile(foFile); - logger.debug("Transforming 'fo' file " + foFile + " to PDF: " + pdfFile); - - try { - out = new BufferedOutputStream(new FileOutputStream(pdfFile)); - - Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out); - - TransformerFactory factory = TransformerFactory.newInstance(); - Transformer transformer = factory.newTransformer(); - - Source src = new StreamSource(foFile); - - Result res = new SAXResult(fop.getDefaultHandler()); - - switch (project.gradle.startParameter.logLevel) { - case LogLevel.DEBUG: - case LogLevel.INFO: - break; - default: - // only show verbose fop output if the user has specified 'gradle -d' or 'gradle -i' - LoggerFactory.getILoggerFactory().getLogger('org.apache.fop').level = Level.ERROR - } - - transformer.transform(src, res); - - } finally { - if (out != null) { - out.close(); - } - } - - if (!foFile.delete()) { - logger.warn("Failed to delete 'fo' file " + foFile); - } - } - - private File getPdfOutputFile(File foFile) { - String name = foFile.getAbsolutePath(); - return new File(name.substring(0, name.length() - 2) + "pdf"); - } -} diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle deleted file mode 100644 index d588d0ba56..0000000000 --- a/gradle/maven-deployment.gradle +++ /dev/null @@ -1,271 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// ----------------------------------------------------------------------------- -// Tasks related to deploying Maven artifacts. -// -// @author Chris Beams -// ----------------------------------------------------------------------------- - -// check that upload-related properties are defined and fail early if not -// these properties ('s3AccessKey', etc) should be defined in -// 'gradle.properties' in $HOME/.gradle/gradle.properties -def requiredProps = version.releaseType == 'RELEASE' ? ['mavenSyncRepoDir'] : ['s3AccessKey', 's3SecretAccessKey'] -checkForProps(taskPath: project.path + ':uploadArchives', requiredProps: requiredProps) - -/** - * Builds a source jar artifact for all main java sources. - * - * @author Luke Taylor - */ -task sourceJar(type: Jar) { - description = 'Builds a source jar artifact suitable for maven deployment.' - classifier = 'sources' - from sourceSets.main.java -} -build.dependsOn sourceJar - -jar.destinationDir = project.libsBinDir -sourceJar.destinationDir = project.libsSrcDir - -// Add the source jar archive to the set of artifacts for this project. -// Note that the regular 'jar' archive is already added by default. -artifacts { - archives sourceJar -} - - -/** - * Deploy gradle-built artifacts to a remote maven repository. Overrides and - * further customizes the 'uploadArchives' task contributed by the 'maven' - * plugin. - * - * The repository that artifacts are deployed to is determined conditionally - * based on the release type of the project version. Snapshot builds will - * be deployed via s3 to the springframework maven snapshot repository; - * milestone builds will happen via s3 as well; release builds will be deployed - * to the local filesystem to be sync'd via sourceforge SVN and ultimately - * deployed to maven central. - * - * Gradle will generate Maven poms on-the-fly during the deployment process. - * This process is customized to add ASL license information, and for projects - * that have the erlangLicense property set to true, the Erlang License will be - * added to the pom as well. - * - * @author Chris Beams - * @see 'mavenSyncRepoDir' in gradle.properties - * @see `gradle install` for deploying artifacts to the local .m2 cache - * @see http://maven.apache.org/guides/mini/guide-central-repository-upload.html - */ -uploadArchives { - group = 'Buildmaster' - description = "Does a maven deploy of archives artifacts to " // url appended below - - def releaseRepositoryUrl = "file://${project.properties.mavenSyncRepoDir}" - def milestoneRepositoryUrl = 's3://maven.springframework.org/milestone' - def snapshotRepositoryUrl = 's3://maven.springframework.org/snapshot' - - // add a configuration with a classpath that includes our s3 maven deployer - configurations { deployerJars } - dependencies { - deployerJars "org.springframework.build.aws:org.springframework.build.aws.maven:3.0.0.RELEASE" - } - - def deployer = repositories.mavenDeployer { - switch (version.releaseType) { - case 'RELEASE': - repository(url: releaseRepositoryUrl) - description += releaseRepositoryUrl - break; - - case 'MILESTONE': - description += milestoneRepositoryUrl - s3credentials = [userName: project.properties.s3AccessKey, passphrase: project.properties.s3SecretAccessKey] - configuration = configurations.deployerJars - repository(url: milestoneRepositoryUrl) { - authentication(s3credentials) - } - snapshotRepository(url: snapshotRepositoryUrl) { - authentication(s3credentials) - } - break; - - case 'SNAPSHOT': - description += snapshotRepositoryUrl - s3credentials = [userName: project.properties.s3AccessKey, passphrase: project.properties.s3SecretAccessKey] - configuration = configurations.deployerJars - repository(url: milestoneRepositoryUrl) { - authentication(s3credentials) - } - snapshotRepository(url: snapshotRepositoryUrl) { - authentication(s3credentials) - } - break; - - default: - throw new GradleException("unknown ReleaseType") - } - } - - configurePom(deployer.pom) -} - - -/** - * Install gradle-built artifacts to the local m2 maven cache. - * Further customizes the 'install' task contributed by the 'maven' plugin. - */ -install { - group = 'Build' - description = "Does a maven install of archives artifacts to local m2 cache" - - configurePom(repositories.mavenInstaller.pom) -} - - -/** - * Generate a Maven pom.xml for use at build time. Dependency information will - * be based on Gradle metadata for the project, and other customizations such - * as licensing information and source compatibility settings are configured - * within. - * - * @author Chris Beams - * @see http://gradle.org/0.9-preview-3/docs/userguide/userguide_single.html#pomBuilder - */ -task generatePom { - group = 'Build' - description = 'Generates a Maven POM file suitable for use in building the project' - - generatedPomFileName = "pom.xml" - - // enable partial cleaning with `gradle cleanGeneratePom` - outputs.files(generatedPomFileName) - - doLast() { - // customize the pom creation process - p = pom { - project { - name = project.description - properties { - setProperty('project.build.sourceEncoding', 'UTF8') - } - build { - plugins { - plugin { - groupId = 'org.apache.maven.plugins' - artifactId = 'maven-compiler-plugin' - configuration { - source = '1.5' - target = '1.5' - } - } - plugin { - groupId = 'org.apache.maven.plugins' - artifactId = 'maven-surefire-plugin' - configuration { - includes { - include = '**/*Tests.java' - } - excludes { - exclude = '**/*Abstract*.java' - } - } - } - } - resources { - resource { - directory = 'src/main/java' - includes = ['**/*'] - excludes = ['**/*.java'] - } - resource { - directory = 'src/main/resources' - includes = ['**/*'] - } - } - testResources { - testResource { - directory = 'src/test/java' - includes = ['**/*'] - excludes = ['**/*.java'] - } - testResource { - directory = 'src/test/resources' - includes = ['**/*'] - } - } - } - } - } - - // customizing the artifact id is a special case that must be configured - // after the pom is fully configured, otherwise it'll be overwritten - p.whenConfigured { pom -> pom.artifactId = project.name } - - configurePom(p) - - // write the pom.xml file out to the filesystem - p.writeTo(generatedPomFileName) - } - - // ensure that pom generation happens every time resources are processed - // (which practically means any time a build happens). if the dependencies - // for the project have been updated (in $rootDir/build.gradle), the pom - // will have diffs in it and the developer will be reminded to check in - // the change during the next commit cycle. - //processResources.dependsOn generatePom -} - - -/** - * Read dynamic 'optional' and 'provided' properties from gradle dependencies - * and translate them to their maven POM equivalents. - */ -def configurePom(def pom) { - pom.whenConfigured { generatedPom -> - def optionalDeps = configurations.testRuntime.allDependencies.findAll { gradleDep -> - gradleDep.asDynamicObject.hasProperty('optional') && gradleDep.optional - } - def providedDeps = configurations.testRuntime.allDependencies.findAll { gradleDep -> - gradleDep.asDynamicObject.hasProperty('provided') && gradleDep.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' - } - } - } - - pom.project { - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - } -} diff --git a/gradle/maven-root-pom.gradle b/gradle/maven-root-pom.gradle deleted file mode 100644 index d26f1402ec..0000000000 --- a/gradle/maven-root-pom.gradle +++ /dev/null @@ -1,62 +0,0 @@ - -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Generate a root Maven pom.xml for use at build time. Contains nothing other - * than a 'modules' section aggregating child projects. This pom will never be - * installed locally or deployed remotely. Child projects will not explicitly - * declare this pom as their parent, given than nothing need be inherited from - * it. - * - * @author Chris Beams - * @see maven-deployment.gradle for per-project generatePom task - */ -task generatePom { - apply plugin: 'maven' - group = 'Build' - description = 'Generates a root Maven pom for convenience.' - - generatedPomFileName = "pom.xml" - - // enable partial cleaning with `gradle cleanGeneratePom` - outputs.files(generatedPomFileName) - - doLast() { - // customize the pom creation process - p = pom { - project { - name = project.description - packaging = 'pom' - modules = javaprojects.collect { project -> project.name } - } - } - - // customizing the artifact id is a special case that must be configured - // after the pom is fully configured, otherwise it'll be overwritten - p.whenConfigured { pom -> pom.artifactId = project.name } - - // write the pom.xml file out to the filesystem - p.writeTo(generatedPomFileName) - } - - // ensure that pom generation happens every time resources are processed - // (which practically means any time a build happens). if the dependencies - // for the project have been updated (in $rootDir/build.gradle), the pom - // will have diffs in it and the developer will be reminded to check in - // the change during the next commit cycle. - //processResources.dependsOn generatePom -} diff --git a/gradle/version.gradle b/gradle/version.gradle deleted file mode 100644 index 310cf2752d..0000000000 --- a/gradle/version.gradle +++ /dev/null @@ -1,83 +0,0 @@ -class Version { - /** - * Indicates whether a version is a release, milestone, or snapshot - */ - static final String RELEASE = 'RELEASE' - static final String MILESTONE = 'MILESTONE' - static final String SNAPSHOT = 'SNAPSHOT' - - String value - String releaseType - int majorVersion - int minorVersion - - /** - * @param dotted -quad version spec, e.g.: 1.0.0.RELEASE - */ - public Version(String value) { - this.value = value; - this.releaseType = releaseTypeFor(value); - this.majorVersion = Integer.parseInt(this.value.substring(0, this.value.indexOf('.'))); - String afterMajor = this.value.substring(this.value.indexOf('.') + 1); - this.minorVersion = Integer.parseInt(afterMajor.substring(0, afterMajor.indexOf('.'))); - } - - public int getMajorVersion() { - return this.majorVersion; - } - - public int getMinorVersion() { - return this.minorVersion - } - - /** - * @return 1.0.x style - */ - public String getWildcardValue() { - return majorVersion + '.' + minorVersion + '.x'; - } - - /** - * @return the version string returned by {@link getValue ( )} - */ - public String toString() { - return this.getValue(); - } - - /** - * @param dotted -quad version spec, e.g.: 1.0.0.RELEASE - */ - public static String releaseTypeFor(String version) { - if (version.endsWith("RELEASE")) return RELEASE; - if (version.endsWith("SNAPSHOT")) return SNAPSHOT; - if (version.matches(".*\\.M[0-9]+\$")) return MILESTONE; - if (version.matches(".*\\.RC[0-9]+\$")) return MILESTONE; - - throw new InvalidUserDataException("unknown version scheme: " + - "versions must end in (SNAPSHOT|M[0-9]+|RC[0-9]+|RELEASE), " + - "but got (" + version + ")"); - } -} - -project.createVersion = { value -> - new Version(value) -} - -def requiredPropSets = [] - -gradle.taskGraph.whenReady { graph -> - requiredPropSets.each { args -> - if (graph.hasTask(args.taskPath)) { - def missingProps = args.requiredProps.findAll { prop -> - !project.hasProperty(prop) - } - if (missingProps) { - throw new GradleException("For executing the ${args.taskPath} task you need to set all ${missingProps} properties") - } - } - } -} -project.checkForProps = { Map args -> - requiredPropSets.add args -} - diff --git a/gradle/wrapper.gradle b/gradle/wrapper.gradle deleted file mode 100644 index 36e7ac7d0f..0000000000 --- a/gradle/wrapper.gradle +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Generate gradlew and gradlew.bat scripts and associated files. These - * convenience scripts allow users to operate the build without being forced to - * download and install gradle. - * - * @author Chris Beams - * @see http://gradle.org/0.9-preview-3/docs/userguide/userguide_single.html#gradle_wrapper - */ -task wrapper(type: Wrapper) { - group = 'Buildmaster' - description = "Generates gradlew and gradlew.bat bootstrap scripts" - gradleVersion = '0.9-preview-3' - // place jar file and properties into a - // subdirectory to avoid root dir clutter - jarPath = 'gradle/wrapper' -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 4eb13be9e5..0000000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 682c93283d..0000000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,9 +0,0 @@ -#Wed Oct 27 06:30:22 EDT 2010 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -distributionVersion=0.9-build-daemon-20101027111821+1100 -zipStorePath=wrapper/dists -urlRoot=http\://gradle.artifactoryonline.com/gradle/distributions/gradle-snapshots -distributionName=gradle -distributionClassifier=bin diff --git a/gradlew b/gradlew index 062dcf316d..03a2a5bb9d 100755 --- a/gradlew +++ b/gradlew @@ -7,8 +7,8 @@ ############################################################################## # Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together. -# GRADLE_OPTS="$GRADLE_OPTS -Xmx512" -# JAVA_OPTS="$JAVA_OPTS -Xmx512" +# GRADLE_OPTS="$GRADLE_OPTS -Xmx512m" +# JAVA_OPTS="$JAVA_OPTS -Xmx512m" GRADLE_APP_NAME=Gradle @@ -63,8 +63,8 @@ if $cygwin ; then fi STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain -CLASSPATH=`dirname "$0"`/gradle/wrapper/gradle-wrapper.jar -WRAPPER_PROPERTIES=`dirname "$0"`/gradle/wrapper/gradle-wrapper.properties +CLASSPATH=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.jar +WRAPPER_PROPERTIES=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.properties # Determine the Java command to use to start the JVM. if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then @@ -135,8 +135,11 @@ if $cygwin ; then esac fi +GRADLE_APP_BASE_NAME=`basename "$0"` + "$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \ -classpath "$CLASSPATH" \ + -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \ -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \ $STARTER_MAIN_CLASS \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 114aaa4c7d..5f9e45784a 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,8 @@ 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% -Xmx512 -@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512 +@rem set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m +@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512m set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=.\ @@ -101,8 +101,8 @@ set CMD_LINE_ARGS=%$ @rem Setup the command line set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain -set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar -set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties +set CLASSPATH=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.jar +set WRAPPER_PROPERTIES=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.properties set JAVA_EXE=%JAVA_HOME%\bin\java.exe set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%" diff --git a/readme.txt b/readme.txt index 8e01aaee1a..0b0df0c962 100644 --- a/readme.txt +++ b/readme.txt @@ -1,9 +1,13 @@ ============================== Spring Integration ============================= To check out the project and build from source, do the following: - git clone git://git.springsource.org/spring-integration/spring-integration.git - cd spring-integration - ./gradlew build + git clone --recursive git://git.springsource.org/spring-integration/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, doing so becomes a multi-step process. ------------------------------------------------------------------------------- To generate Eclipse metadata (.classpath and .project files), do the following: @@ -32,18 +36,23 @@ The result will be available in 'docs/build/api'. ###### OSGI Notes ###### 1. Dependency on Third Party Bundles - Some adapters depend on third party libraries (bundles). - Spring hosts Enterprise Bundle Repository (EBR) https://ebr.springsource.com/repository/app/ - where you can download many third party JARs as valid OSGi bundles. - If a particular bundle is not available in Spring's EBR, there are tools that can convert regular - JAR to a bundle JAR. One of them is Bundlor http://www.springsource.org/bundlor which can auto-generate - MANIFEST as part of standard project lifecycle or simply convert non-bundle JAR to a bundle JAR. + Some adapters depend on third party libraries (bundles). + Spring hosts the Enterprise Bundle Repository (EBR) at + https://ebr.springsource.com/repository/app/, where you can download + many third-party JARs as valid OSGi bundles. + If a particular bundle is not available in Spring's EBR, there are tools + that can convert regular JAR to a bundle JAR. One of them is Bundlor + http://www.springsource.org/bundlor which can auto-generate an OSGi + MANIFEST.MF as part of standard project lifecycle or simply convert a + non-bundle JAR to a bundle JAR. 2. Boot delegation - Some adapters depend on extension packages that are available to the boot class loader. - For example; Feed Adapter depends on com.sun.syndication.feed. Since by default OSGi only - loads java.* from the boot class loader, other packages that must be loaded from the boot class loader - can therefore be specified with the 'org.osgi.framework.bootdelegation' System property. - For example: - org.osgi.framework.bootdelegation=com.sun.*,org.w3c.*. . . . - -=============================================================================== \ No newline at end of file + Some adapters depend on extension packages that are available to the boot + class loader. As a case in point, the Feed Adapter depends on + com.sun.syndication.feed. Since by default OSGi only loads java.* from the + boot class loader, other packages that must be loaded from the boot class + loader can therefore be specified with the + 'org.osgi.framework.bootdelegation' System property. + For example: + org.osgi.framework.bootdelegation=com.sun.*,org.w3c.*. . . . + +=============================================================================== diff --git a/spring-integration-core/.settings/org.eclipse.jdt.core.prefs b/spring-integration-core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 1041127f91..0000000000 --- a/spring-integration-core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,74 +0,0 @@ -#Wed May 26 00:45:23 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-integration-core/.settings/org.eclipse.wst.common.component b/spring-integration-core/.settings/org.eclipse.wst.common.component deleted file mode 100644 index d3be80d831..0000000000 --- a/spring-integration-core/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/spring-integration-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-integration-core/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 16a4875d00..0000000000 --- a/spring-integration-core/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/spring-integration-core/.settings/org.maven.ide.eclipse.prefs b/spring-integration-core/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index b2b77e81bb..0000000000 --- a/spring-integration-core/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:47 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-core/.settings/org.springframework.ide.eclipse.core.prefs b/spring-integration-core/.settings/org.springframework.ide.eclipse.core.prefs deleted file mode 100644 index 7d640591f4..0000000000 --- a/spring-integration-core/.settings/org.springframework.ide.eclipse.core.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Thu Sep 02 11:22:03 EDT 2010 -eclipse.preferences.version=1 -org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true -org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=true -org.springframework.ide.eclipse.core.builders.enable.osgibundleupdater=false -org.springframework.ide.eclipse.core.enable.project.preferences=true -org.springframework.ide.eclipse.core.validator.enable.com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivationPolicyRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivatorRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleManifestVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.exportPackageRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.importRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.parsingProblemsRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.requireBundleRule-com.springsource.server.ide.manifest.core.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.AvoidDriverManagerDataSource-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ImportElementsAtTopRulee-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ParentBeanSpecifiesAbstractClassRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.RefElementRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.TooManyBeansInFileRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UnnecessaryValueElementRule-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UseBeanInheritance-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.legacyxmlusage.jndiobjectfactory-com.springsource.sts.bestpractices.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importBundleVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importLibraryVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importPackageVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.requireBundleVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.autowire.autowire-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.toolAnnotation-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=false diff --git a/spring-integration-event/.settings/com.springsource.sts.config.flow.prefs b/spring-integration-event/.settings/com.springsource.sts.config.flow.prefs deleted file mode 100644 index 73c9299da9..0000000000 --- a/spring-integration-event/.settings/com.springsource.sts.config.flow.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri Oct 08 14:30:53 EDT 2010 -//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests-context.xml=\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n -eclipse.preferences.version=1 diff --git a/spring-integration-event/.settings/org.maven.ide.eclipse.prefs b/spring-integration-event/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index b2b77e81bb..0000000000 --- a/spring-integration-event/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:47 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java index 7f6c94cf96..ff43385abd 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java @@ -180,7 +180,7 @@ public class FeedEntryMessageSource extends IntegrationObjectSupport implements private void populateEntryList() { SyndFeed syndFeed = this.getFeed(); if (syndFeed != null) { - List retrievedEntries = (List) syndFeed.getEntries(); + List retrievedEntries = syndFeed.getEntries(); if (!CollectionUtils.isEmpty(retrievedEntries)) { boolean withinNewEntries = false; Collections.sort(retrievedEntries, this.syndEntryComparator); diff --git a/spring-integration-file/.settings/org.maven.ide.eclipse.prefs b/spring-integration-file/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index b2b77e81bb..0000000000 --- a/spring-integration-file/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:47 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-groovy/.settings/org.eclipse.jdt.core.prefs b/spring-integration-groovy/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c307b02b01..0000000000 --- a/spring-integration-groovy/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Jul 14 06:20:12 BST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-integration-groovy/.settings/org.maven.ide.eclipse.prefs b/spring-integration-groovy/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 105311c8dd..0000000000 --- a/spring-integration-groovy/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Wed Jul 14 06:19:35 BST 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-http/.settings/org.maven.ide.eclipse.prefs b/spring-integration-http/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 8436900862..0000000000 --- a/spring-integration-http/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:48 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-httpinvoker/.settings/org.maven.ide.eclipse.prefs b/spring-integration-httpinvoker/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 8e98617ce4..0000000000 --- a/spring-integration-httpinvoker/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:49 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-ip/.settings/org.maven.ide.eclipse.prefs b/spring-integration-ip/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 78b6943cde..0000000000 --- a/spring-integration-ip/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Wed Sep 22 13:42:49 EDT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-ip/.settings/org.springframework.ide.eclipse.beans.core.prefs b/spring-integration-ip/.settings/org.springframework.ide.eclipse.beans.core.prefs deleted file mode 100644 index d6d6b0ae2c..0000000000 --- a/spring-integration-ip/.settings/org.springframework.ide.eclipse.beans.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Fri Apr 30 21:58:37 MDT 2010 -eclipse.preferences.version=1 -org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=false -org.springframework.ide.eclipse.beans.core.loadNamespaceHandlerFromClasspath=true diff --git a/spring-integration-jdbc/.settings/org.maven.ide.eclipse.prefs b/spring-integration-jdbc/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index b638172b26..0000000000 --- a/spring-integration-jdbc/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 14:38:04 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-jdbc/build.gradle b/spring-integration-jdbc/build.gradle index 92540e21a2..9bbfcaa323 100644 --- a/spring-integration-jdbc/build.gradle +++ b/spring-integration-jdbc/build.gradle @@ -1,3 +1,5 @@ +//apply plugin: 'java' + /** * Generate schema creation and drop scripts for various databases * supported by the Spring Integration JDBC adapter. diff --git a/spring-integration-jms/.settings/org.maven.ide.eclipse.prefs b/spring-integration-jms/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 8e98617ce4..0000000000 --- a/spring-integration-jms/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:49 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-jmx/.settings/org.eclipse.jdt.core.prefs b/spring-integration-jmx/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 4956dd44c1..0000000000 --- a/spring-integration-jmx/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,67 +0,0 @@ -#Wed May 26 00:59:18 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-integration-jmx/.settings/org.maven.ide.eclipse.prefs b/spring-integration-jmx/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index cbb4641838..0000000000 --- a/spring-integration-jmx/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Apr 27 10:18:17 BST 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-mail/.settings/org.maven.ide.eclipse.prefs b/spring-integration-mail/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 8e98617ce4..0000000000 --- a/spring-integration-mail/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:49 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-rmi/.settings/org.maven.ide.eclipse.prefs b/spring-integration-rmi/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 8e98617ce4..0000000000 --- a/spring-integration-rmi/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:49 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-security/.settings/org.maven.ide.eclipse.prefs b/spring-integration-security/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 7cc8bac4a1..0000000000 --- a/spring-integration-security/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:52 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-stream/.settings/org.maven.ide.eclipse.prefs b/spring-integration-stream/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 85f2635658..0000000000 --- a/spring-integration-stream/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:53 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-test/.settings/org.maven.ide.eclipse.prefs b/spring-integration-test/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 28115bf0e7..0000000000 --- a/spring-integration-test/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:54 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java index 250ec443e0..d9cdef7122 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java @@ -20,7 +20,6 @@ import java.util.LinkedList; import java.util.List; import org.apache.commons.lang.NotImplementedException; - import org.springframework.util.Assert; import twitter4j.DirectMessage; @@ -207,6 +206,7 @@ public class Twitter4jTemplate implements TwitterOperations { return this.search(q); } +<<<<<<< HEAD public Twitter getUnderlyingTwitter() { return this.twitter; } @@ -260,6 +260,7 @@ public class Twitter4jTemplate implements TwitterOperations { return tweet; } +<<<<<<< HEAD private Tweet buildTweetFromStatus(Status status) { Tweet tweet = new Tweet(); tweet.setCreatedAt(status.getCreatedAt()); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParserTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParserTests.java index 3120200825..ae43f2b6d8 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParserTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParserTests.java @@ -54,19 +54,16 @@ public class TestReceivingMessageSourceParserTests { public static class TwitterTemplateFactoryBean implements FactoryBean{ - @Override public TwitterOperations getObject() throws Exception { TwitterOperations oper = mock(TwitterOperations.class); when(oper.getProfileId()).thenReturn("kermit"); return oper; } - @Override public Class getObjectType() { return TwitterOperations.class; } - @Override public boolean isSingleton() { return true; } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java index 0ec2ce3b2d..71f5eaaf00 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java @@ -133,9 +133,6 @@ public class Twitter4jTemplateTests { List tweets = results.getTweets(); assertNotNull(tweets); assertEquals(3, tweets.size()); - assertTrue(tweets.get(0) instanceof Tweet); - assertTrue(tweets.get(1) instanceof Tweet); - assertTrue(tweets.get(2) instanceof Tweet); } } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java index b0f6084343..0a56fa7c9e 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java @@ -225,12 +225,10 @@ public class DirectMessageReceivingMessageSourceTests { @SuppressWarnings({ "rawtypes", "serial" }) public static class SampleResoponceList extends ArrayList implements ResponseList { - @Override public RateLimitStatus getRateLimitStatus() { return mock(RateLimitStatus.class); } - @Override public RateLimitStatus getFeatureSpecificRateLimitStatus() { return mock(RateLimitStatus.class); } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java index aa8ccc8305..95c2508e66 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java @@ -18,7 +18,6 @@ package org.springframework.integration.twitter.inbound; import org.junit.Ignore; import org.junit.Test; - import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; @@ -29,8 +28,9 @@ import org.springframework.integration.twitter.core.Tweet; import org.springframework.integration.twitter.core.Twitter4jTemplate; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + /** - * @author ozhurakousky + * @author Oleg Zhurakousky */ public class SearchReceivingMessageSourceTests { diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java index 1b8d93ea76..8f3add8560 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java @@ -224,12 +224,10 @@ public class TimelineReceivingMessageSourceTests { @SuppressWarnings({ "rawtypes", "serial" }) public static class SampleResoponceList extends ArrayList implements ResponseList { - @Override public RateLimitStatus getRateLimitStatus() { return mock(RateLimitStatus.class); } - @Override public RateLimitStatus getFeatureSpecificRateLimitStatus() { return mock(RateLimitStatus.class); } diff --git a/spring-integration-ws/.settings/org.maven.ide.eclipse.prefs b/spring-integration-ws/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 85f2635658..0000000000 --- a/spring-integration-ws/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:53 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-xml/.settings/org.maven.ide.eclipse.prefs b/spring-integration-xml/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 28115bf0e7..0000000000 --- a/spring-integration-xml/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Mar 01 13:38:54 GMT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-xmpp/.settings/org.maven.ide.eclipse.prefs b/spring-integration-xmpp/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index bf157b8d10..0000000000 --- a/spring-integration-xmpp/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Sun Jun 06 10:20:24 EDT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java index 2bf0414782..23b27fba9a 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java @@ -89,7 +89,6 @@ public class XmppConnectionFactoryBean extends AbstractFactoryBean packetListSet = new HashSet(); XMPPConnection connection = mock(XMPPConnection.class); XmppMessageDrivenEndpoint endpoint = new XmppMessageDrivenEndpoint(connection); - - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { packetListSet.add((PacketListener) invocation.getArguments()[0]); return null; } }).when(connection).addPacketListener(Mockito.any(PacketListener.class), (PacketFilter) Mockito.any()); - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { - packetListSet.remove((PacketListener) invocation.getArguments()[0]); + packetListSet.remove(invocation.getArguments()[0]); return null; } }).when(connection).removePacketListener(Mockito.any(PacketListener.class)); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java index 375b043063..feb8b9be65 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java @@ -54,19 +54,17 @@ public class XmppRosterEventMessageDrivenEndpointTests { XMPPConnection connection = mock(XMPPConnection.class); Roster roster = mock(Roster.class); when(connection.getRoster()).thenReturn(roster); - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { rosterSet.add((RosterListener) invocation.getArguments()[0]); return null; } }).when(roster).addRosterListener(Mockito.any(RosterListener.class)); - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { - rosterSet.remove((RosterListener) invocation.getArguments()[0]); + rosterSet.remove(invocation.getArguments()[0]); return null; } }).when(roster).removeRosterListener(Mockito.any(RosterListener.class)); diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml deleted file mode 100644 index da937b98fd..0000000000 --- a/src/ant/upload-dist.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml deleted file mode 100644 index 116b9d557e..0000000000 --- a/src/assembly/distribution.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - distribution - - zip - - true - - - - src/main/resources - - changelog.txt - readme.txt - license.txt - notice.txt - - - dos - - - - target/site/reference - docs/reference - - - - target/site/apidocs - docs/javadoc - - - - spring-integration-samples - - target/ - */target/ - - samples - - - - - - - org.springframework.integration:spring-integration-core - org.springframework.integration:spring-integration-event - org.springframework.integration:spring-integration-file - org.springframework.integration:spring-integration-groovy - org.springframework.integration:spring-integration-http - org.springframework.integration:spring-integration-httpinvoker - org.springframework.integration:spring-integration-ip - org.springframework.integration:spring-integration-jdbc - org.springframework.integration:spring-integration-jms - org.springframework.integration:spring-integration-jmx - org.springframework.integration:spring-integration-mail - org.springframework.integration:spring-integration-rmi - org.springframework.integration:spring-integration-security - org.springframework.integration:spring-integration-stream - org.springframework.integration:spring-integration-test - org.springframework.integration:spring-integration-ws - org.springframework.integration:spring-integration-xml - org.springframework.integration:spring-integration-xmpp - org.springframework.integration:spring-integration-sftp - org.springframework.integration:spring-integration-ftp - org.springframework.integration:spring-integration-twitter - - - dist - false - false - - - - - - org.springframework.integration:spring-integration-core - org.springframework.integration:spring-integration-event - org.springframework.integration:spring-integration-file - org.springframework.integration:spring-integration-groovy - org.springframework.integration:spring-integration-http - org.springframework.integration:spring-integration-httpinvoker - org.springframework.integration:spring-integration-ip - org.springframework.integration:spring-integration-jdbc - org.springframework.integration:spring-integration-jms - org.springframework.integration:spring-integration-jmx - org.springframework.integration:spring-integration-mail - org.springframework.integration:spring-integration-rmi - org.springframework.integration:spring-integration-security - org.springframework.integration:spring-integration-stream - org.springframework.integration:spring-integration-test - org.springframework.integration:spring-integration-ws - org.springframework.integration:spring-integration-xml - org.springframework.integration:spring-integration-xmpp - org.springframework.integration:spring-integration-sftp - org.springframework.integration:spring-integration-ftp - org.springframework.integration:spring-integration-twitter - - - sources - src - false - false - - - -