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

INT-1553 fixed the schema, renamed twitter-connection to twitter-template, fixed tests

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-11-08 12:43:50 -05:00
parent eb3777c33a
commit 630fb24972
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java
View File

@@ -53,7 +53,7 @@ public class TwitterReceivingMessageSourceParser extends AbstractPollingInboundC
parserContext.getReaderContext().error("element '" + elementName + "' is not supported by this parser.", element);
}
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(className);
builder.addConstructorArgReference(element.getAttribute("twitter-connection"));
builder.addConstructorArgReference(element.getAttribute("twitter-template"));
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
String name = BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry());
return new RuntimeBeanReference(name);

2
spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java
View File

@@ -44,7 +44,7 @@ public class TwitterSendingMessageHandlerParser extends AbstractOutboundChannelA
className = BASE_PACKAGE + ".outbound.DirectMessageSendingMessageHandler";
}
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(className);
builder.addConstructorArgReference(element.getAttribute("twitter-connection"));
builder.addConstructorArgReference(element.getAttribute("twitter-template"));
return builder.getBeanDefinition();
}

10
spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd
View File

@@ -38,7 +38,7 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute use="required" name="twitter-connection" type="xsd:string">
<xsd:attribute use="required" name="twitter-template" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -60,7 +60,7 @@
<xsd:sequence>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
</xsd:sequence>
<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
<xsd:attribute name="twitter-template" use="required" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -95,7 +95,7 @@
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
<xsd:attribute name="twitter-template" use="required" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -131,7 +131,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
<xsd:attribute name="twitter-template" use="required" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
@@ -162,7 +162,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
<xsd:attribute name="twitter-template" use="required" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">

6
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParser-context.xml
View File

@@ -22,20 +22,20 @@
<channel id="inbound_mentions"/>
<twitter:inbound-mention-channel-adapter id="mentionAdapter"
twitter-connection="twitter"
twitter-template="twitter"
channel="inbound_mentions"
auto-startup="false">
<poller fixed-rate="5000" max-messages-per-poll="3"/>
</twitter:inbound-mention-channel-adapter>
<twitter:inbound-dm-channel-adapter id="dmAdapter"
twitter-connection="twitter"
twitter-template="twitter"
channel="inbound_mentions"
auto-startup="false">
<poller fixed-rate="5000" max-messages-per-poll="3"/>
</twitter:inbound-dm-channel-adapter>
<twitter:inbound-update-channel-adapter id="updateAdapter"
twitter-connection="twitter"
twitter-template="twitter"
channel="inbound_mentions"
auto-startup="false">
<poller fixed-rate="5000" max-messages-per-poll="3"/>

4
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml
View File

@@ -24,9 +24,9 @@
<channel id="inputChannel"/>
<twitter:outbound-dm-channel-adapter twitter-connection="twitter" channel="inputChannel" />
<twitter:outbound-dm-channel-adapter twitter-template="twitter" channel="inputChannel" />
<twitter:outbound-update-channel-adapter twitter-connection="twitter" channel="inputChannel" />
<twitter:outbound-update-channel-adapter twitter-template="twitter" channel="inputChannel" />
</beans:beans>