Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP

Conflicts:
	spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java
	spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java

Resolve.

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Int3164Jsr223RefreshTests-context.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:script="http://www.springframework.org/schema/integration/scripting"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration/scripting http://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd">
+
+	<transformer input-channel="referencedScriptInput" output-channel="outputChannel">
+		<script:script refresh-check-delay="0"
+				location="file:#{T(System).getProperty('java.io.tmpdir')}/Int3164Jsr223RefreshTests/int3164.groovy"/>
+	</transformer>
+
+	<channel id="outputChannel">
+		<queue/>
+	</channel>
+
+</beans:beans>

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Int3164Jsr223RefreshTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2013 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.scripting.config.jsr223;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.message.GenericMessage;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.FileCopyUtils;
+
+/**
+ * @author Artem Bilan
+ * @since 3.0
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class Int3164Jsr223RefreshTests {
+
+	private static File workDir;
+
+	private static File scriptFile;
+
+	@Autowired
+	private MessageChannel referencedScriptInput;
+
+	@Autowired
+	private PollableChannel outputChannel;
+
+	@BeforeClass
+	public static void start() throws IOException {
+		String basePath = System.getProperty("java.io.tmpdir") + File.separator + "Int3164Jsr223RefreshTests";
+		workDir = new File(basePath);
+		shutdown();
+		workDir.mkdir();
+		workDir.deleteOnExit();
+		scriptFile = new File(workDir, "int3164.groovy");
+		scriptFile.createNewFile();
+		FileCopyUtils.copy("1".getBytes(), scriptFile);
+	}
+
+	@AfterClass
+	public static void shutdown() {
+		if (workDir != null && workDir.exists()) {
+			for (File file : workDir.listFiles()) {
+				file.delete();
+			}
+			workDir.delete();
+		}
+	}
+
+	@Test
+	public void testRefreshingScript() throws Exception {
+		this.referencedScriptInput.send(new GenericMessage<Object>("test"));
+		assertEquals(1, this.outputChannel.receive(100).getPayload());
+
+		FileCopyUtils.copy("2".getBytes(), scriptFile);
+		scriptFile.setLastModified(System.currentTimeMillis() + 10000); // force refresh
+
+		this.referencedScriptInput.send(new GenericMessage<Object>("test"));
+		assertEquals(2, this.outputChannel.receive(100).getPayload());
+	}
+
+}

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests-context.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:script="http://www.springframework.org/schema/integration/scripting"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns:script="http://www.springframework.org/schema/integration/scripting"
+			 xmlns:task="http://www.springframework.org/schema/task"
+			 xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration/scripting http://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd">
+		http://www.springframework.org/schema/integration/scripting http://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
 
 	<transformer input-channel="referencedScriptInput">
 		<script:script
-		lang="ruby" 
+		lang="ruby"
 		location="org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.rb"/>
 	</transformer>
 
@@ -19,4 +21,23 @@
 		]]></script:script>
 	</transformer>
 
+	<task:executor id="executor" pool-size="100"/>
+
+	<channel id="int3162InputChannel">
+		<dispatcher task-executor="executor"/>
+	</channel>
+
+	<channel id="int3162OutputChannel">
+		<queue/>
+	</channel>
+
+	<transformer input-channel="int3162InputChannel" output-channel="int3162OutputChannel">
+		<script:script lang="javascript"><![CDATA[
+				(function(){
+				return payload;
+			})();
+		]]></script:script>
+	</transformer>
+
+
 </beans:beans>

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -19,6 +19,9 @@ package org.springframework.integration.scripting.config.jsr223;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -26,12 +29,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
+ * @author Artem Bilan
  * @since 2.0
  */
 @ContextConfiguration
@@ -44,6 +50,12 @@ public class Jsr223TransformerTests {
 	@Autowired
 	private MessageChannel inlineScriptInput;
 
+	@Autowired
+	private MessageChannel int3162InputChannel;
+
+	@Autowired
+	private PollableChannel int3162OutputChannel;
+
 
 	@Test
 	public void referencedScript() {
@@ -73,4 +85,22 @@ public class Jsr223TransformerTests {
 		assertNull(replyChannel.receive(0));
 	}
 
+	@Test
+	public void testInt3162ScriptExecutorThreadSafety() {
+		for (int i = 0; i < 100; i++) {
+			this.int3162InputChannel.send(new GenericMessage<Object>(i));
+		}
+
+		Set<Object> result = new HashSet<Object>();
+
+		for (int i = 0; i < 100; i++) {
+			Message<?> message = this.int3162OutputChannel.receive(1000);
+			result.add(message.getPayload());
+		}
+
+		assertEquals(100, result.size());
+
+	}
+
+
 }