Permalink
Browse files

upgraded to SI 2.1.3

  • Loading branch information...
1 parent 89eb714 commit 22ba60337b0cc3ff7fbbb8a3c5f102a9259a7b50 @dturanski dturanski committed Aug 3, 2012
View
BIN .wrapper/gradle-wrapper.jar
Binary file not shown.
View
4 .wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Feb 26 18:00:35 EST 2012
+#Fri Aug 03 06:37:47 CDT 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://repo.gradle.org/gradle/distributions-snapshots/gradle-1.0-milestone-8-20120112000036+0100-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
View
31 build.gradle
@@ -1,30 +1,31 @@
-description = 'Spring Integration Groovy DSL'
+
apply plugin: 'base'
-allprojects {
- group = 'org.springframework.integration'
+version = "$projectVersion"
+description = 'Spring Integration Groovy DSL'
+allprojects {
+ group = 'org.springframework.integration'
repositories {
- mavenCentral()
- maven { url 'https://repo.springsource.org/libs-staging-local'}
- maven { url 'http://repo.springsource.org/libs-milestone' }
- maven { url 'https://repo.springsource.org/libs-snapshot'}
- maven { url 'https://repo.springsource.org/libs-release'}
- }
+ maven { url 'http://repo.springsource.org/libs-milestone' }
+ maven { url 'https://repo.springsource.org/libs-snapshot'}
+ maven { url 'https://repo.springsource.org/libs-release'}
+ }
}
+
subprojects { subproject ->
apply plugin: 'groovy'
apply plugin: 'maven'
apply plugin: 'eclipse'
sourceCompatibility=1.5
targetCompatibility=1.5
- junitVersion = '4.8.2'
- log4jVersion = '1.2.12'
- mockitoVersion = '1.9.0'
- springIntegrationVersion = '2.2.0.M1'
+ project.ext.junitVersion = '4.8.2'
+ project.ext.log4jVersion = '1.2.12'
+ project.ext.mockitoVersion = '1.9.0'
+ project.ext.springIntegrationVersion = '2.1.3.RELEASE'
install {
repositories.mavenInstaller {
@@ -43,7 +44,7 @@ subprojects { subproject ->
// dependencies that are common across all java projects
dependencies {
- groovy 'org.codehaus.groovy:groovy-all:1.8.6'
+ groovy 'org.codehaus.groovy:groovy-all:1.8.7'
testCompile "junit:junit-dep:$junitVersion"
testCompile "log4j:log4j:$log4jVersion"
@@ -107,7 +108,7 @@ project('spring-integration-dsl-groovy-samples') {
task wrapper(type: Wrapper) {
description = 'Generates gradlew[.bat] scripts'
gradleVersion = '1.0-milestone-8'
- distributionUrl = 'http://repo.gradle.org/gradle/distributions-snapshots/gradle-1.0-milestone-8-20120112000036+0100-bin.zip'
+ distributionUrl = 'http://services.gradle.org/distributions/gradle-1.1-bin.zip'
jarFile = '.wrapper/gradle-wrapper.jar'
}
View
1 gradle.properties
@@ -0,0 +1 @@
+projectVersion = '1.0.0.BUILD-SNAPSHOT'
View
2 gradlew
@@ -107,7 +107,7 @@ fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
- JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
View
90 gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\.wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
View
12 ...c/main/groovy/org/springframework/integration/dsl/groovy/ClosureInvokingComponents.groovy
@@ -7,11 +7,11 @@ package org.springframework.integration.dsl.groovy
import java.lang.reflect.ParameterizedType
+import org.apache.commons.logging.Log
+import org.apache.commons.logging.LogFactory
import org.springframework.integration.Message
import org.springframework.integration.MessageChannel
import org.springframework.integration.support.MessageBuilder
-import org.apache.commons.logging.LogFactory
-import org.apache.commons.logging.Log
/**
*
@@ -63,7 +63,7 @@ class ClosureInvokingMessageProcessor {
*
*/
class MultiMessageParameterTransformer {
- private final closureExpectsMessages
+ private final boolean closureExpectsMessages
private final boolean closureParameterIsArray
MultiMessageParameterTransformer(Closure closure) {
@@ -79,8 +79,10 @@ class MultiMessageParameterTransformer {
}
}
- def mapClosureArg(List<Message> list){
- def transformedArg = closureExpectsMessages? list: list*.payload
+ def mapClosureArg(List list){
+ boolean listContainsMessages = list?.get(0) instanceof Message
+
+ def transformedArg = closureExpectsMessages ? list: listContainsMessages ? list*.payload : list
if (closureParameterIsArray) {
transformedArg = closureExpectsMessages? transformedArg as Message[] : transformedArg as Object[]
}
View
1 ...vy/org/springframework/integration/dsl/groovy/builder/IntegrationBuilderUsageTests.groovy
@@ -13,6 +13,7 @@
package org.springframework.integration.dsl.groovy.builder
import static org.junit.Assert.*
+
import org.junit.Test
/**

0 comments on commit 22ba603

Please sign in to comment.