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

INT-786, fixed schema to remove camelCase attribute 'feedUrl', adjusted test cases

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-10-17 23:20:35 -04:00
parent 903e8846e8
commit c60b464b0e
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java
View File

@@ -39,7 +39,7 @@ public class FeedMessageSourceBeanDefinitionParser extends AbstractPollingInboun
IntegrationNamespaceUtils.setValueIfAttributeDefined(feedEntryBuilder, element, "id", "persistentIdentifier");
BeanDefinitionBuilder feedBuilder =
BeanDefinitionBuilder.genericBeanDefinition("org.springframework.integration.feed.FeedReaderMessageSource");
feedBuilder.addConstructorArgValue(element.getAttribute("feedUrl"));
feedBuilder.addConstructorArgValue(element.getAttribute("feed-url"));
String metadataStoreStrategy = element.getAttribute("metadata-store");
if (StringUtils.hasText(metadataStoreStrategy)){

16
spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
View File

@@ -39,6 +39,10 @@
</xsd:attribute>
<xsd:attribute name="metadata-store" use="optional" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Allows you to provide cusom implementation of 'org.springframework.integration.context.metadata.MetadataStore'
to persist the state of the retrieved feeds to aviod duplicates between restarts.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.context.metadata.MetadataStore"/>
@@ -46,18 +50,12 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="feedUrl" type="xsd:string" use="required"/>
<xsd:attribute name="persisterMap" type="xsd:string" use="optional">
<xsd:attribute name="feed-url" type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation>
Allows you to inject Map
Allows you to specify URL for RSS/ATOM feed
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="java.util.Map"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
</xsd:element>

2
spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml
View File

@@ -11,7 +11,7 @@
channel="feedChannel"
auto-startup="false"
metadata-store="metaStore"
feedUrl="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
feed-url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
<int:poller fixed-rate="10000" max-messages-per-poll="100" />
</int-feed:inbound-channel-adapter>

4
spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml
View File

@@ -9,8 +9,8 @@
<int:message-history />
<int-feed:inbound-channel-adapter id="feedAdapterUsage"
channel="feedChannelUsage"
feedUrl="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
channel="feedChannelUsage"
feed-url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
<int:poller fixed-rate="10000" max-messages-per-poll="100" fixed-delay="10000"/>
</int-feed:inbound-channel-adapter>

2
spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml
View File

@@ -7,7 +7,7 @@
http://www.springframework.org/schema/integration/feed http://www.springframework.org/schema/integration/feed/spring-integration-feed-2.0.xsd">
<int-feed:inbound-channel-adapter channel="feedChannelUsage"
feedUrl="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
feed-url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
<int:poller fixed-rate="10000" max-messages-per-poll="100" fixed-delay="10000"/>
</int-feed:inbound-channel-adapter>

6
spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml
View File

@@ -6,8 +6,10 @@
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
http://www.springframework.org/schema/integration/feed http://www.springframework.org/schema/integration/feed/spring-integration-feed-2.0.xsd">
<int-feed:inbound-channel-adapter id="feedAdapter" channel="feedChannel" auto-startup="false"
feedUrl="http://feeds.bbci.co.uk/news/rss.xml">
<int-feed:inbound-channel-adapter id="feedAdapter"
channel="feedChannel"
auto-startup="false"
feed-url="http://feeds.bbci.co.uk/news/rss.xml">
<int:poller fixed-rate="10000" max-messages-per-poll="100" />
</int-feed:inbound-channel-adapter>