From f5dc6019d5cac517864d203364fde3c236f7355b Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 4 Feb 2011 12:07:38 -0500
Subject: [PATCH] INT-1727 polishing

---
 .../groovy/config/spring-integration-groovy-2.0.xsd         | 2 +-
 .../groovy/config/GroovyServiceActivatorTests-context.xml   | 2 +-
 ...oovyServiceActivatorTests-fail-withgenerator-context.xml | 2 +-
 .../groovy/config/GroovyServiceActivatorTests.java          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd
index 67b52637d6..caef23acc2 100644
--- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd
+++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd
@@ -62,7 +62,7 @@
 			<xsd:attribute name="script-variable-generator" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>
-						Reference to the ScriptVariableSource bean. This attribute is mutually 
+						Reference to the ScriptVariableGenerator bean. This attribute is mutually 
 						exclusive with 'variable' sub-element
 					</xsd:documentation>
 					<xsd:appinfo>
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
index 6ec84a01a9..4d6ce920b7 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
@@ -18,7 +18,7 @@
 	</service-activator>
 	
 	
-	<service-activator input-channel="withScriptVariableSource">
+	<service-activator input-channel="withScriptVariableGenerator">
 		<groovy:script location="org/springframework/integration/groovy/config/GroovyServiceActivatorTests.groovy"
 					   script-variable-generator="scriptVarSource"/>
 	</service-activator>
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-fail-withgenerator-context.xml b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-fail-withgenerator-context.xml
index c342d0b877..0dff99ecab 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-fail-withgenerator-context.xml
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-fail-withgenerator-context.xml
@@ -10,7 +10,7 @@
 		http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<service-activator input-channel="withScriptVariableSource">
+	<service-activator input-channel="withScriptVariableGenerator">
 		<groovy:script location="org/springframework/integration/groovy/config/GroovyServiceActivatorTests.groovy"
 					   script-variable-generator="scriptVarSource">
 			<groovy:variable name="foo" value="foo"/>
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
index eee9db8aa3..a7ff70dc50 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
@@ -54,7 +54,7 @@ public class GroovyServiceActivatorTests {
 	private MessageChannel inlineScriptInput;
 	
 	@Autowired
-	private MessageChannel withScriptVariableSource;
+	private MessageChannel withScriptVariableGenerator;
 
 
 	@Test
@@ -87,7 +87,7 @@ public class GroovyServiceActivatorTests {
 		replyChannel.setBeanName("returnAddress");
 		for (int i = 1; i <= 3; i++) {
 			Message<?> message = MessageBuilder.withPayload("test-" + i).setReplyChannel(replyChannel).build();
-			this.withScriptVariableSource.send(message);
+			this.withScriptVariableGenerator.send(message);
 			Thread.sleep(1000);
 		}
 		String value1 = (String) replyChannel.receive(0).getPayload();
@@ -124,7 +124,7 @@ public class GroovyServiceActivatorTests {
 	}
 	
 	@Test(expected=BeanDefinitionParsingException.class)
-	public void variablesAndScriptVariableSource() throws Exception{
+	public void variablesAndScriptVariableGenerator() throws Exception{
 		new ClassPathXmlApplicationContext("GroovyServiceActivatorTests-fail-withgenerator-context.xml", this.getClass());
 	}