diff --git a/build.properties b/build.properties index fa3b954678..83855a5e2f 100644 --- a/build.properties +++ b/build.properties @@ -7,6 +7,6 @@ ivy.cache.dir=${basedir}/../ivy-cache integration.repo.dir=${basedir}/../integration-repo javadoc.exclude.package.names=org/springframework/integration/samples/** # dependency versions -spring.version=3.0.0.RC3 +spring.version=3.0.0.RELEASE junit.version=4.7.0 mockito.version=1.8.0 diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath index c5497182e6..cbe05d9d1d 100644 --- a/org.springframework.integration.adapter/.classpath +++ b/org.springframework.integration.adapter/.classpath @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/org.springframework.integration.event/.classpath b/org.springframework.integration.event/.classpath index c5497182e6..cbe05d9d1d 100644 --- a/org.springframework.integration.event/.classpath +++ b/org.springframework.integration.event/.classpath @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/org.springframework.integration.file/.classpath b/org.springframework.integration.file/.classpath index cfbd0c8eb9..6a503bc291 100644 --- a/org.springframework.integration.file/.classpath +++ b/org.springframework.integration.file/.classpath @@ -7,12 +7,12 @@ - - - - - - + + + + + + diff --git a/org.springframework.integration.http/.classpath b/org.springframework.integration.http/.classpath index 8db5cf2a69..b4f0ed73be 100644 --- a/org.springframework.integration.http/.classpath +++ b/org.springframework.integration.http/.classpath @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/org.springframework.integration.httpinvoker/.classpath b/org.springframework.integration.httpinvoker/.classpath index e6bdc05630..26d157eb0a 100644 --- a/org.springframework.integration.httpinvoker/.classpath +++ b/org.springframework.integration.httpinvoker/.classpath @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/org.springframework.integration.jdbc/.classpath b/org.springframework.integration.jdbc/.classpath index 8bb0f6fe21..77c89a96f9 100644 --- a/org.springframework.integration.jdbc/.classpath +++ b/org.springframework.integration.jdbc/.classpath @@ -12,15 +12,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/org.springframework.integration.jms/.classpath b/org.springframework.integration.jms/.classpath index 154b05a8b6..12c27007d9 100644 --- a/org.springframework.integration.jms/.classpath +++ b/org.springframework.integration.jms/.classpath @@ -10,14 +10,14 @@ - - - - - - - - + + + + + + + + diff --git a/org.springframework.integration.mail/.classpath b/org.springframework.integration.mail/.classpath index d5350a2aa0..727f1c5c5b 100644 --- a/org.springframework.integration.mail/.classpath +++ b/org.springframework.integration.mail/.classpath @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + diff --git a/org.springframework.integration.osgi/.classpath b/org.springframework.integration.osgi/.classpath index eaf8ea23cd..693b772f80 100644 --- a/org.springframework.integration.osgi/.classpath +++ b/org.springframework.integration.osgi/.classpath @@ -23,10 +23,10 @@ - - - - - + + + + + diff --git a/org.springframework.integration.rmi/.classpath b/org.springframework.integration.rmi/.classpath index c42bc702ff..b48e5dea30 100644 --- a/org.springframework.integration.rmi/.classpath +++ b/org.springframework.integration.rmi/.classpath @@ -8,13 +8,13 @@ - - - - - - - + + + + + + + diff --git a/org.springframework.integration.security/.classpath b/org.springframework.integration.security/.classpath index 332000db82..e032e6d4a9 100644 --- a/org.springframework.integration.security/.classpath +++ b/org.springframework.integration.security/.classpath @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/org.springframework.integration.stream/.classpath b/org.springframework.integration.stream/.classpath index 007d81cdf6..08c815cd40 100644 --- a/org.springframework.integration.stream/.classpath +++ b/org.springframework.integration.stream/.classpath @@ -7,12 +7,12 @@ - - - - - - + + + + + + diff --git a/org.springframework.integration.test/.classpath b/org.springframework.integration.test/.classpath index fcc5d2ebe3..e960ebc52f 100644 --- a/org.springframework.integration.test/.classpath +++ b/org.springframework.integration.test/.classpath @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/org.springframework.integration.udp/.classpath b/org.springframework.integration.udp/.classpath index cfbd0c8eb9..6a503bc291 100644 --- a/org.springframework.integration.udp/.classpath +++ b/org.springframework.integration.udp/.classpath @@ -7,12 +7,12 @@ - - - - - - + + + + + + diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath index 0fd4d8541a..0054ca3a4b 100644 --- a/org.springframework.integration.ws/.classpath +++ b/org.springframework.integration.ws/.classpath @@ -9,15 +9,15 @@ - - - - - + + + + + - + diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath index 28e4a68736..3eba3f6ce4 100644 --- a/org.springframework.integration.xml/.classpath +++ b/org.springframework.integration.xml/.classpath @@ -11,14 +11,14 @@ - - - - - - + + + + + + - + diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath index 0b68427afe..a315afcc39 100644 --- a/org.springframework.integration/.classpath +++ b/org.springframework.integration/.classpath @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java index 62dc4cf750..af1415c913 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java @@ -29,8 +29,8 @@ import org.springframework.expression.EvaluationException; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.ParseException; +import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.expression.spel.standard.SpelExpressionParserConfiguration; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessageChannelTemplate; @@ -55,9 +55,7 @@ public class MessagePublishingInterceptor implements MethodInterceptor { private final ExpressionSource expressionSource; - private final ExpressionParser parser = new SpelExpressionParser( - SpelExpressionParserConfiguration.CreateObjectIfAttemptToReferenceNull | - SpelExpressionParserConfiguration.GrowListsOnIndexBeyondSize); + private final ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); private volatile ChannelResolver channelResolver; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java index 096f4e70e7..1c1d560029 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java @@ -31,7 +31,6 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.core.MethodParameter; import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterRegistry; import org.springframework.core.convert.support.ConversionServiceFactory; @@ -331,7 +330,6 @@ public class ArgumentArrayMessageMapper implements InboundMessageMapperProperties conversion value = expression.equals("headers") ? conversionService.convert(value, targetType) : value; break; @@ -369,15 +367,6 @@ public class ArgumentArrayMessageMapper implements InboundMessageMapper message) { // Validate against a Map with no annotations diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java index a656c18fbe..c080cd6481 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java @@ -21,8 +21,8 @@ import org.springframework.expression.EvaluationException; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.ParseException; +import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.expression.spel.standard.SpelExpressionParserConfiguration; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageHandlingException; @@ -36,19 +36,13 @@ import org.springframework.integration.message.MessageHandlingException; */ public class ExpressionEvaluatingMessageProcessor implements MessageProcessor { - /*private final ExpressionParser parser = new SpelExpressionParser( - SpelExpressionParserConfiguration.CreateObjectIfAttemptToReferenceNull | - SpelExpressionParserConfiguration.GrowListsOnIndexBeyondSize); - */ + private final ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); private final Expression expression; public ExpressionEvaluatingMessageProcessor(String expression) { try { - ExpressionParser parser = new SpelExpressionParser( - SpelExpressionParserConfiguration.CreateObjectIfAttemptToReferenceNull | - SpelExpressionParserConfiguration.GrowListsOnIndexBeyondSize); this.expression = parser.parseExpression(expression); } catch (ParseException e) { @@ -56,6 +50,7 @@ public class ExpressionEvaluatingMessageProcessor implements MessageProcessor { } } + public Object processMessage(Message message) { StandardEvaluationContext context = new StandardEvaluationContext(message); context.addPropertyAccessor(new MapAccessor());