Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1727 polishing

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-02-04 12:07:38 -05:00
parent 4c669ec205
commit f5dc6019d5
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd
View File

@@ -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>

2
spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
View File

@@ -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>

2
spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-fail-withgenerator-context.xml
View File

@@ -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"/>

6
spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
View File

@@ -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());
}