Index: wiki/src/main/resources/WatchCode/Translations
===================================================================
--- wiki/src/main/resources/WatchCode/Translations	(revision 6026)
+++ wiki/src/main/resources/WatchCode/Translations	(working copy)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1181135859000</creationDate>
-<date>1194360951000</date>
-<contentUpdateDate>1194360951000</contentUpdateDate>
-<version>1.3</version>
+<date>1195553559000</date>
+<contentUpdateDate>1195553559000</contentUpdateDate>
+<version>1.4</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -299,5 +299,23 @@
 watch.pressreviewforspace=XWiki Watch Press Review for Space
 
 watch.yes=Yes
-watch.no=No</content>
+watch.no=No
+
+watch.wiki.aggregator.title=Articles for feed 
+
+watch.wiki.feeds=Feeds
+watch.wiki.articles=Articles
+watch.wiki.articles.flagged=Latest flagged articles
+watch.wiki.articles.unread=Latest unread articles
+watch.wiki.articles.tags =Articles tagged "{0}"
+watch.wiki.articles.display=latest {0} items
+watch.wiki.keywords = Keywords
+watch.wiki.tags = Tags
+
+watch.wiki.keyword.articles = Articles for keyword "{0}"
+watch.wiki.keyword.noKeyword = This document does not contain a keyword!
+watch.wiki.group.articles=Feeds in group "{0}"
+watch.wiki.group.noGroup=This document does not contain a group
+
+watch.wiki.reader.goto=Go to the {0}</content>
 </xwikidoc>
Index: wiki/src/main/resources/WatchCode/PressReview
===================================================================
--- wiki/src/main/resources/WatchCode/PressReview	(revision 6026)
+++ wiki/src/main/resources/WatchCode/PressReview	(working copy)
@@ -8,13 +8,13 @@
 <translation>0</translation>
 <parent></parent>
 <creator>XWiki.LudovicDubost</creator>
-<author>XWiki.LudovicDubost</author>
+<author>XWiki.Admin</author>
 <customClass></customClass>
-<contentAuthor>XWiki.LudovicDubost</contentAuthor>
+<contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1181212721000</creationDate>
-<date>1182249610000</date>
-<contentUpdateDate>1182249610000</contentUpdateDate>
-<version>1.4</version>
+<date>1195556874000</date>
+<contentUpdateDate>1195556874000</contentUpdateDate>
+<version>1.13</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -30,6 +30,11 @@
 else
  skeyword = request.keyword
 
+limit=50;
+if (request.limit != null)
+ limit = xwiki.parseInt(request.limit)
+
+
 String skeyword = skeyword.replaceAll("'", "''");
 String sql = ", BaseObject as obj, XWiki.FeedEntryClass as feedentry ";
 String wheresql = "where doc.fullName=obj.name and obj.className='XWiki.FeedEntryClass' and obj.id=feedentry.id ";
@@ -75,13 +80,13 @@
 println "{pre}"
 
 sql += wheresql + " and doc.web='" + request.space + "' order by feedentry.date desc, doc.creationDate desc";
-for(item in xwiki.searchDocuments(sql, 50, 0)) {
+for(item in xwiki.searchDocuments(sql, limit, 0)) {
   itemdoc = xwiki.getDocument(item)
   itemdoc.use("XWiki.FeedEntryClass")
   atitle = itemdoc.display("title")
   url = itemdoc.display("url")
   feedname = itemdoc.display("feedname")
-  println "&lt;h2&gt;&lt;a href=\"${url}\"&gt;${atitle}&lt;/a&gt; dans ${feedname}&lt;/h2&gt;"
+  println "&lt;h2&gt;&lt;a href=\"${url}\"&gt;${atitle}&lt;/a&gt; $msg.get("watch.pressreview.in") ${feedname}&lt;/h2&gt;"
   println "&lt;p&gt;"
   def comments = itemdoc.getComments(true)
   if (comments.size()&gt;0) {
@@ -98,5 +103,5 @@
  }
  println "{/pre}"
 }
-%&gt;</content>
+%&gt;&amp;nbsp;</content>
 </xwikidoc>
Index: wiki/src/main/resources/WatchSheets/FeedArticleSheet
===================================================================
--- wiki/src/main/resources/WatchSheets/FeedArticleSheet	(revision 0)
+++ wiki/src/main/resources/WatchSheets/FeedArticleSheet	(revision 0)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WatchSheets</web>
+<name>FeedArticleSheet</name>
+<language></language>
+<defaultLanguage></defaultLanguage>
+<translation>1</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1194365995000</creationDate>
+<date>1194866495000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WatchSheets.FeedArticleSheet</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>## get the feed article object
+#set($feedArticle = $doc.getObject("XWiki.FeedEntryClass"))
+##start display
+#set($readClass = "unread")
+#if ($feedArticle.get("read") == "1")
+  #set($readClass = "read")
+#end
+#set($flaggedClass = "unflagged")
+#if ($feedArticle.get("flag") == "1")
+  #set($flaggedClass = "flagged")
+#end
+#set($feedname = $feedArticle.getProperty("feedname").value)
+##get the parent aggregator document -&gt; match for feedname
+##TODO: change this into $doc.parent once the feed plugin is set to put each feed article as a child of its aggregator
+#set($parentFeedSql = ", BaseObject as obj, XWiki.AggregatorURLClass as aggr where obj.id=aggr.id.id and aggr.name='${feedname}' and obj.name=doc.fullName")
+##set($parentFeedSql = ", BaseObject obj, StringProperty prop where doc.fullName = obj.name and obj.className = 'XWiki.AggregatorURLClass' and prop.id.id = obj.id and prop.id.name = 'name' and prop.value='$feedname'")
+#set($resultsList = $xwiki.searchDocuments($parentFeedSql))
+#set($parentDoc = false)
+#if ($resultsList.size() &gt; 0)
+  #set($parentDocName = $resultsList.get(0))
+  #set($parentDoc = $xwiki.getDocument($parentDocName))
+#end
+&lt;div class="article ${readClass} ${flaggedClass}"&gt;
+  &lt;div&gt;
+  #set($aggregatorURL = $feedArticle.getProperty("feedurl").value)
+  #if ($parentDoc) 
+    ## set all links to the parent doc
+    #set($aggregator = $parentDoc.getObject("XWiki.AggregatorURLClass"))
+    #set($aggregatorURL = $aggregator.url)
+    &lt;a href="$parentDoc.getURL()"&gt;${aggregator.get("name")}&lt;/a&gt;   
+  #else
+    $feedArticle.feedname
+  #end 
+  &lt;span&gt;RSS Feed &lt;a href="$aggregatorURL"&gt;&lt;img src="$xwiki.getSkinFile('icons/black-rss-mini3.png')" /&gt;&lt;/a&gt;&lt;/span&gt;
+  &lt;/div&gt;
+  &lt;h2 class="heading-1"&gt;&lt;a href="$feedArticle.getProperty("url").value"&gt;$feedArticle.title&lt;/a&gt;&lt;/h2&gt;
+  #message("${msg.get('watch.wiki.posted.author')} &lt;span&gt;${feedArticle.author}&lt;/span&gt; ${msg.get('watch.wiki.posted.date')} &lt;span&gt;${feedArticle.date}&lt;/span&gt;")
+  ## get the tags and display them, with links to the tags sheet
+  #set($tags = $feedArticle.tags)
+  #set($feedClass = $feedArticle.xWikiClass)
+  #set($tagsSeparators = $feedClass.get("tags").getProperty("separator").value)
+  #set($tagsList = $xwiki.split($tags, $tagsSeparators))
+  #set($any = false)
+  #foreach($tag in $tagsList)
+    #if (!$any)
+      #set($any = true)
+      &lt;ul class="tags" style="list-style: none; display: table; padding: 0px;"&gt;
+    #end
+    &lt;li style="margin: 0px; padding-right: 10px; display: table-cell;"&gt;&lt;a href="$xwiki.getURL("WatchSheets.TagsSheet", "view", "&amp;amp;tag=${tag}")" style="display: block;"&gt;${tag}&lt;/a&gt;&lt;/li&gt;
+  #end
+  #if ($any)
+    &lt;/ul&gt;
+  #end
+  &lt;div&gt;
+    $feedArticle.content    
+  &lt;/div&gt;
+&lt;/div&gt;</content>
+</xwikidoc>
Index: wiki/src/main/resources/WatchSheets/WikiWebHomeSheet
===================================================================
--- wiki/src/main/resources/WatchSheets/WikiWebHomeSheet	(revision 0)
+++ wiki/src/main/resources/WatchSheets/WikiWebHomeSheet	(revision 0)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WatchSheets</web>
+<name>WikiWebHomeSheet</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1194435959000</creationDate>
+<date>1195063732000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WatchSheets.WikiWebHomeSheet</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>1 $msg.get("watch.title")
+#startfloatingbox()
+#set($params = $xwiki.arrayList)
+#set($dispose = $params.add("[XWiki Watch RSS Reader &gt; Reader]"))
+$msg.get("watch.wiki.reader.goto", $params)
+#endfloatingbox()
+$msg.get("watch.introduction")
+&lt;div style="float: left; width: 50%;"&gt;
+#set($feedsTitle = $msg.get("watch.wiki.feeds"))
+#set($articlesTitle = $msg.get("watch.wiki.articles"))
+##* [$feedsTitle &gt; ${doc.fullName}#H${feedsTitle}]
+##* [$articlesTitle &gt; ${doc.fullName}#H${articlesTitle}]
+1.1 $feedsTitle
+#set($aggregatorsSql = ", BaseObject obj where doc.fullName=obj.name and obj.className='XWiki.AggregatorURLClass' and doc.web='${doc.space}' order by doc.creationDate desc")
+#set($list = $xwiki.searchDocuments($aggregatorsSql))
+#set($noFilter = true)
+#includeForm("XWiki.Results")
+##create the keywords list and print them
+&lt;div style="border:1px solid #CCCCCC; margin: 10px 10px 10px 0; padding:10px; background-color:#E4F6FF;"&gt;
+#set($keywordsSql = ", BaseObject obj where doc.fullName = obj.name and obj.className = 'XWiki.KeywordClass' and doc.web = '${doc.space}'")
+#set($keywordsDocList = $xwiki.searchDocuments($keywordsSql))
+1.1 $msg.get("watch.wiki.keywords")
+#if ($keywordsDocList.size() &gt; 0)
+  &lt;ul&gt;
+  #foreach($keywordDocName in $keywordsDocList)
+    #set($keywordDoc = $xwiki.getDocument($keywordDocName))
+    #set($keywordObj = $keywordDoc.getObject("XWiki.KeywordClass"))
+    ##build the nice name
+    #set($keywordName = "${keywordObj.getProperty('name').value}")
+    #set($keywordGroup = false)
+    #set($keywordGroup =  $keywordObj.getProperty('group').value)
+    #if ($keywordGroup &amp;&amp; $keywordGroup != "")
+      #set($keywordName = "${keywordName} - ${keywordGroup}")
+    #end
+    &lt;li&gt;&lt;a href="${keywordDoc.getURL()}"&gt;${keywordName}&lt;/a&gt;&lt;/li&gt;
+  #end
+  &lt;/ul&gt;
+#end
+&lt;/div&gt;
+##get the tags to build the tags cloud
+&lt;div style="border:1px solid #CCCCCC; margin: 10px 10px 10px 0; padding:10px; background-color:#E4F6FF;"&gt;
+1.1 $msg.get("watch.wiki.tags")
+##get the query from the document
+#set($tagsQuery = "select elements(entry.tags), count(*) from XWiki.FeedEntryClass as entry, XWikiDocument as doc, BaseObject as obj where doc.fullName=obj.name and obj.id=entry.id and doc.web='${doc.space}' group by col_0_0_")
+##execute
+#set($tagsList = $xwiki.search($tagsQuery))
+##get the TagSheet document to print the tag
+#set($tagDocument = $xwiki.getDocument("WatchSheets.TagsSheet")) 
+#foreach($tagEntry in $tagsList)
+  #set($tagName = false)
+  #set($tagCount = false)
+  #foreach($tagVal in $tagEntry)
+    #if ($velocityCount == 1)
+      #set($tagName = $tagVal)
+    #end
+    #if ($velocityCount == 2)
+      #set($tagCount = $tagVal)
+    #end
+  #end
+  #set($fontSize = 100 + ($tagCount - 1) * 10)
+  #if ($fontSize &gt; 1000)
+    #set($fontSize = 1000)
+  #end
+  &lt;a style="font-size: ${fontSize}%;" href="${tagDocument.getURL("view", "&amp;tag=${tagName}")}"&gt;$tagName&lt;/a&gt;
+#end
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;div style="float: left; width: 50%;"&gt;
+&lt;div style="border:1px solid #CCCCCC; margin: 10px 0px 10px 10px; padding:10px; background-color:#E4F6FF;"&gt;
+#set($prDoc = $xwiki.getDocument("WatchCode.PressReview"))
+1.1 $msg.get("watch.wiki.articles.flagged")
+#set($url = $prDoc.getExternalURL("view", "&amp;space=${doc.space}&amp;flagged=1&amp;read=0&amp;xpage=plain&amp;limit=15"))
+$xwiki.getURLContent(${url})
+&lt;/div&gt;
+&lt;div style="border:1px solid #CCCCCC; margin: 10px 0px 10px 10px; padding:10px; background-color:#E4F6FF;"&gt;
+1.1 $msg.get("watch.wiki.articles.unread")
+#set($url = $prDoc.getExternalURL("view", "&amp;space=${doc.space}&amp;read=-1&amp;xpage=plain&amp;limit=15"))
+$xwiki.getURLContent(${url})
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;div style="clear: both;"&gt;&lt;/div&gt;
+#*
+&lt;div style="width:50%;"&gt;
+#set($articlesLimit = 100)
+#set($articlesParam = $xwiki.arrayList)
+#set($dispose = $articlesParam.add($articlesLimit))
+1.1 $articlesTitle &amp;ndash; $msg.get("watch.wiki.articles.display", $articlesParam)
+#set($articlesSql = ", BaseObject obj where doc.fullName=obj.name and obj.className='XWiki.FeedEntryClass' and doc.web='${doc.space}' order by doc.creationDate desc")
+#set($list = $xwiki.searchDocuments($articlesSql, $articlesLimit, 0))
+#set($noFilter = false)
+#includeForm("XWiki.Results")
+&lt;/div&gt;
+*#</content>
+</xwikidoc>
Index: wiki/src/main/resources/WatchSheets/GroupSheet
===================================================================
--- wiki/src/main/resources/WatchSheets/GroupSheet	(revision 0)
+++ wiki/src/main/resources/WatchSheets/GroupSheet	(revision 0)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WatchSheets</web>
+<name>GroupSheet</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1194952643000</creationDate>
+<date>1195056754000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WatchSheets.GroupSheet</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>#set($groupObj = false)
+#set($groupObj = $doc.getObject("XWiki.AggregatorGroupClass"))
+#if ($groupObj)
+  ## for a reason or another, a feed holds in its group value, the name of a group document and not a group name, so the query is very simple:
+  #set($feedsQuery =" , BaseObject as obj, XWiki.AggregatorURLClass as feed where doc.fullName = obj.name and doc.web = '${doc.space}' and obj.id = feed.id and obj.className = 'XWiki.AggregatorUrlClass' and '${groupObj.name}' in elements(feed.group)")
+  #set($list = $xwiki.searchDocuments($feedsQuery))
+  #set($parList = $xwiki.arrayList)
+  #set($dispose = $parList.add($groupObj.getProperty("name").value))
+  1.1 $msg.get("watch.wiki.group.articles", $parList)
+  #includeForm("XWiki.Results")
+#else
+  #warning($msg.get("watch.wiki.group.noGroup"))
+#end</content>
+</xwikidoc>
Index: wiki/src/main/resources/WatchSheets/TagsSheet
===================================================================
--- wiki/src/main/resources/WatchSheets/TagsSheet	(revision 0)
+++ wiki/src/main/resources/WatchSheets/TagsSheet	(revision 0)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WatchSheets</web>
+<name>TagsSheet</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1194862650000</creationDate>
+<date>1194867378000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WatchSheets.TagsSheet</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>## print all the articles feeds that contain a tag
+##get the tag from the request
+#set($tag = false)
+#set($tag = $request.tag)
+#set($sql = ", BaseObject as obj, XWiki.FeedEntryClass as feedentry ")
+#set($whereSql = "where doc.fullName = obj.name and obj.className = 'XWiki.FeedEntryClass' and obj.id = feedentry.id ")
+#if ($tag)
+  #set($escapedTag = $tag.replaceAll("'", "''"))
+  #set($whereSql = "${whereSql} and '${escapedTag}' in elements(feedentry.tags) ")
+#else
+  ## nothing
+#end
+#set($tagsQuery = "${sql}${whereSql}")
+#set($list = $xwiki.searchDocuments($tagsQuery))
+#set($parList = $xwiki.arrayList)
+#if ($tag)
+  #set($dispose = $parList.add($tag))
+#else 
+  #set($dispose = $parList.add(""))
+#end
+1.1 $msg.get("watch.wiki.articles.tags", $parList)
+#includeForm("XWiki.Results")</content>
+</xwikidoc>
Index: wiki/src/main/resources/WatchSheets/FeedSheet
===================================================================
--- wiki/src/main/resources/WatchSheets/FeedSheet	(revision 0)
+++ wiki/src/main/resources/WatchSheets/FeedSheet	(revision 0)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WatchSheets</web>
+<name>FeedSheet</name>
+<language></language>
+<defaultLanguage></defaultLanguage>
+<translation>1</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1194433397000</creationDate>
+<date>1195056855000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WatchSheets.FeedSheet</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>##build a nice index of all articles belonging to this feed
+##get this feed aggregator
+#set($aggregator = false)
+#set($aggregator = $doc.getObject("XWiki.AggregatorURLClass"))
+#if ($aggregator)
+  &lt;h2 class="heading-1"&gt;$msg.get("watch.wiki.aggregator.title") &lt;a href="$aggregator.getProperty("url").value"&gt; $aggregator.getProperty("name").value&lt;/a&gt;&lt;/h2&gt;
+  ## #set($aggregatorName = $aggregator.getProperty("name").value)
+  ## get the name of the document, for this will be used in the names of the feeds
+  #set($aggregatorName = $doc.name)
+  #set($searchSql = ", BaseObject obj where obj.name=doc.fullName and obj.className='XWiki.FeedEntryClass' and doc.web='${doc.space}' and doc.name like '%Feed_${aggregatorName}%'")
+  #set($list = $xwiki.searchDocuments($searchSql))
+  #includeForm("XWiki.Results")
+#else
+  #warning($msg.get("watch.wiki.notAggregator"))
+#end</content>
+</xwikidoc>
Index: wiki/src/main/resources/WatchSheets/KeywordSheet
===================================================================
--- wiki/src/main/resources/WatchSheets/KeywordSheet	(revision 0)
+++ wiki/src/main/resources/WatchSheets/KeywordSheet	(revision 0)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WatchSheets</web>
+<name>KeywordSheet</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1194892910000</creationDate>
+<date>1194952319000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WatchSheets.KeywordSheet</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>#set($keywordObj = false)
+#set($keywordObj = $doc.getObject("XWiki.KeywordClass"))
+#if ($keywordObj)
+  ## print the articles that match this keyword
+  #set($keywordValue = $keywordObj.getProperty("name").value)
+  ## escape all
+  #set($keywordValueEsc = $keywordValue.replaceAll("'", "''"))
+  #set($keywordGroup = $keywordObj.getProperty("group").value)
+  #set($groupQuery = "")
+  #if ("$!keywordGroup" != "")
+    #set($keywordGroupEsc = $keywordGroup.replaceAll("'", "''"))
+    #set($groupQuery = " and feedentry.feedurl in (select feed.url from XWiki.AggregatorURLClass as feed, BaseObject as obj, XWiki.AggregatorGroupClass as groupProp where obj.name in elements(feed.group) and obj.id = groupProp.id and groupProp.name='${keywordGroupEsc}')")
+  #end
+  #set($articlesQuery = ", BaseObject as obj, XWiki.FeedEntryClass as feedentry where doc.fullName = obj.name and obj.className  = 'XWiki.FeedEntryClass' and obj.id = feedentry.id  and (feedentry.title like '%${keywordValueEsc}%' or feedentry.content like '%${keywordValueEsc}%' or feedentry.fullContent like '%${keywordValueEsc}%') ${groupQuery}")
+  #set($list = $xwiki.searchDocuments($articlesQuery))
+  #set($parList = $xwiki.arrayList)
+  #set($dispose = $parList.add($keywordValue))
+  1.1 $msg.get("watch.wiki.keyword.articles", $parList)
+  #includeForm("XWiki.Results")
+#else
+  #warning($msg.get("watch.wiki.keyword.noKeyword"))
+#end</content>
+</xwikidoc>
Index: wiki/src/main/resources/WatchQueries/ArticleNumber
===================================================================
--- wiki/src/main/resources/WatchQueries/ArticleNumber	(revision 6026)
+++ wiki/src/main/resources/WatchQueries/ArticleNumber	(working copy)
@@ -8,13 +8,13 @@
 <translation>0</translation>
 <parent></parent>
 <creator>XWiki.LudovicDubost</creator>
-<author>XWiki.LudovicDubost</author>
+<author>XWiki.Admin</author>
 <customClass></customClass>
-<contentAuthor>XWiki.LudovicDubost</contentAuthor>
+<contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1181144613000</creationDate>
-<date>1181144620000</date>
-<contentUpdateDate>1181144620000</contentUpdateDate>
-<version>1.2</version>
+<date>1194961991000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -31,18 +31,18 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
 <name>tags</name>
+<number>1</number>
 <prettyName>Tags</prettyName>
-<unmodifiable>0</unmodifiable>
 <relationalStorage>1</relationalStorage>
-<displayType>input</displayType>
-<multiSelect>1</multiSelect>
-<size>30</size>
 <separator> </separator>
-<cache>0</cache>
 <separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
 <values></values>
-<number>1</number>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </tags>
 </class>
@@ -53,5 +53,5 @@
 <tags/>
 </property>
 </object>
-<content>select entry.feedname, count(*) from XWiki.FeedEntryClass as entry, XWikiDocument as doc, BaseObject as obj where doc.fullName=obj.name and obj.id=entry.id and doc.web='${request.space}' and (entry.read is null or entry.read=0) group by 1</content>
+<content>select entry.feedname, count(*) from XWiki.FeedEntryClass as entry, XWikiDocument as doc, BaseObject as obj where doc.fullName=obj.name and obj.id=entry.id and doc.web='${request.space}' and (entry.read is null or entry.read=0) group by entry.feedname</content>
 </xwikidoc>
Index: wiki/src/main/resources/Watch/Reader
===================================================================
--- wiki/src/main/resources/Watch/Reader	(revision 0)
+++ wiki/src/main/resources/Watch/Reader	(revision 0)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>Watch</web>
+<name>Reader</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1195057865000</creationDate>
+<date>1195059797000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>Watch.Reader</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>{pre}&lt;style&gt;#rightPanels, #leftPanels {display:none; width: 0px;} #contentcontainer {border-left: 0px; border-right: 0px;} &lt;/style&gt;{/pre}
+#includeForm("WatchSheets.WebHomeSheet")</content>
+</xwikidoc>
Index: wiki/src/main/resources/Watch/WebHome
===================================================================
--- wiki/src/main/resources/Watch/WebHome	(revision 6026)
+++ wiki/src/main/resources/Watch/WebHome	(working copy)
@@ -8,13 +8,13 @@
 <translation>0</translation>
 <parent></parent>
 <creator>XWiki.LudovicDubost</creator>
-<author>XWiki.LudovicDubost</author>
+<author>XWiki.Admin</author>
 <customClass></customClass>
-<contentAuthor>XWiki.LudovicDubost</contentAuthor>
+<contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1181654814000</creationDate>
-<date>1181654814000</date>
-<contentUpdateDate>1181654814000</contentUpdateDate>
-<version>1.2</version>
+<date>1195056452000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -31,18 +31,18 @@
 <nameField></nameField>
 <validationScript></validationScript>
 <tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
 <name>tags</name>
+<number>1</number>
 <prettyName>Tags</prettyName>
-<unmodifiable>0</unmodifiable>
 <relationalStorage>1</relationalStorage>
-<displayType>input</displayType>
-<multiSelect>1</multiSelect>
-<size>30</size>
 <separator> </separator>
-<cache>0</cache>
 <separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
 <values></values>
-<number>1</number>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </tags>
 </class>
@@ -53,5 +53,6 @@
 <tags/>
 </property>
 </object>
-<content>#includeForm("WatchSheets.WebHomeSheet")</content>
+<content>##includeForm("WatchSheets.WebHomeSheet")
+#includeForm("WatchSheets.WikiWebHomeSheet")</content>
 </xwikidoc>
Index: wiki/src/main/resources/XWiki/Results
===================================================================
--- wiki/src/main/resources/XWiki/Results	(revision 0)
+++ wiki/src/main/resources/XWiki/Results	(revision 0)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>XWiki</web>
+<name>Results</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1158300067000</creationDate>
+<date>1194539913000</date>
+<contentUpdateDate>1195114894000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>XWiki.Results</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>#set($showdata = 0)
+#set($formatDate = "yyyy MMMM dd, HH:mm")
+#set($filterable = "filterable")
+#set($tableId = "searchTableUnique")
+#if ($noFilter)
+  #set($filterable = "")
+  #set($tableId = "searchTable")
+#end
+
+## WARNING: Do not add any empty line inside the table element. This will potentially break 
+## the Javascript we're using for filtering/sorting columns. It might work in FF but will break
+## in other browsers like IE. This is because empty lines add &lt;p class="paragraph"&gt;&lt;/p&gt; elements
+## when rendered.
+
+&lt;table id="${tableId}" class="grid sortable ${filterable} doOddEven"&gt;
+  &lt;tr class="sortHeader"&gt;
+    &lt;th&gt;Page&lt;/th&gt;
+    &lt;th style="width:150px" class="selectFilter"&gt;Space&lt;/th&gt;
+    &lt;th style="width:150px"&gt;Date&lt;/th&gt;
+    &lt;th style="width:150px"&gt;Last Author&lt;/th&gt;
+    #if($isScored)
+    &lt;th style="width:150px"&gt;Score&lt;/th&gt;
+    #end
+    #if($xwiki.hasAdminRights())
+      &lt;th style="width:210px" class="unsortable noFilter"&gt;Actions&lt;/th&gt;
+    #end
+  &lt;/tr&gt;
+  #foreach ($item in $list)
+    #set($troubi = "non")
+      #if ($xwiki.hasAccessLevel("view", $context.user, "${context.database}:${item}"))
+        #if ($item.class == "class java.lang.String")
+          #set($bentrydoc = $xwiki.getDocument($item))
+        #elseif ($item.class == "class com.xpn.xwiki.plugin.lucene.SearchResult")          
+          #set($bentrydoc = $item)
+        #end
+        #set($cclass = $xwiki.getDocument("XWiki.XWikiComments").getxWikiClass())
+        #set($comment = $cclass.newObject())
+        #if($xwiki.getWebPreferenceAsInt("commentsorder",1)==0)
+          #set($comments = $bentrydoc.getComments())
+        #else
+          #set($comments = $bentrydoc.getComments(false))
+        #end
+        #set($createur = $xwiki.getUserName($bentrydoc.author))
+        #set($ptitle = $bentrydoc.getDisplayTitle())
+        &lt;tr&gt;&lt;td style="text-align:left"&gt;          
+          ## LUCENE : entries are typed
+          #if ($bentrydoc.type)
+            #if ($bentrydoc.type == "attachment")
+            &lt;a href="${bentrydoc.url}" target="_blank"&gt;&lt;img src="${xwiki.getSkinFile("icons/search/disk.png")}" ALT="download" /&gt; ${bentrydoc.filename}&lt;/a&gt;\\
+	    Attachment of 
+            #end
+          #end
+          #if($comments.size()&gt;0)  
+            #set($i = 0)  
+            #set($cobj = $comments.get($i))  
+            #set($comment = $bentrydoc.display("comment", "view", $cobj))  
+            #set($date = $cobj.getXWikiObject().get("date").value)
+            #if($date)
+              #set($date2 = $!xwiki.formatDate($date,"yyyy MM dd HH:mm:ss")  )
+            #end
+            #if($bentrydoc)
+              #set($date1 = $!xwiki.formatDate($!bentrydoc.date,"yyyy MM dd HH:mm:ss") )
+            #end
+            #if($date1.equals($date2) )
+              [$ptitle&gt;${bentrydoc.web}.$bentrydoc.name] &lt;em&gt;- 1 new comment&lt;/em&gt;
+              #set($troubi ="oui")
+              #set($desc = $cobj.getXWikiObject().get("comment").value)
+            #else
+              [$bentrydoc.name&gt;${bentrydoc.web}.$bentrydoc.name] #if ($ptitle != $bentrydoc.name) &lt;em&gt;- $ptitle&lt;/em&gt;#end
+            #end
+          #else  
+            #set($comment = "")  
+            [$bentrydoc.name&gt;${bentrydoc.web}.$bentrydoc.name.replaceAll("@","%40")] #if ($ptitle != $bentrydoc.name) &lt;em&gt;- $ptitle&lt;/em&gt;#end
+          #end   
+        &lt;/td&gt;&lt;td style="text-align:left"&gt;
+          [$bentrydoc.web&gt;${bentrydoc.web}.WebHome]
+        &lt;/td&gt;&lt;td style="text-align:left"&gt;          
+          $xwiki.formatDate($bentrydoc.date,"yyyy MMM dd") at $xwiki.formatDate($bentrydoc.date,"HH:mm")&lt;/td&gt;&lt;td style="text-align:center"&gt;
+          #if($troubi =="oui")
+            #set($createur = $xwiki.getUserName($cobj.author)   )
+          #end
+          #if ($createur == "XWikiGuest")
+            Guest
+          #else
+            $createur
+          #end
+        &lt;/td&gt;
+        #if ($isScored)
+        &lt;td style="text-align:left"&gt;
+          #set($resval=$bentrydoc.score*100)
+          #set($starurl=$xwiki.getSkinFile("icons/search/star.png"))
+          #set($star = "&lt;img src='$starurl' alt='$resval' /&gt;")
+          &lt;span class="hidden"&gt;$bentrydoc.score&lt;/span&gt;
+          #if($resval&gt;10) $star #end
+          #if($resval&gt;20) $star #end
+          #if($resval&gt;40) $star #end
+          #if($resval&gt;60) $star #end
+          #if($resval&gt;90) $star #end
+          #set ($perc = $resval.toString())          
+          ${perc.substring(0, $perc.indexOf("."))}%        
+        &lt;/td&gt;
+          #set ($bentrydoc = $xwiki.getDocument("${bentrydoc.web}.${bentrydoc.name}"))
+        #end
+        #if($xwiki.hasAdminRights())
+          &lt;td&gt;
+            &lt;a href="$xwiki.getURL("XWiki.CopyDocument", "view", "sourcedoc=${bentrydoc.fullName}")"&gt;Copy&lt;/a&gt; - &lt;a href="$bentrydoc.getURL("delete")"&gt;Delete&lt;/a&gt; - &lt;a href="$bentrydoc.getURL("view", "xpage=rename&amp;amp;step=1")"&gt;Rename&lt;/a&gt; - &lt;a href="$bentrydoc.getURL("edit", "editor=rights")"&gt;Rights&lt;/a&gt;
+          &lt;/td&gt;
+        #end
+      &lt;/tr&gt;
+    #end
+  #end
+&lt;/table&gt;
+</content></xwikidoc>
\ No newline at end of file
Index: wiki/src/main/resources/XWiki/FeedEntryClassSheet
===================================================================
--- wiki/src/main/resources/XWiki/FeedEntryClassSheet	(revision 6026)
+++ wiki/src/main/resources/XWiki/FeedEntryClassSheet	(working copy)
@@ -8,60 +8,17 @@
 <translation>0</translation>
 <parent></parent>
 <creator>XWiki.LudovicDubost</creator>
-<author>XWiki.LudovicDubost</author>
+<author>XWiki.Admin</author>
 <customClass></customClass>
-<contentAuthor>XWiki.LudovicDubost</contentAuthor>
+<contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1182282771000</creationDate>
-<date>1182284275000</date>
-<contentUpdateDate>1182284275000</contentUpdateDate>
-<version>1.8</version>
+<date>1195556529000</date>
+<contentUpdateDate>1195556529000</contentUpdateDate>
+<version>1.5</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
 <comment></comment>
-<content>1 $msg.get("watch.feedarticle")
-
-$doc.use("XWiki.FeedEntryClass")
-
-&lt;table width="90%"&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.articletitle")&lt;/b&gt;&lt;/td&gt;
-&lt;td colspan="3"&gt;$doc.display("title")&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.url")&lt;/b&gt;&lt;/td&gt;
-&lt;td colspan="3"&gt; $doc.display("url") &lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.feedname")&lt;/b&gt;&lt;/td&gt;
-&lt;td colspan="3"&gt;$doc.display("feedname")&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.feedurl")&lt;/b&gt;&lt;/td&gt;
-&lt;td colspan="3"&gt; $doc.display("feedurl") &lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.author")&lt;/b&gt;&lt;/td&gt;
-&lt;td&gt;$doc.display("author")&lt;/td&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.date")&lt;/b&gt;&lt;/td&gt;
-&lt;td&gt;$doc.display("date")&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.category")&lt;/b&gt;&lt;/td&gt;
-&lt;td&gt;$doc.display("category")&lt;/td&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.tags")&lt;/b&gt;&lt;/td&gt;
-&lt;td&gt;$doc.display("tags")&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.flag")&lt;/b&gt;&lt;/td&gt;
-&lt;td&gt;#if($doc.display("flag")=="1")$msg.get("watch.yes")#else$msg.get("watch.no")#end&lt;/td&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.read")&lt;/b&gt;&lt;/td&gt;
-&lt;td&gt;#if($doc.display("read")=="1")$msg.get("watch.yes")#else$msg.get("watch.no")#end&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;&lt;b&gt;$msg.get("watch.content")&lt;/b&gt;&lt;/td&gt;
-&lt;td colspan="3"&gt;$doc.display("content")&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;</content>
+<content>#includeForm("WatchSheets.FeedArticleSheet")</content>
 </xwikidoc>
Index: web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java
===================================================================
--- web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java	(revision 6026)
+++ web/src/main/java/com/xpn/xwiki/watch/client/data/DataManager.java	(working copy)
@@ -76,13 +76,25 @@
                     }
 
                     public void onSuccess(Object object) {
-                        // We return the page name
-                        if (!((Boolean)object).booleanValue())
-                            cb.onFailure(null);
-                        else
-                            cb.onSuccess(pageName);                        
+                        //save the content of the feed -- should make sure that the sheet exists
+                        String feedDefaultContent = "#includeForm(\"" 
+                                + Constants.DEFAULT_SHEETS_SPACE + "." + Constants.SHEET_FEED + "\")";
+                        watch.getXWikiServiceInstance().saveDocumentContent(pageName, feedDefaultContent, 
+                            new XWikiAsyncCallback(watch) {
+                                public void onFailure(Throwable throwable) {
+                                    cb.onFailure(throwable);
+                                }
+                                public void onSuccess(Object object) {
+                                    super.onSuccess(object);
+                                    // We return the page name
+                                    if (!((Boolean)object).booleanValue())
+                                        cb.onFailure(null);
+                                    else
+                                        cb.onSuccess(pageName);                            
+                                }
+                        });                        
                     }
-                });
+                });                
             }
         });
     }
@@ -143,10 +155,23 @@
                     }
 
                     public void onSuccess(Object object) {
-                        if (!((Boolean)object).booleanValue())
-                            cb.onFailure(null);
-                        else
-                            cb.onSuccess(pageName);
+                        //save the content of the keyword -- should make sure that the sheet exists
+                        String keywordDefaultContent = "#includeForm(\"" 
+                                + Constants.DEFAULT_SHEETS_SPACE + "." + Constants.SHEET_KEYWORD + "\")";
+                        watch.getXWikiServiceInstance().saveDocumentContent(pageName, keywordDefaultContent, 
+                            new XWikiAsyncCallback(watch) {
+                                public void onFailure(Throwable throwable) {
+                                    cb.onFailure(throwable);
+                                }
+                                public void onSuccess(Object object) {
+                                    super.onSuccess(object);
+                                    // We return the page name
+                                    if (!((Boolean)object).booleanValue())
+                                        cb.onFailure(null);
+                                    else
+                                        cb.onSuccess(pageName);                            
+                                }
+                        });
                     }
                 });
             }
@@ -179,13 +204,26 @@
                         cb.onFailure(throwable);
                     }
                     public void onSuccess(Object object) {
-                        // We return the pageName
-                        if (!((Boolean)object).booleanValue())
-                            cb.onFailure(null);
-                        else
-                            cb.onSuccess(pageName);
+                        //save the content of the group -- should make sure that the sheet exists
+                        String groupDefaultContent = "#includeForm(\"" 
+                                + Constants.DEFAULT_SHEETS_SPACE + "." + Constants.SHEET_GROUP + "\")";
+                        watch.getXWikiServiceInstance().saveDocumentContent(pageName, groupDefaultContent, 
+                            new XWikiAsyncCallback(watch) {
+                                public void onFailure(Throwable throwable) {
+                                    cb.onFailure(throwable);
+                                }
+                                public void onSuccess(Object object) {
+                                    super.onSuccess(object);
+                                    // We return the page name
+                                    if (!((Boolean)object).booleanValue())
+                                        cb.onFailure(null);
+                                    else
+                                        cb.onSuccess(pageName);                            
+                                }
+                        });
                     }
                 });
+                
             }
         });
     }
Index: web/src/main/java/com/xpn/xwiki/watch/client/Constants.java
===================================================================
--- web/src/main/java/com/xpn/xwiki/watch/client/Constants.java	(revision 6026)
+++ web/src/main/java/com/xpn/xwiki/watch/client/Constants.java	(working copy)
@@ -49,6 +49,11 @@
     public static final String QUERY_PAGE_TAGSLIST = "TagsList";
     public static final String QUERY_PAGE_NEWARTICLES = "NewArticles";
     public static final String QUERY_PAGE_ARTICLENUMBER = "ArticleNumber";
+    
+    //Sheets
+    public static final String SHEET_FEED = "FeedSheet";
+    public static final String SHEET_GROUP = "GroupSheet";
+    public static final String SHEET_KEYWORD = "KeywordSheet";
 
     // Analysis actions
     public static final String PAGE_PRESSREVIEW = "PressReview";
