From c60b464b0eef26c1baea9c6ed2eb6cd5a5f61adb Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Sun, 17 Oct 2010 23:20:35 -0400
Subject: [PATCH] INT-786, fixed schema to remove camelCase attribute
 'feedUrl', adjusted test cases

---
 .../FeedMessageSourceBeanDefinitionParser.java   |  2 +-
 .../feed/config/spring-integration-feed-2.0.xsd  | 16 +++++++---------
 ...rceBeanDefinitionParserTests-file-context.xml |  2 +-
 ...nDefinitionParserTests-file-usage-context.xml |  4 ++--
 ...nitionParserTests-file-usage-noid-context.xml |  2 +-
 ...rceBeanDefinitionParserTests-http-context.xml |  6 ++++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java
index d15f0f0dbc..1fffb8781a 100644
--- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java
+++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java
@@ -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)){
diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
index 5486f200bf..c9aa79a62c 100644
--- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
+++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
@@ -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>
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml
index 52d65a5959..cf4b30660f 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml
@@ -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>
 	
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml
index 1295d55f36..701caed05c 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml
@@ -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>
 
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml
index 8f8521270c..34bc76beb8 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml
@@ -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>
 
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml
index 0f13051342..3e1597b65a 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml
@@ -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>