Fix deprecated calls.

xwiki-platform-core/xwiki-platform-blog/xwiki-platform-blog-ui/src/main/resources/Blog/ArchivePanel.xml

@@ -143,7 +143,8 @@
         * [[$year (% class="itemCount" %)(${yearArticleCount})(%%)>>Blog.Archive?space=${blogDoc.space}&year=${year}]]
         #if ($year == $currentYear)
           #foreach ($month in [1..12])
-            #set ($monthArticleCount = $xwiki.countDocuments("${query} and year(publishDate.value) = $year and month(publishDate.value) = $month", $queryParams))
+            #set ($statement = "${query} and year(publishDate.value) = $year and month(publishDate.value) = $month")
+            #set ($monthArticleCount = $services.query.hql($statement).bindValues($queryParams).count())
             #if ($monthArticleCount > 0)
               $tempDate.setMonthOfYear($month)##
               ** [[$monthFormatter.print($tempDate) (% class="itemCount" %)(${monthArticleCount})(%%)>>Blog.Archive?space=${blogDoc.space}&year=${year}&month=${month}]]

xwiki-platform-core/xwiki-platform-blog/xwiki-platform-blog-ui/src/main/resources/Blog/UnpublishedPanel.xml

@@ -117,7 +117,7 @@
     * [[$!{entryDoc.display('title', 'view', $entryObj).replaceAll('(\[|\]|\||>)', '~~$1')}>>$!{services.model.serialize($entryDoc.documentReference).replaceAll('(\[|\]|\||>)', '~$1')}]]
   #end
 
-  [[$services.localization.render('xe.blog.unpublished.viewall') (% class="itemCount" %)($xwiki.countDocuments($query))(%%)>>Blog.Unpublished]]
+  [[$services.localization.render('xe.blog.unpublished.viewall') (% class="itemCount" %)($services.query.hql($query).count())(%%)>>Blog.Unpublished]]
   #panelfooter()
 #end
 {{/velocity}}</content>

xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/Main/SpaceIndex.xml

@@ -160,7 +160,7 @@
   {{/html}}
 
   #if ($docNames.size() == $limit)
-    #set ($docCount = $xwiki.countDocuments('where doc.space=?', [${spaceParam}]))
+    #set ($docCount = $services.query.xwql('where doc.space = :space').bindValue('space', $spaceParam).count())
     #set ($remaining = $mathtool.sub($docCount, $limit))
     #if ($remaining > 0)
     (% class="documentListMore" %) (((