From 9202dd01b2ea2b776e2ee85a01dff00c7e176344 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 10:18:13 -0800 Subject: [PATCH 01/21] Polish whitespace --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 25f1b5584f..78bc90796e 100644 --- a/build.gradle +++ b/build.gradle @@ -80,10 +80,10 @@ javaprojects = subprojects.findAll { project -> // ----------------------------------------------------------------------------- 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 // ensure JDK 5 compatibility sourceCompatibility=1.5 From 25e57563372780943c8314781332223fe15d07df Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 10:17:24 -0800 Subject: [PATCH 02/21] Initial cut of bundlor plugin --- .gitignore | 1 + build.gradle | 5 +- .../build/bundlor/BundlorPlugin.groovy | 125 ++++++++++++++++++ .../gradle-plugins/bundlor.properties | 1 + gradle/bundlor.gradle | 91 ------------- 5 files changed, 129 insertions(+), 94 deletions(-) create mode 100644 buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties delete mode 100644 gradle/bundlor.gradle diff --git a/.gitignore b/.gitignore index 0ba3856cb0..22d9c98516 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ .settings .springBeans build +!buildSrc/src/main/groovy/org/springframework/build derby.log integration-repo lib diff --git a/build.gradle b/build.gradle index 78bc90796e..4df5826631 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,7 @@ configure(javaprojects) { 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,9 +95,7 @@ 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" + // add tasks for creating source jars and generating poms etc apply from: "$rootDir/gradle/maven-deployment.gradle" aspectjVersion = '1.6.8' diff --git a/buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy new file mode 100644 index 0000000000..d566b3bc77 --- /dev/null +++ b/buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy @@ -0,0 +1,125 @@ +/* + * Copyright 2002-2010 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.bundlor + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPlugin +import org.gradle.api.logging.LogLevel + + +/** + * Contribute a 'bundlor' task capable of creating an OSGi manifest. Task is tied + * to the lifecycle by having the 'jar' task depend on 'bundlor'. Applies the 'java' + * plugin to the project if it has not already been applied. + * + * @author Chris Beams + * @author Luke Taylor + * @see http://www.springsource.org/bundlor + * @see http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s02.html + */ +public class BundlorPlugin implements Plugin { + + public void apply(Project project) { + // bundlor plugin functionality only makes sense for java projects + // if the java plugin is already applied, the following is a no-op + project.getPlugins().apply(JavaPlugin.class) + + // configuration that will be used when creating the ant taskdef classpath + project.configurations { bundlorconf } + project.dependencies { + bundlorconf 'com.springsource.bundlor:com.springsource.bundlor.ant:1.0.0.RELEASE', + 'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RELEASE', + 'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RELEASE' + } + + project.tasks.add("bundlor") { + dependsOn project.compileJava + description = 'Generates an OSGi-compatibile MANIFEST.MF file.' + + /* TODO + // prescriptive defaults + bundleName = project.description + bundleVersion = project.version + bundleVendor = 'SpringSource' + //TODO bundleSymbolicName = project.basePackage + bundleSymbolicName = 'replace-me-with-base-package' + bundleManifestVersion = '2' + */ + + def template = new File(project.projectDir, 'template.mf') + def bundlorDir = new File("${project.buildDir}/bundlor") + def manifest = new File("${bundlorDir}/META-INF/MANIFEST.MF") + + // inform gradle what directory this task writes so that + // it can be removed when issuing `gradle cleanBundlor` + outputs.dir bundlorDir + + // incremental build configuration + // if the manifest output file already exists, the bundlor + // task will be skipped *unless* any of the following are true + // * template.mf has been changed + // * main classpath dependencies have been changed + // * main java sources for this project have been modified + outputs.files manifest + inputs.files template, project.sourceSets.main.runtimeClasspath + + // the bundlor manifest should be evaluated as part of the jar task's + // incremental build + project.jar { + dependsOn 'bundlor' + inputs.files manifest + } + + project.jar.manifest.from manifest + + doFirst { + project.ant.taskdef( + resource: 'com/springsource/bundlor/ant/antlib.xml', + classpath: project.configurations.bundlorconf.asPath) + + // the bundlor ant task writes directly to standard out + // redirect it to INFO level logging, which gradle will + // deal with gracefully + project.logging.captureStandardOutput(LogLevel.INFO) + + // TODO tell the jar task to use bundlor manifest instead of the default + // and customize it with all common headers + //project.jar.manifest { + //from manifest + //attributes['Bundle-SymbolicName'] = bundleSymbolicName + //attributes['Bundle-Name'] = bundleName + //attributes['Bundle-Vendor'] = bundleVendor + //attributes['Bundle-Version'] = bundleVersion + //attributes['Bundle-ManifestVersion'] = bundleManifestVersion + //} + + // the ant task will throw unless this dir exists + if (!bundlorDir.isDirectory()) + bundlorDir.mkdir() + + // execute the ant task, and write out the manifest file + project.ant.bundlor( + inputPath: project.sourceSets.main.classesDir, + outputPath: bundlorDir, + manifestTemplatePath: template) { + property(name: 'version', value: project.version) + } + } + } + } +} diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties new file mode 100644 index 0000000000..4a1b85d2ad --- /dev/null +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties @@ -0,0 +1 @@ +implementation-class=org.springframework.build.bundlor.BundlorPlugin diff --git a/gradle/bundlor.gradle b/gradle/bundlor.gradle deleted file mode 100644 index 6672a01d1a..0000000000 --- a/gradle/bundlor.gradle +++ /dev/null @@ -1,91 +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 and configuration relating to the SpringSource 'bundlor' -// OSGi manifest generation utility. -// -// @author Chris Beams -// see: http://www.springsource.org/bundlor -// ----------------------------------------------------------------------------- - -/** - * Generate an OSGi manifest using the ant bundlor task. - * - * @author Luke Taylor - * @author Chris Beams - * @see http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s02.html - */ -task bundlor(dependsOn: compileJava) { - description = 'Generates an OSGi-compatibile MANIFEST.MF file.' - - def template = new File(projectDir, 'template.mf') - def bundlorDir = new File("${project.buildDir}/bundlor") - def manifest = file("${bundlorDir}/META-INF/MANIFEST.MF") - - // inform gradle what directory this task writes so that - // it can be removed when issuing `gradle cleanBundlor` - outputs.dir bundlorDir - - // incremental build configuration - // if the $manifest output file already exists, the bundlor - // task will be skipped *unless* any of the following are true - // * template.mf has been changed - // * main classpath dependencies have been changed - // * main java sources for this project have been modified - outputs.files manifest - inputs.files template, project.sourceSets.main.runtimeClasspath - - // tell the jar task to use bundlor manifest instead of the default - jar.manifest.from manifest - - // the bundlor manifest should be evaluated as part of the jar task's - // incremental build - jar.inputs.files manifest - - // configuration that will be used when creating the ant taskdef classpath - configurations { bundlorconf } - dependencies { - bundlorconf 'com.springsource.bundlor:com.springsource.bundlor.ant:1.0.0.RELEASE', - 'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RELEASE', - 'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RELEASE' - } - - doFirst { - ant.taskdef(resource: 'com/springsource/bundlor/ant/antlib.xml', - classpath: configurations.bundlorconf.asPath) - - // the bundlor ant task writes directly to standard out - // redirect it to INFO level logging, which gradle will - // deal with gracefully - logging.captureStandardOutput(LogLevel.INFO) - - // the ant task will throw unless this dir exists - if (!bundlorDir.isDirectory()) - bundlorDir.mkdir() - - // execute the ant task, and write out the $manifest file - ant.bundlor(inputPath: sourceSets.main.classesDir, - outputPath: bundlorDir, manifestTemplatePath: template) { - property(name: 'version', value: project.version) - property(name: 'spring.version', value: project.springVersion) - } - } -} - -// ensure that the bundlor task runs prior to the jar task -jar.dependsOn bundlor - From 19ca6a13b4224fab45d2c8c39bc10aa83d0c125e Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 12:00:22 -0800 Subject: [PATCH 03/21] Remove buildSrc in favor of submodule --- .../build/bundlor/BundlorPlugin.groovy | 125 ------------------ .../gradle-plugins/bundlor.properties | 1 - 2 files changed, 126 deletions(-) delete mode 100644 buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties diff --git a/buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy deleted file mode 100644 index d566b3bc77..0000000000 --- a/buildSrc/src/main/groovy/org/springframework/build/bundlor/BundlorPlugin.groovy +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.build.bundlor - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.plugins.JavaPlugin -import org.gradle.api.logging.LogLevel - - -/** - * Contribute a 'bundlor' task capable of creating an OSGi manifest. Task is tied - * to the lifecycle by having the 'jar' task depend on 'bundlor'. Applies the 'java' - * plugin to the project if it has not already been applied. - * - * @author Chris Beams - * @author Luke Taylor - * @see http://www.springsource.org/bundlor - * @see http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s02.html - */ -public class BundlorPlugin implements Plugin { - - public void apply(Project project) { - // bundlor plugin functionality only makes sense for java projects - // if the java plugin is already applied, the following is a no-op - project.getPlugins().apply(JavaPlugin.class) - - // configuration that will be used when creating the ant taskdef classpath - project.configurations { bundlorconf } - project.dependencies { - bundlorconf 'com.springsource.bundlor:com.springsource.bundlor.ant:1.0.0.RELEASE', - 'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RELEASE', - 'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RELEASE' - } - - project.tasks.add("bundlor") { - dependsOn project.compileJava - description = 'Generates an OSGi-compatibile MANIFEST.MF file.' - - /* TODO - // prescriptive defaults - bundleName = project.description - bundleVersion = project.version - bundleVendor = 'SpringSource' - //TODO bundleSymbolicName = project.basePackage - bundleSymbolicName = 'replace-me-with-base-package' - bundleManifestVersion = '2' - */ - - def template = new File(project.projectDir, 'template.mf') - def bundlorDir = new File("${project.buildDir}/bundlor") - def manifest = new File("${bundlorDir}/META-INF/MANIFEST.MF") - - // inform gradle what directory this task writes so that - // it can be removed when issuing `gradle cleanBundlor` - outputs.dir bundlorDir - - // incremental build configuration - // if the manifest output file already exists, the bundlor - // task will be skipped *unless* any of the following are true - // * template.mf has been changed - // * main classpath dependencies have been changed - // * main java sources for this project have been modified - outputs.files manifest - inputs.files template, project.sourceSets.main.runtimeClasspath - - // the bundlor manifest should be evaluated as part of the jar task's - // incremental build - project.jar { - dependsOn 'bundlor' - inputs.files manifest - } - - project.jar.manifest.from manifest - - doFirst { - project.ant.taskdef( - resource: 'com/springsource/bundlor/ant/antlib.xml', - classpath: project.configurations.bundlorconf.asPath) - - // the bundlor ant task writes directly to standard out - // redirect it to INFO level logging, which gradle will - // deal with gracefully - project.logging.captureStandardOutput(LogLevel.INFO) - - // TODO tell the jar task to use bundlor manifest instead of the default - // and customize it with all common headers - //project.jar.manifest { - //from manifest - //attributes['Bundle-SymbolicName'] = bundleSymbolicName - //attributes['Bundle-Name'] = bundleName - //attributes['Bundle-Vendor'] = bundleVendor - //attributes['Bundle-Version'] = bundleVersion - //attributes['Bundle-ManifestVersion'] = bundleManifestVersion - //} - - // the ant task will throw unless this dir exists - if (!bundlorDir.isDirectory()) - bundlorDir.mkdir() - - // execute the ant task, and write out the manifest file - project.ant.bundlor( - inputPath: project.sourceSets.main.classesDir, - outputPath: bundlorDir, - manifestTemplatePath: template) { - property(name: 'version', value: project.version) - } - } - } - } -} diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties deleted file mode 100644 index 4a1b85d2ad..0000000000 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/bundlor.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.springframework.build.bundlor.BundlorPlugin From 16899aa5cc465df446f4a809c314ad2392ee63f4 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 12:10:51 -0800 Subject: [PATCH 04/21] Add buildSrc submodule --- .gitmodules | 3 +++ buildSrc | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 buildSrc diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..c1f57ef30a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "buildSrc"] + path = buildSrc + url = /Users/cbeams/Work/spring-build/gradle diff --git a/buildSrc b/buildSrc new file mode 160000 index 0000000000..27e4c9a55d --- /dev/null +++ b/buildSrc @@ -0,0 +1 @@ +Subproject commit 27e4c9a55dbd67ef47651468ba290c8704d963f3 From ef2a51d9fa1d92fa2daa0a6f2d25ad5f5e1527fc Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 12:57:48 -0800 Subject: [PATCH 05/21] Update buildSrc submodule --- buildSrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc b/buildSrc index 27e4c9a55d..9d9c1cf9f8 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 27e4c9a55dbd67ef47651468ba290c8704d963f3 +Subproject commit 9d9c1cf9f8658dd2e82106372da6a3b987f39476 From 497aa09e86dbe3c5852b6ec8c7c9d38e16ba0477 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 13:07:19 -0800 Subject: [PATCH 06/21] Update buildSrc --- buildSrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc b/buildSrc index 9d9c1cf9f8..97b565004f 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 9d9c1cf9f8658dd2e82106372da6a3b987f39476 +Subproject commit 97b565004f9b7f9c658f8fb852d6ecedfe89f058 From 70d8a1681d79d14748145b388b55f848cc309b9e Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 14:27:21 -0800 Subject: [PATCH 07/21] Update buildSrc to v1.0.0.RELEASE --- buildSrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc b/buildSrc index 97b565004f..5949ed4de8 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 97b565004f9b7f9c658f8fb852d6ecedfe89f058 +Subproject commit 5949ed4de8f7f2e7332faf1a36c5b66096bcf416 From edae65ae5293f7fd90af7b94301bf3be57c4031f Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 15:07:22 -0800 Subject: [PATCH 08/21] Eliminate gradle directory in favor of shared buildSrc .gradle scripts once in gradle/ dir now live in shared buildSrc/ dir. Some hard-coding of Spring Integration specifics still remain and will be removed shortly. --- build.gradle | 12 +- buildSrc | 2 +- docs/build.gradle | 2 +- gradle/checks.gradle | 90 ------- gradle/dist.gradle | 138 ---------- gradle/docbook.gradle | 315 ----------------------- gradle/maven-deployment.gradle | 271 ------------------- gradle/maven-root-pom.gradle | 62 ----- gradle/version.gradle | 83 ------ gradle/wrapper.gradle | 32 --- gradle/wrapper/gradle-wrapper.jar | Bin 12538 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 9 - gradlew | 11 +- gradlew.bat | 8 +- 14 files changed, 19 insertions(+), 1016 deletions(-) delete mode 100644 gradle/checks.gradle delete mode 100644 gradle/dist.gradle delete mode 100644 gradle/docbook.gradle delete mode 100644 gradle/maven-deployment.gradle delete mode 100644 gradle/maven-root-pom.gradle delete mode 100644 gradle/version.gradle delete mode 100644 gradle/wrapper.gradle delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/build.gradle b/build.gradle index 4df5826631..eb42386217 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ // ----------------------------------------------------------------------------- // Configuration for the root project // ----------------------------------------------------------------------------- -apply from: "$rootDir/gradle/version.gradle" +apply from: "$rootDir/buildSrc/version.gradle" apply plugin: 'idea' // used for artifact names, building doc upload urls, etc. @@ -96,7 +96,7 @@ configure(javaprojects) { libsSrcDir = new File(libsDir, 'src') // add tasks for creating source jars and generating poms etc - apply from: "$rootDir/gradle/maven-deployment.gradle" + apply from: "$rootDir/buildSrc/maven-deployment.gradle" aspectjVersion = '1.6.8' cglibVersion = '2.2' @@ -412,13 +412,13 @@ project('spring-integration-xmpp') { apply plugin: 'base' // add tasks like 'distArchive' -apply from: "$rootDir/gradle/dist.gradle" +apply from: "$rootDir/buildSrc/dist.gradle" // add tasks like 'snapshotDependencyCheck' -apply from: "${rootDir}/gradle/checks.gradle" +apply from: "$rootDir/buildSrc/checks.gradle" // add 'generatePom' task to generate root pom with section -apply from: "$rootDir/gradle/maven-root-pom.gradle" +apply from: "$rootDir/buildSrc/maven-root-pom.gradle" // ----------------------------------------------------------------------------- // Import tasks related to releasing and managing the project @@ -427,4 +427,4 @@ apply from: "$rootDir/gradle/maven-root-pom.gradle" // @see gradle.properties for more information on roles // ----------------------------------------------------------------------------- // add management tasks like `wrapper` for generating the gradlew* scripts -apply from: "$rootDir/gradle/wrapper.gradle" +apply from: "$rootDir/buildSrc/wrapper.gradle" diff --git a/buildSrc b/buildSrc index 5949ed4de8..e02b8b97cf 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 5949ed4de8f7f2e7332faf1a36c5b66096bcf416 +Subproject commit e02b8b97cf6bd1e9ab6dbe2e1d7ed4848ded5d3d diff --git a/docs/build.gradle b/docs/build.gradle index b816d53880..6b761b33a2 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -15,7 +15,7 @@ */ apply plugin: 'base' -apply from: "$rootDir/gradle/docbook.gradle" +apply from: "$rootDir/buildSrc/docbook.gradle" description = "Spring Integration Documentation" diff --git a/gradle/checks.gradle b/gradle/checks.gradle deleted file mode 100644 index a06b4ec4a7..0000000000 --- a/gradle/checks.gradle +++ /dev/null @@ -1,90 +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. - */ - -/** - * Issue a snapshot dependency report across all Java projects. Detects not - * only direct snapshot dependencies, but transitive as well. - * - * @author Chris Beams - * @see snapshotDependencyCheck - */ -task snapshotDependencyReport { - description = 'Issues a snapshot dependency report across all Java projects' - - doFirst() { - def snapshotDependencies = new HashMap>() - - 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 4eb13be9e5c3355b057b87d44e59956b99e34b29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12538 zcmaKSWmsIxwk=N3-~ zcmJ4ktm^*O8nbH50gwcTfCT~h@Bt)IyXOnY`vCjv?R`MJPaAs^dT zo}s1D{~C(=&rlb8JzHBN`~NSc>=cou1rh{g{T-U>&ncq+_hKsl0+7}-v!*k!)N^o% zRMt>IRY7}=3K(UG`XGP=35iasPxx~>HHY=PEdmmZFVsqb5EH@_Au2iQ_w~~D#rgHh zWe=UFX=sZDzp@%-{O8HH$sf~mUQ9wL-86~x2Weg#CKooD$=D^p+B7qh7Z7uz$jS$>#K?L5Y?Ldhy@6+T5k_CwCN4Q}#@W6@Mfuh#Ait zXFSE8W#&{EN~#S5s$iv9_H@p!8k!E{S4nArcM*ECu%O~++(8R=xw4?7MMX>qSYP5YuwBul`7^toc%<-U;F>;_CI@}5J)8R1x5!or0jU5@-l z60U?Xm&TOpM`Q+|POVSOVcEE4w9heWOI3_rz9T-Hgmtb_pJJ)Z{2?fOH%&yE;s}0i zymd z;z6)=5?Ki*EVZ%ZWBJ8N%8$(Dv2X6wbEYz^UvEiU2JkNI3PS|BFaem?#rk#>Nz{@u zpL$;dj4`Fd4&8{e5%b+x)f=>$qq!5VNHSs>{lc00kx^`g`lZ|Ysv5a=`FYDpmHf8? z)_R-Gyp!C~H~cDOSZi0CE!np%3nLn@5QU!or3~A`HJH|Wl6>xsJbhN++sC0&`OCt( zZ7;i?z+4FF>GL$;P|oc#%{3C-(_x8e3-su$4zeyy*(*yD(E%* zP@{j+vOh&-cLDcd)V#tWXt6eSFs@32<@>SHNLH7gobA2Dqu47v%u)1} zj6#EY$8rse_}aCDv)B7;7{?J5O2i3r4|cNQhXh%iPTG=x%^RBP)}~D#Vvou29tE1w zIKaT9lzgv9Q;JAaC;BXH_T<0*=vEkP?TDIlkd~)`q%I`@s4NX_6K`)ly+z~-sv_%^ z+lM&RPt#J|7*?rtx``P{H5*d_0`xp^e<|~&5=#X2vUE%Dx;&>Y?>!W#K%@a`(9EJ0 zpaKFd*KcpgJ9o;Nw%CuH4?`S0xZARa-JHa9O`54nHKweIEeeZ8-9VudaO(%lwMVGc zD`3&*KOj@thP)zp-V*N=WQL0#xdd&Y$#DZjZ;xPGGEA}ExGs7O(0|e8;8$ivBfkhk zo{>&Oc=Ma`NaEt3McgfCI8|+gQyqkDan_>0)C~i{#&^KZoLsRn#lvyl;9ywmHclyZ zML}6zY+rdbaf%|#d(M#O3EYoiznkjxjI$1+cWY^?>QK_iL!O?~FHdg$g2EPStTqA9 zP}O*bN(ou6_1#wmr9D|}jhaU|C0>7JtxHhggO8aPvfcWSzYu7RE8;T`)ACH?ZtG7q zS~+KykH`mQnweFC5Q|5gt_^Wi2QJj>f^3rXYjR<}Vv#7p4|7)$^vv-B+=4@_5W(@X z?o0X!hhpazQ=CJTYMOl%-t~yLGU>5|XmzCtm4w&uxcK%4KKJn#HG8$z!cw2y9UgCm zfpfPgxqSVdz8f#c4eG}YSp09$XM|Ew?B2!sm2_X?2qUI7^XTmcl^92||T0QNTT6~xiZ$U#ic`n~+v z|4$t-Q$aOB`xZnK7k~^Z5JBx^f%3tuUVbE}91IN+IX7*+4M|?-Qs=^ z_k=TJ=FVT|EU{>B_S;2tiPyTgk7a!)=Y{=+*TwVd!TP<->+3-@If!jU{TwOBBo`Qg)05rK3xMbax`zD>6s5C|o-Q2@#~UPF&@E`!uYnb7hN* z-DTxQGHPV(4HaW}3J4|T+Auh=DO$w|Rosq*-;~<3`=?7{A|jW7)+8Q1kaFYmGu6nf zBRv%s%YOU{MpRu6Led8z65~bAMEPncexw7mw8djHp}9Hrvh}ge5yp$~LiJ^9y-MI9 z31(wi^4LH?p~IFAujuH{B|#9lUNWx=3hm3f+6j93Lo^l~~=Uwg=*4^Y+T=cSQN%%){z zwB}IQ0%=LIl3zS1H6FBa%6(v(c+8 zU!s@KQAE*C!AA1Ter6aPTb2L_rhF#@M_v+%wqAR(E5ua$ogguc(R+1A1}U3-IU#RU zzh43U8toMNxnbA)Jeby1Ek__lS{gdAby=8y&3XiMiK-fUEr^8&jFnzx z3}H27Oi9FBB^crk9UYln)j1=m1I_9u@>z0utV(8P>nn}(yn+~>&^;q$doPRqCN7&h z?Ii_wPGLPTTOkl&J36hfbf_L+bw(b(b~XA1U0k;N;a}zk3@)$0t*Kxv*`v+bM1N$_ zGp>=5$;~$5iyIbg{W1G$DpB8GcfvU)X38p4&X!I^LOfDF%#({VBZJ91Ap@)%#f2+i zWx=hOi^HZiI^D5U5a-@=)h$(5QQnWQAtJ$rSK{k37jK&9R+4~=SUBo)SyFuL>=hM8 z3kZ-dEr|_tq-i4xC0aL`)YfupN55meR9=3zbV$wy0;K7PS&`z!#tUd1Wa@UntiO5n zvuFfpr5J~~k8rqHdb(FH)$@Z&+tSO2jF>^wTk*z~xihn$buHd~F{Y&^I?;{Hhhse}#L#g7`6NBIIu(|v?vfdcM=%i@e^PXkjPF**%FsfPr6V;!2zs_{JIy1-0MA0M5 z;L}2V;E>5eoz=?u+L=k%%WJtsH|zlZD`vJYA@dpW>l>J1#>PaZsT|Z=2=eL9cpwJ+ z%n4}IR1l$~!ydBlwvo92A1X(PikK9*OfGagNnWLxlEA{m9AWTy528^e24!llDE{6L zS_O=u+*cDPnc@pg-Bc0iBmhnQU~_J*WFV8lCJpCQZ|lS44HBt#{cM>g6CE#40kn;i$1indAu z8V>))rrpCc{RT%XtWFmTWN46g4_L>nUK0O4%8X1-tL@Iw=@AwCVCR0iuhvKqbr76} zwn|$-5TfDwc|hzECe0ysi%PtIt;P`E!D&@3{Q>iz9M1@vbY=(+0s;dK0z&p@jtA&D znhH2L7+LB6KV~miv{G34iu4T;PV&PRfSo_f>_iZ|6RI>I&q~l1wx3@fy2vdVCJyWC zCLC@(sc38}*~T^Vw2pv@`XLGP(fwz_&j`t5w1YKBk zRIjA-ZV}A|yB=Y%88R##$=gU@8-&&POQ0_nc%$@aj_ziZ?}gN;p0?;zr=M?Zs5Z^9 z>U8xeLzQB(21TMX+k#|5`rh1ge)`YI;k5+PAjika$DwMAs8*ZG;11h+lTYqp88`t^ zIM$r?WF}(eO3D`rVL0VQvmFqKjCcXPljnH$k4|Jj;N&k z)H=7}Xl13Far2O|8o3Ir+YzGuf&|)QyL5AZ7P9nhn>!Nf{*0CUOA;KIHo0tO-p|N( zT2*6~+$OQH9yS?#XQuTEp07#}TWzS9pClp~HSG*vtzjCQ@IOo#P3G6rV#A-m6`b%S z98U-nqfp7^F_Z40S;!!Ti26O(IB6=?5)3viSNu3Ds@LkXsPK^Xj;4oYU1OdZ9-)BC z+^h*CgrB7SBFnsiR!?CWssyt3eGf&M2Q-~Y+5G5N4jA|xd~n?+VP)u+Aw18Xb3)-A;#KjG0`ZeVL+P3E zU9&rgQN z*FkRMSW~ef!%tlaNjIE*PSe&u1h>0j>MYM8(g(x}oYcu)A>&X!)xn$B;pUzcC2$n) zMim7t5SJ(m;^>qFplFfKW=~RN2M8Jju(FjC^75o$v3kRhnW~ucjE!R&qWDz+QRR{PZ?)uL5(C0sVPe>u+4t9Thx zmZNlab1vw)i{3$QDdHw8G*1y3Dr{7rWZE6CMV4v&w3najH9L270AQtZM4@t>r&d*2 z5(T%x6w8=Q((BF-C=^hGiMr@VKtT?BdR2^8cliIL+S3M%fTObE9lILlgv25a1ccYT zYYuJTbI}5y(NTGo9Tla&^p}80ed!7dE#x4)9DV}?5HF`*-(Cx`g;28F4xYNzUAUb_ zc@*BA33A9j_EtP3_^jS9_W9kK(8zMV0$W&@?sd+EC8DnzM5Cjigq3E$#Cs-Jgc=$k zQmhFy(xkT+!#SQoSoMau8X)K;xqs$^;5xD2kWIUT(yy6POv9q-EO(4n$ldg4AZXZ{J3^CzCgf)H z5g^KQMO3&Zn=o)z%z>jv($IzKhe|0#iNPLqT_iL+H7ZV|HFy$b%qO zsM+;5%EukVe$W?Gfm?e8|lCvtb!xua1%fOYRgHV0NZ0J7Uf|^f%<~??t zPLE1g$6Nt=6tbmIh={qRARNx**tLh+6NscYj*VW(3CH*r#`q4M&AlDy$M0n8q@I2w z4`>(L4iTGhuSOMeceF-)fV+qqe9Gs*^>zUo{|6M4P%OfI^luY({KRdUJJKdPh{oc1Mt>K8$j?2*0g81=Go^;0X7sQd-@PZC={fBro5 zPGWcOIw!%ON$lTZ;=eeoPg&!An}PNU!G;oM+T`ENG8tq)AYDmGVrIqARo)e4CFR?o z$QFi-4kR9en0|hFg68r%mU`oV)=gp>yDd&Wiax$AGmNl|N3{7I?Q+k3aN6wY;e7Vv z?eT@s$KpYtcSd#BPD2in%IIgP-w-RsUaa^ zV5TC{3vNo03k#vLAonVv+?E2}j?#lIC$wCVD!_Q*C50XxLWdu+~{Iu7_WW{kp4-(8faIvV#yaJPcXW!I&sP1uLV87Qc#ZE>L3AKcrg_`zBR=93m>< z7exf;9E}hJfr=3w8{oB?XzSB6qf58lL#ni5eCw2vYk0W-JpkG@69HfB0SW)=LA9H_ zNmR6{9Hrd6q4#)#8*=(q?VZU>u2215o zLGikh+WItjeNv61kX@S+;Z5(31B}k5#YgRbQ=7#rvYdj7DL+^hEajihEc8+{&i8X3`f3b#p%;Gp0WJU)-E&(I8 zwASUri>yc2w5&#v!)RPNVl;el8j%n-`n*^$K(s@2HEggIE2nTGHi`HGSi>JVxP=)# z{iYL2&R1??BQwabD-@TWfmJK{so3qr!mQebf%%%zy~`!Rf5VU(u{Pre5oR%=zup%S zZ#f@h2wQaGtQq22AF}RTx>X_9(LfKF=+;Y+Ef`G1Nt5Y7ZW!6-OM)#k%yZ%|JKZn0 zdy7IcJFKw~X8Wdhvbes_b8K!={bU-8!3SpXxZrI*m}dKzDB5Jy%cE<)A2JN1WhSe> z1@x=wbh?0TJi+`rIg=jPj3&U%Zic`5l=!W8)8@O(q##hXPKPd+b(1=`JmQXt3#{XA zoT=qi_`b|Lj6WLObWTGHvZSeM*cMe;Y$PpRZ`-HvASlJu=f%Cgu$}hery?yUZ!O0m+>?_~V~6m^Fdh zWc5yipfDgHw11{SK^q%K2gmou%3oa-1xG!5$G=52HJ6!pPK2VbK^H(F2gN1Gqh%R4 zcF9Id`!3jxaqNR*QVgSI=uw4kIFzu9OM z8D+9h=a6`@-h8Ly{q{=kvv8Fgf!v1LrG&M>KyLuLK)U+fR^hAarA_FIGeo%l4`Si~ zm)yMMP+f5(7o$}nFQCfE}3UBNc zqaqAs&}Esi={T+s0b@r$k|u*>S~hzw)-UUJ_09P(^~q4wkt7i%9R*tHNm}E{VpFyr z*Z#WU;+lM*V}`qBaXogU{7u2pA|kS6iSaJ(oP85(4^mBE3}O1>pk;}Mxr9ojJ=K9~ zid+UK{6M69{qU|!RyYjQ65MWsnp4kt4xyFZ$h?$)4&{|#`)KDmvv9kIi(>dzl8ZF6 z0y}H^OoHkZ3vS05&0&d^iBx^BIQ6+1)~a|poyoGWBcXbJofd|Ww+0fOq%h^K6I2OaAR2&=<1&t%S)YdRk!Br z{G`9+9LMlU`bL#pno%&w5zlyBMr&g!UBZ;0h>Zm8JadNB;sYdevZ82VqR}mL2`#;; zwwNI^ci$lpm_#XQu4}SyMsSZDqSLU7#(_ab*L=nNr*ql zblpGr>YaX{@Zq`-jA=J_N*ZUi3|1+|Wpk+kiUZT2dh&a-wZ$4U_!dan=x>~&)$QYe zEYB_XB&K+ixgX$?1!%d}`hE(CmOsV)2r+P{ISv$F2(thv9e2E2(wAg* z;AbW#3*=k$1XisoFD1YR3i;sC&eMkDM9I43?Ai^jBC&P~CN43jExtWzk*^+38HbdP`9!f0O>olaHmbPmGP9xU%LNUECub&id`Uh>b`5 zH{QO34@pUybsd6=Va{JYO!c8pRa88q=Bq|<``y&hWkD0nF-lDRu)rDG=%4NQz!^2rBb^o!Y(SnGQkdU_hC|k;@Yo3=bCALj7u8D~ z!9o1kNit=!AR+_GUP$6@%7Xx7LQ#mEGqEl0M=GhSNRf$c#!9hM7=J_`Upn~Wo2WzW zVwcjH7e2r&rI%uhR7jEzW_UyHcf$%1%69m11SdcZ5_50>vb$ISZ@pXO`W4N~6(bv8dQvb7n0<_D-Ei^lxIcIVtLmrdB@mVh zVOpaocKez{k4XB%fvkCWshBNrI4)D(w1GNL3}_eMlYAT_>S~Cr$wzU;lP3NUo2rZmu z(^{FeOd6Y|#^#w#2j(dyk+J3!^xnzi4AmP9{+p#(%m=)H&zAUw0Vixlg-D^VlEq=KJ-@r>{hEz&dTxR$dfC zW>*gr52&XaBx>lYIAHJ)5j5bmyH(5NDWl9wKZ|MjkP}4iDAfy->?vME?{S6x$V*AB zldxr>{bjFjq1~11<3=ZY`vWk_K z`$MR0Th>;5P^SA8GyOL@xF3^pK{~^i)Sv0M7qowU?Xh8PBdOguQVrWUQT5|dN`1>c-9?Z^@?o3eN9HcSogmNLznP?@U*(Lm*|0zfq^_59N4`t3H}Vun$7QOBOUx1A?UtBJ_%qGXy8m>dGR4&yFdlK zP~1v;<6Map4Oh+7VxxPap`ahJGNokmtQs*uNI6SX&$$+TO{10_`w%9X6*|XPtT$qw zg_Y#aO-6vgkzf+vLQJBF4zfpU6)y^+g+7-y#;4uJi^llw3?^AFusJ!tA^!$ocYdtP zVOptVN^^GXZbdy_QDGVESGa!6h)%`^-D7OgW)qFIhOt@jFma3+;0%!?kW7xjbJw9O zrDxn9*H@d36gk_PYuw3(d|ty7daL*JD9PM0;a{!La=K>?*yc(U`3KrOemv&U=()h(_J zyG$h^f>W+gOWB@w*8v5z;%cE5W*Z z5>sycs?)m|{QEo%6M>9J_T{QXC?3+>3DK|9HMM(}B(QanGE-letUu0Qr;_yS90CdjfJHnSW%IvsI`2VJ9BQyMi&XjinZ z*O$9Sd=ytCKbOOL@lXU`cGY9syj0+`XIY@mFeYt)Rklz$|ShVGhzN08D zYEd%U$*43QCkmg(^rL_ZUMcj1MM=a%sXp8MQje%uK$ij@B6`V6W9r+F>~Zv$#^H_* ztw}UwsN?$;;6~?wU7>H|4W8?dw2BLuAk+%vTntoz$*?=w=%U88{Mz#qO@YQ;n9&G) zeQ*1+yij@}(9FC!Te;{aIs9|M8GBs9Fur&Km3Jk2dA<{AvSh3uJ-E~=k5IW{z5OZ` zmNIoGz+(0bP?1u9jxp{Wagsbpy_7DimMNY@s2tUIsZuKeZTO_zwP*mp!P5J*Ohs)8 zgGue`g$JmEr|`}pX+Ed-&>k-@%B$W!YoWbFGI$=DM;nK(8$a5MQ?N|?N_xtSQ`BvW zxRh*)pymemz^%uaXQAq+0I7L7XeOfoyFO#^`yx2jIm;pp0n^fDrtM8Tqi%pzca6N& zUM?RS)KN1#ScEWLp3PA585D2eGyGh(XUej1(V2O0fiw0o(cDnt?&w%A1;A>_fl@Bb z6SWkj%~I(rJwqcTmH`H_TsZzpv7HEIzM0;xf7kW9%ImAL_@ZNB#?(Oc*rnPd*3Hy( z-R&Y?jQIAEyEr0fHwD_wSxQ^W4fgTNk~Mm|qB>iH(DdLoZ=He!Gc~HpaGX{`@#Ck) z_+!$x23C2QeIw8NerLw!^Be9Kf}aDHwe&AqX2jmdTNJ}pqmm+q7({Hw9m=)enJnAl zX7G*ZdBiZSY9C~#wNCDP%K)ovYYjG2Ct(#uG5vYGNDbWr&VCiP;$}e=T}R+aU*$Bo zIvg;&U>jlkfOq zhnKtAN?u?sACeVHM>X?KERIB4z#Ktugh(>qYV~2Uhh%&Cs)nPp;s_bzE5yZ&d`yKt z>vgmwYME0&slH&k1K+I>|8Z5ce<`)~GoJ>3p<&N4nC8kr4oa>?cw4GqTFYrWn=*OU z_L-lBBD6H7ytvpBdc2G76e_DLn0+%6(3Dh5quK37VATX{2MIT!H)OY&|6nJXe~bq^ zaSnza7NoxR7oll_5^prU3DWvz61muDY%-CR?Tir0A?ptuFUl)h;VuTM61`9Ss%5to#JkV!Z&zMkCF znZr`eNz`xTEiqmAaSJ!NF>7ATAf3AGk#lYV=`Td&woy13`1UEjq6<{t$uGbW0wWKR>jAwaQxPcinJD25kQjH(F^isOk9#a3 z-;DUvSUyFlJun^+?k%ESM1z>y3iWM=gG_x-SvRC zKv6vugc%sSJr2ATfeV|Ih+^B;qt4xk;&QA4vns@NVbI2$ic63G5s>1%V?AH;EQW6Y zfoCYfB|a{ymYZP^>F!%hmvm?(e3uJ*(aC*uR?3LEz|E*RyoO^-oGU+aeM#4rTHTR~ z%f4k?!E*?>KqlE#tjSBW*B_e>FTBz=PvGVWyysjTip94NrCR7qj!!)bJUQxt2C#=b z?T2*-39uNih2l<3o#qZ{QaFw;LO(8Pbmy={&dHzB*|Cz0v#BQWZl;xA3T&_P6!s_k zC&UeUPED)5&)E=|U^J1g%Q zxNN4`L-!}t0;_=4_B8is9#I73&xiF(=9{-ShP2{Z-W72m&{*HU;kkqaZrRW8Q>(62 z8fx+NZre)Nw9peQSUDyHk0(V(Z{|9-`UW=R0#B_Vl?}v<&+Zx3Un6T_5FYpSXJ;)gYmF8av1IGx6%kB9xhA zl3uJuW&Y4jGPn!!#kLK#n+P2EIC@~qO4l}taVJkxqRdq2i|jVVXI6O^<*Q6Sc+`p} zUyE@A&Lw}*wsQ2*$Mp0Op2nQ48miVLWgQmVC({1nxaQS_mQKe3??$_}&v8dL$+zX1 z1!IMF$vT^|JFmTPp70+5l63nF^>{g6 z(2C1^{fGPauR!j4iaM+JfbZ`U?LPyh1!Tm(iYO@3Nq@bO9vzXAq@|lekffy=ADyU` zXP9N)+`As79TXpv9-|hg0fjvdG6e4CsZ%y#k{0ad=?`|-V;`y=W1!^&jS7G#*f;i% zWXAhPTn8i=m>QJ3nE5C9{`Dsbn4}nJc^F3mQgFeS{N`@WuFdb(XHYOS@c(X*eqZDJ zKms`v`0Mj8yY&B-@$P8*_xLM= Date: Tue, 9 Nov 2010 15:43:39 -0800 Subject: [PATCH 09/21] Pick up buildSrc changes for Version and preconditions --- build.gradle | 8 ++++++-- buildSrc | 2 +- docs/build.gradle | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index eb42386217..0bb73b7181 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 // @@ -27,7 +29,6 @@ // ----------------------------------------------------------------------------- // Configuration for the root project // ----------------------------------------------------------------------------- -apply from: "$rootDir/buildSrc/version.gradle" apply plugin: 'idea' // used for artifact names, building doc upload urls, etc. @@ -48,7 +49,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 { @@ -407,6 +408,9 @@ project('spring-integration-xmpp') { } } +project('docs') { +} + // 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' diff --git a/buildSrc b/buildSrc index e02b8b97cf..70cb55ebdb 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit e02b8b97cf6bd1e9ab6dbe2e1d7ed4848ded5d3d +Subproject commit 70cb55ebdbecd57b0618aa2b9a733ce86b98e25e diff --git a/docs/build.gradle b/docs/build.gradle index 6b761b33a2..8d542f61ce 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -16,6 +16,7 @@ apply plugin: 'base' apply from: "$rootDir/buildSrc/docbook.gradle" +apply from: "$rootDir/buildSrc/preconditions.gradle" description = "Spring Integration Documentation" From 5828134799d30f8cf5993be0c815746953c82c2c Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 8 Nov 2010 16:56:04 -0800 Subject: [PATCH 10/21] Make doc symlink creation more robust :docs:uploadArchives symlink creation now checks to ensure that any existing wildcard (e.g., 2.0.x) or 'latest-ga' symlinks do not point to targets with greater lexical value than the version being published. If so, the symlink will not be overwritten. EXAMPLE Given an existing docs/ directory listing as follows: 1.0.3.RELEASE 1.0.x -> 1.0.3.RELEASE 2.0.0.BUILD-SNAPSHOT 2.0.0.RC1 2.0.x -> 2.0.0.RC1 latest-ga -> 1.0.3.RELEASE Upon publishing 1.0.4.RELEASE, the directory listing will update as follows (asterisk indicates added / changed entries): 1.0.3.RELEASE * 1.0.4.RELEASE * 1.0.x -> 1.0.4.RELEASE 2.0.0.BUILD-SNAPSHOT 2.0.0.RC1 2.0.x -> 2.0.0.RC1 * latest-ga -> 1.0.4.RELEASE This functionality worked as described prior to this change. However, it would break down in the following scenario. Imagine the existing directory listing had been as below, following the release of Spring Integration 2.0.0.RELEASE: 1.0.3.RELEASE 1.0.x -> 1.0.3.RELEASE 2.0.0.BUILD-SNAPSHOT 2.0.0.RC1 2.0.0.RELEASE 2.0.x -> 2.0.0.RELEASE latest-ga -> 2.0.0.RELEASE Note that latest-ga points to 2.0.0.RELEASE. Prior to the changes in this commit, if a new GA on the 1.0.x line were to be published the latest-ga symlink would have been incorrectly updated: 1.0.3.RELEASE * 1.0.4.RELEASE * 1.0.x -> 1.0.4.RELEASE 2.0.0.BUILD-SNAPSHOT 2.0.0.RC1 2.0.0.RELEASE 2.0.x -> 2.0.0.RELEASE ! latest-ga -> 1.0.4.RELEASE ! indicates the mistake. We want latest-ga to point to the latest GA release at all times. This now happens, such that the directory listing would be updated as follows: 1.0.3.RELEASE * 1.0.4.RELEASE * 1.0.x -> 1.0.4.RELEASE 2.0.0.BUILD-SNAPSHOT 2.0.0.RC1 2.0.0.RELEASE 2.0.x -> 2.0.0.RELEASE latest-ga -> 2.0.0.RELEASE Note that 'latest-ga' remains unchanged. This same logic applies when updating wildcard links. In the rare case that a 1.0.4.RELEASE were published *after* a 1.0.5.RELEASE, the wildcard symlink will not be updated. It will remain pointing to 1.0.5.RELEASE. --- docs/build.gradle | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index 8d542f61ce..0c2b368f33 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -228,18 +228,47 @@ uploadArchives { 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" + def unpackCommand = """ + cd ${remoteDocsDir} && + rm -rf ${version} && + unzip -qKo ${archive.archiveName} && + rm ${archive.archiveName} + """ - println "Unpacking docs archive: (${unpackCommand})" + def wildcardSymlinkCommand = """ + cd ${remoteDocsDir} && + if [ -e ${version.wildcardValue} ]; then + currentWildcard=`readlink ${version.wildcardValue}` + else + currentWildcard=-1 + fi && + if [[ ${version} > \$currentWildcard ]]; then + rm -f ${version.wildcardValue} && + ln -s ${version} ${version.wildcardValue} + fi + """ + + def latestGASymlinkCommand = """ + cd ${remoteDocsDir} && + if [ -e latest-ga ]; then + latestGa=`readlink latest-ga` + else + latestGa=-1 + fi && + if [[ ${version} > \$latestGa ]]; then + rm -f latest-ga && + ln -s ${version} latest-ga + fi + """ + + println "Unpacking docs archive: ${unpackCommand}" sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: unpackCommand) if (version.releaseType != 'SNAPSHOT') { - println "Creating wildcard symlink: (${wildcardSymlinkCommand})" + println "Creating wildcard symlink: ${wildcardSymlinkCommand}" sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: wildcardSymlinkCommand) } if (version.releaseType == 'RELEASE') { - println "Creating latest-ga symlink: (${latestGASymlinkCommand})" + println "Creating latest-ga symlink: ${latestGASymlinkCommand}" sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: latestGASymlinkCommand) } println "UPLOAD SUCCESSFUL - validate by visiting ${docUrl}" From 65b838b5defd8a873e5138ab296436c0f12ccbd9 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 8 Nov 2010 20:39:50 -0800 Subject: [PATCH 11/21] Factor out 'remoteDocRoot' property Remote path '/var/www/domains/springframework.org/static/htdocs' is no longer hard-coded in docs/build.gradle, because (a) it will be needed in two separate locations as schema uploads are developed, and (b) this value should be easily editable during local testing. --- docs/build.gradle | 6 ++---- gradle.properties | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index 0c2b368f33..221abb5d16 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -187,12 +187,10 @@ dependencies { scpAntTask("org.apache.ant:ant-jsch:1.8.1") } -checkForProps(taskPath: project.path + ':uploadArchives', requiredProps: ['sshHost', 'sshUsername', 'sshPrivateKey']) +checkForProps(taskPath: project.path + ':uploadArchives', requiredProps: ['sshHost', 'sshUsername', 'sshPrivateKey', 'remoteDocRoot']) uploadArchives { - def sshHost = project.properties.sshHost - def sshUsername = project.properties.sshUsername - def remoteSiteDir = '/var/www/domains/springframework.org/static/htdocs/' + rootProject.name + def remoteSiteDir = remoteDocRoot + rootProject.name def docUrl = "http://${sshHost}/${rootProject.name}/docs/${version}" def remoteDocsDir = "${remoteSiteDir}/docs/" def fqRemoteDir = "${sshUsername}@${sshHost}:${remoteDocsDir}" 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= Date: Mon, 8 Nov 2010 20:48:48 -0800 Subject: [PATCH 12/21] Initial cut at schema publication. No symlinks yet. --- build.gradle | 3 +++ buildSrc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0bb73b7181..0f7a6805ec 100644 --- a/build.gradle +++ b/build.gradle @@ -99,6 +99,9 @@ configure(javaprojects) { // add tasks for creating source jars and generating poms etc apply from: "$rootDir/buildSrc/maven-deployment.gradle" + // add tasks for finding and publishing .xsd files + apply from: "$rootDir/gradle/schema-publication.gradle" + aspectjVersion = '1.6.8' cglibVersion = '2.2' commonsIoVersion = '1.4' diff --git a/buildSrc b/buildSrc index 70cb55ebdb..522c0d1a46 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 70cb55ebdbecd57b0618aa2b9a733ce86b98e25e +Subproject commit 522c0d1a4696c941dc36bd6210081e042efcd48f From af26423502320cfec33c746b646d2a2d66d060e5 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 16:02:07 -0800 Subject: [PATCH 13/21] Move docs/build.gradle -> buildSrc/docs.gradle --- build.gradle | 3 +- buildSrc | 2 +- docs/build.gradle | 275 ---------------------------------------------- 3 files changed, 3 insertions(+), 277 deletions(-) delete mode 100644 docs/build.gradle diff --git a/build.gradle b/build.gradle index 0f7a6805ec..359d306af9 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ configure(javaprojects) { apply from: "$rootDir/buildSrc/maven-deployment.gradle" // add tasks for finding and publishing .xsd files - apply from: "$rootDir/gradle/schema-publication.gradle" + apply from: "$rootDir/buildSrc/schema-publication.gradle" aspectjVersion = '1.6.8' cglibVersion = '2.2' @@ -412,6 +412,7 @@ project('spring-integration-xmpp') { } project('docs') { + apply from: "$rootDir/buildSrc/docs.gradle" } // add basic tasks like 'clean' and 'assemble' to the root project. e.g.: allows diff --git a/buildSrc b/buildSrc index 522c0d1a46..86070e09b5 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 522c0d1a4696c941dc36bd6210081e042efcd48f +Subproject commit 86070e09b55613c3a97e462e25df7a5a5c572f74 diff --git a/docs/build.gradle b/docs/build.gradle deleted file mode 100644 index 221abb5d16..0000000000 --- a/docs/build.gradle +++ /dev/null @@ -1,275 +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/buildSrc/docbook.gradle" -apply from: "$rootDir/buildSrc/preconditions.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', 'remoteDocRoot']) - -uploadArchives { - def remoteSiteDir = remoteDocRoot + 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} && - if [ -e ${version.wildcardValue} ]; then - currentWildcard=`readlink ${version.wildcardValue}` - else - currentWildcard=-1 - fi && - if [[ ${version} > \$currentWildcard ]]; then - rm -f ${version.wildcardValue} && - ln -s ${version} ${version.wildcardValue} - fi - """ - - def latestGASymlinkCommand = """ - cd ${remoteDocsDir} && - if [ -e latest-ga ]; then - latestGa=`readlink latest-ga` - else - latestGa=-1 - fi && - if [[ ${version} > \$latestGa ]]; then - rm -f latest-ga && - ln -s ${version} latest-ga - fi - """ - - 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}" - } - } -} From a34f10c2303b93bed5a7dd6eff6aa5de338102d2 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 9 Nov 2010 16:31:53 -0800 Subject: [PATCH 14/21] Polish --- build.gradle | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 359d306af9..9582c9ff64 100644 --- a/build.gradle +++ b/build.gradle @@ -29,12 +29,16 @@ import org.springframework.build.Version // ----------------------------------------------------------------------------- // Configuration for the root project // ----------------------------------------------------------------------------- +def buildSrcDir = "$rootDir/buildSrc" + +apply from: "$buildSrcDir/wrapper.gradle" apply plugin: 'idea' // used for artifact names, building doc upload urls, etc. description = 'Spring Integration' abbreviation = 'INT' + // ----------------------------------------------------------------------------- // Configuration for all projects including this one (the root project) // @@ -97,10 +101,10 @@ configure(javaprojects) { libsSrcDir = new File(libsDir, 'src') // add tasks for creating source jars and generating poms etc - apply from: "$rootDir/buildSrc/maven-deployment.gradle" + apply from: "$buildSrcDir/maven-deployment.gradle" // add tasks for finding and publishing .xsd files - apply from: "$rootDir/buildSrc/schema-publication.gradle" + apply from: "$buildSrcDir/schema-publication.gradle" aspectjVersion = '1.6.8' cglibVersion = '2.2' @@ -412,7 +416,7 @@ project('spring-integration-xmpp') { } project('docs') { - apply from: "$rootDir/buildSrc/docs.gradle" + apply from: "$buildSrcDir/docs.gradle" } // add basic tasks like 'clean' and 'assemble' to the root project. e.g.: allows @@ -420,19 +424,11 @@ project('docs') { apply plugin: 'base' // add tasks like 'distArchive' -apply from: "$rootDir/buildSrc/dist.gradle" +apply from: "$buildSrcDir/dist.gradle" // add tasks like 'snapshotDependencyCheck' -apply from: "$rootDir/buildSrc/checks.gradle" +apply from: "$buildSrcDir/checks.gradle" // add 'generatePom' task to generate root pom with section -apply from: "$rootDir/buildSrc/maven-root-pom.gradle" +apply from: "$buildSrcDir/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 -// ----------------------------------------------------------------------------- -// add management tasks like `wrapper` for generating the gradlew* scripts -apply from: "$rootDir/buildSrc/wrapper.gradle" From b3f18afdd7b5940889b3ff6125448dddf2944351 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 10 Nov 2010 08:09:26 -0800 Subject: [PATCH 15/21] Further reorganization and polish of build script --- build.gradle | 30 +++++++++------------- buildSrc | 2 +- docs/src/reference/docbook/.index.xml.swo | Bin 12288 -> 0 bytes spring-integration-jdbc/build.gradle | 2 ++ 4 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 docs/src/reference/docbook/.index.xml.swo diff --git a/build.gradle b/build.gradle index 9582c9ff64..572396d417 100644 --- a/build.gradle +++ b/build.gradle @@ -25,19 +25,21 @@ import org.springframework.build.Version // @author Mark Fisher // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- // Configuration for the root project // ----------------------------------------------------------------------------- -def buildSrcDir = "$rootDir/buildSrc" - -apply from: "$buildSrcDir/wrapper.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) @@ -75,11 +77,11 @@ allprojects { // // @see configure(*) sections below // ----------------------------------------------------------------------------- - javaprojects = subprojects.findAll { project -> project.path.startsWith(':spring-integration-') } + // ----------------------------------------------------------------------------- // Configuration for all java subprojects // ----------------------------------------------------------------------------- @@ -415,20 +417,12 @@ project('spring-integration-xmpp') { } } +// ----------------------------------------------------------------------------- +// Configuration for the docs subproject +// ----------------------------------------------------------------------------- project('docs') { apply from: "$buildSrcDir/docs.gradle" } -// 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: "$buildSrcDir/dist.gradle" - -// add tasks like 'snapshotDependencyCheck' apply from: "$buildSrcDir/checks.gradle" - -// add 'generatePom' task to generate root pom with section -apply from: "$buildSrcDir/maven-root-pom.gradle" - diff --git a/buildSrc b/buildSrc index 86070e09b5..7b64fc1098 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 86070e09b55613c3a97e462e25df7a5a5c572f74 +Subproject commit 7b64fc109828edf1b3d08c9bef07fc00a984c3dc diff --git a/docs/src/reference/docbook/.index.xml.swo b/docs/src/reference/docbook/.index.xml.swo deleted file mode 100644 index 782ad922c7ef9bcfd62aaff35a6cbf56a1ca559a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O^n+_6vy52(Lz~31yKPP*MQ*A#M!M7-Ni|zQd;fOFZBaZFLYv0oN4SCGc!)I zpuz=ioH#+n0aPT!0VIyVsZc=N;DX=^5>(>A1tbnV@V6811~#!*>Iros{WkLW&3iNd z89z_7uibcd`KbLweZj)#Zp-?0>o-SMFJ0Ptxwggf+mysAyHWljob-q$^+@<6DlvU! zhz%>TCpsynrPbJpI4`9?PFhn(H^Jv-0bND7#_8U>63MggOMQNSo*6fg=H1#Wl+bh5>I z6)J2UE72Z*Z~4#n_|kkC1&jhl0i%FXz$jo8FbWt2i~>dhqkvJsDDXd2fCQGc3qSrp zzX^lK|No2M|3BSjS*u_LJOJjv4|iJD+aLr@;DMdM0zc1L*1KQ`eDDg{CO+C{m%qeLows zBu=6=pS9X7x1kiGzdGS>$_N$pQ^|CN6-Hm~hW07fV-tJEER~k1Wh(bGjFY6?;(VMJ z9L*LpCahwxtRh5L>rGfN-WNS8D<&;tRz9CW#ojm{R~ZCtzdS^TMYLj=F;$9$wAN)x z3t6!nv?N>+KdTq37+c{sN!t-qT@;&@k2EBj4oF4#wq!wAOlZbl^Sgxc@>l_l$m-hq z&G3Tw3W`JNGoli7w0spk$@zX z#)`^5^Jy*H0{!YKQywG&HHPKOF&;s=(Re?V8;O24J~}9@vK7<9Z+UL^H&4}h)@HmT zveb#&5tc6ELSt4fFCmh&zWC5Sl~+fe$`iP~%>DWvd!aGk@Z8+Mb0<4xUg5_jsqPAi z#G57~*XxbNHCj|EIf-fOh~S~;7FW58+)al`rE`lFp}L;Cem%DFMsW(4Mcm?gBE-p5 zDH=uPQ4SNidRiv9GlgZAm; z2ansM(@3`KV;V3b+UKdSi+$<2EXG^r-;J=%TLY9Y+u5rsKRe}3%8j5j8aXW5YG zrgP%hVaFyB3whJ=ap<6ObQH)RoC)`~6cKGYU5$fRMSOcx&ZmzvtBcO6p?kyi!`^6? z6N4|F+Kt2Oi1FaO4RYnWW|}V98n0!WDgLOoRaXq~8nx4;o@+f?0!brE6t*KW+QTm+ z|0%qiFL)Tzdi%&Sks?U_QF0k2IHb0<@^9p}iTk4-nrS#`w~C5B02%vB(f|Me 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. From 17b69a5127dcf8d420f803282c5703b07a56f31f Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 10 Nov 2010 08:37:49 -0800 Subject: [PATCH 16/21] Eliminate remaining src dir Ant and Maven artifacts --- src/ant/upload-dist.xml | 20 ------ src/assembly/distribution.xml | 116 ---------------------------------- 2 files changed, 136 deletions(-) delete mode 100644 src/ant/upload-dist.xml delete mode 100644 src/assembly/distribution.xml 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 - - - - From 6d605b44ccc721055433ba34721e592af152df09 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 10 Nov 2010 12:19:39 -0800 Subject: [PATCH 17/21] Update readme instructions with `git clone --recursive` --- readme.txt | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) 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.*. . . . + +=============================================================================== From a9c70aa1e7568030eca9126a6120d284a44bef1b Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 11 Nov 2010 10:04:20 -0800 Subject: [PATCH 18/21] Synchronize with latest buildSrc updates buildSrc updated to use latest Gradle wrapper. See buildSrc git log for complete details; in short, eclipse JDT prefs are now auto-generated and the gradle daemon is no longer 'on by default', but must be enabled with --daemon or -Dorg.gradle.daemon=true. * removed all existing jdt preferences files in favor of auto-generation. * removed .springBeans from .gitignore; this file should be source-controlled for consistency and convenience. * removed illegal @Override annotations. Eclipse/STS now catch these properly! --- .gitignore | 5 +- buildSrc | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 74 ------------------- .../org.eclipse.wst.common.component | 7 -- ....eclipse.wst.common.project.facet.core.xml | 5 -- .../.settings/org.maven.ide.eclipse.prefs | 9 --- ...org.springframework.ide.eclipse.core.prefs | 68 ----------------- .../com.springsource.sts.config.flow.prefs | 3 - .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../feed/inbound/FeedEntryMessageSource.java | 2 +- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.eclipse.jdt.core.prefs | 6 -- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- ...ringframework.ide.eclipse.beans.core.prefs | 4 - .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.eclipse.jdt.core.prefs | 67 ----------------- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../twitter/core/Twitter4jTemplate.java | 23 +++--- ...TestReceivingMessageSourceParserTests.java | 3 - ...ectMessageReceivingMessageSourceTests.java | 2 - ...lineUpdateReceivingMessageSourceTests.java | 2 - .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../.settings/org.maven.ide.eclipse.prefs | 9 --- .../XmppMessageDrivenEndpointTests.java | 2 +- ...RosterEventMessageDrivenEndpointTests.java | 2 +- 35 files changed, 15 insertions(+), 424 deletions(-) delete mode 100644 spring-integration-core/.settings/org.eclipse.jdt.core.prefs delete mode 100644 spring-integration-core/.settings/org.eclipse.wst.common.component delete mode 100644 spring-integration-core/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 spring-integration-core/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-core/.settings/org.springframework.ide.eclipse.core.prefs delete mode 100644 spring-integration-event/.settings/com.springsource.sts.config.flow.prefs delete mode 100644 spring-integration-event/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-file/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-groovy/.settings/org.eclipse.jdt.core.prefs delete mode 100644 spring-integration-groovy/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-http/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-httpinvoker/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-ip/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-ip/.settings/org.springframework.ide.eclipse.beans.core.prefs delete mode 100644 spring-integration-jdbc/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-jms/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-jmx/.settings/org.eclipse.jdt.core.prefs delete mode 100644 spring-integration-jmx/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-mail/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-rmi/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-security/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-stream/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-test/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-ws/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-xml/.settings/org.maven.ide.eclipse.prefs delete mode 100644 spring-integration-xmpp/.settings/org.maven.ide.eclipse.prefs diff --git a/.gitignore b/.gitignore index 22d9c98516..e464d1cc17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,14 @@ *.iml *.ipr +*.iws *.sw? */src/main/java/META-INF .classpath .gradle -.idea .project .settings -.springBeans build -!buildSrc/src/main/groovy/org/springframework/build derby.log -integration-repo lib logs pom.xml diff --git a/buildSrc b/buildSrc index 7b64fc1098..c5a9e6b38d 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit 7b64fc109828edf1b3d08c9bef07fc00a984c3dc +Subproject commit c5a9e6b38dc14aa6c9de4f426523fc1b956470cd 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 44eb19cbed..e217fe04e0 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 @@ -182,7 +182,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-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 f0b2edb754..cf2dbb96b7 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 @@ -60,8 +60,7 @@ public class Twitter4jTemplate implements TwitterOperations{ AccessToken at = new AccessToken(accessToken, accessTokenSecret); this.twitter = new TwitterFactory().getOAuthAuthorizedInstance(consumerKey, consumerSecret, at); } - - @Override + public String getProfileId() { try { return twitter.getScreenName(); @@ -70,8 +69,7 @@ public class Twitter4jTemplate implements TwitterOperations{ throw new TwitterOperationException("Failed to obtain Profile ID. ", e); } } - - @Override + public List getDirectMessages() { try { @@ -82,7 +80,7 @@ public class Twitter4jTemplate implements TwitterOperations{ throw new TwitterOperationException("Failed to receive Direct Messages. ", e); } } - @Override + public List getDirectMessages(long sinceId) { try { ResponseList directMessages = twitter.getDirectMessages(new Paging(sinceId)); @@ -93,7 +91,7 @@ public class Twitter4jTemplate implements TwitterOperations{ + sinceId + ".", e); } } - @Override + public List getMentions() { try { ResponseList mentions = twitter.getMentions(); @@ -103,7 +101,7 @@ public class Twitter4jTemplate implements TwitterOperations{ throw new TwitterOperationException("Failed to receive Mention statuses. ", e); } } - @Override + public List getMentions(long sinceId) { try { ResponseList mentions = twitter.getMentions(new Paging(sinceId)); @@ -114,7 +112,7 @@ public class Twitter4jTemplate implements TwitterOperations{ + sinceId + ".", e); } } - @Override + public List getFriendsTimeline() { try { ResponseList timelines = twitter.getFriendsTimeline(); @@ -124,7 +122,7 @@ public class Twitter4jTemplate implements TwitterOperations{ throw new TwitterOperationException("Failed to receive Timeline statuses. ", e); } } - @Override + public List getFriendsTimeline(long sinceId) { try { ResponseList timelines = twitter.getFriendsTimeline(new Paging(sinceId)); @@ -135,7 +133,7 @@ public class Twitter4jTemplate implements TwitterOperations{ + sinceId + ".", e); } } - @Override + public void sendDirectMessage(String userName, String text) { Assert.hasText(userName, "'userName' must be set"); Assert.hasText(text, "'text' must be set"); @@ -146,7 +144,7 @@ public class Twitter4jTemplate implements TwitterOperations{ throw new TwitterOperationException("Failed to send Direct Message to user: " + userName + ".", e); } } - @Override + public void sendDirectMessage(int userId, String text) { Assert.state(userId > 0, "'userId' msut be provided"); Assert.hasText(text, "'text' must be set"); @@ -157,8 +155,7 @@ public class Twitter4jTemplate implements TwitterOperations{ throw new TwitterOperationException("Failed to send Direct Message to user with id: " + userId + ".", e); } } - - @Override + public void updateStatus(Tweet statusTweet) { Assert.notNull(statusTweet, "'statusTweet' must not be null"); try { 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 cb080d0be2..637a4f10c1 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 @@ -52,19 +52,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/inbound/DirectMessageReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java index b7d72c9e79..81d3872010 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 @@ -220,12 +220,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/TimelineUpdateReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSourceTests.java index a585fd6372..2686b0eab9 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSourceTests.java @@ -220,12 +220,10 @@ public class TimelineUpdateReceivingMessageSourceTests { @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/test/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpointTests.java index ef82642fcd..5a787656a7 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpointTests.java @@ -62,7 +62,7 @@ public class XmppMessageDrivenEndpointTests { 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..e38600f4a2 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 @@ -66,7 +66,7 @@ public class XmppRosterEventMessageDrivenEndpointTests { 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)); From 8cce5cdc1fada14c31f249926eb1233f0fef84b4 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 11 Nov 2010 10:39:03 -0800 Subject: [PATCH 19/21] Remove illegal @Override and other polishing --- .../twitter/core/Twitter4jTemplate.java | 4 +--- .../twitter/core/Twitter4jTemplateTests.java | 3 --- .../SearchReceivingMessageSourceTests.java | 23 ++++++++++++++----- .../xmpp/XmppConnectionFactoryBean.java | 6 ----- .../config/XmppHeaderEnricherParserTests.java | 1 - .../XmppMessageDrivenEndpointTests.java | 7 ++---- ...RosterEventMessageDrivenEndpointTests.java | 6 ++--- 7 files changed, 22 insertions(+), 28 deletions(-) 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 8f0c3e3d7d..05f2873e16 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 @@ -13,18 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.twitter.core; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang.NotImplementedException; - import org.springframework.util.Assert; import twitter4j.DirectMessage; -import twitter4j.IDs; import twitter4j.Paging; import twitter4j.Query; import twitter4j.QueryResult; 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 bd4236cf62..fa17f8274d 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 @@ -132,9 +132,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/SearchReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java index bb14791b3b..94f1d69601 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 @@ -1,14 +1,25 @@ -/** - * +/* + * Copyright 2002-2010 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.springframework.integration.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.MessageChannel; import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.core.MessageHandler; @@ -17,9 +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-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(invocation.getArguments()[0]); return null; 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 e38600f4a2..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,17 +54,15 @@ 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(invocation.getArguments()[0]); return null; From bc35dc55fe2a36d5f640ed18077dad31c5ec91b8 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 11 Nov 2010 14:44:27 -0800 Subject: [PATCH 20/21] Update buildSrc url to gradle-build on github --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c1f57ef30a..cb020daae3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "buildSrc"] path = buildSrc - url = /Users/cbeams/Work/spring-build/gradle + url = git@github.com:cbeams/gradle-build.git From 37d4acb87753e948ec1a6f50a9bbdbd69bbd1f2a Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 11 Nov 2010 16:19:57 -0800 Subject: [PATCH 21/21] Update to latest buildSrc changes Minor, simply picking up a pathing change in remoteDocsPath for use when uploading docs via ssh. --- buildSrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc b/buildSrc index c5a9e6b38d..7d83f72f53 160000 --- a/buildSrc +++ b/buildSrc @@ -1 +1 @@ -Subproject commit c5a9e6b38dc14aa6c9de4f426523fc1b956470cd +Subproject commit 7d83f72f531676e5092a0b547a349271b76e6180