Fix deprecated calls

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

@@ -90,7 +90,7 @@
       #if($monthArticleCount > 0)
         $tempDate.setMonthOfYear($month)
 == [[$monthFormatter.print($tempDate) (${monthArticleCount})>>Blog.Archive?space=${blogDoc.space}&year=${year}&month=${month}]] ==
-        #foreach($entryDoc in $xwiki.wrapDocs($xwiki.searchDocuments("${query} and month(publishDate.value) = $month order by publishDate.value", $queryParams)))
+        #foreach($entryDoc in $xwiki.wrapDocs($services.query.hql("${query} and month(publishDate.value) = $month order by publishDate.value", $queryParams).execute()))
           #getEntryObject($entryDoc $entryObj)
           #isPublished($entryObj $isPublished)
           #isHidden($entryObj $isHidden)
@@ -118,7 +118,7 @@
   #set($query = "${query} and year(publishDate.value) = $year and month(publishDate.value) = $month")
   #set($monthArticleCount = $xwiki.countDocuments(${query}, $queryParams))
   #if($monthArticleCount > 0)
-    #foreach($entryDoc in $xwiki.wrapDocs($xwiki.searchDocuments("${query} order by publishDate.value", $queryParams)))
+    #foreach($entryDoc in $xwiki.wrapDocs($services.query.hql("${query} order by publishDate.value").bindValues($queryParams).execute()))
       #getEntryObject($entryDoc $entryObj)
       #displayEntry($entryDoc $entryObj true true)
     #end

xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/src/main/resources/Main/TagsRss.xml

@@ -40,7 +40,7 @@
   ##
   ## Build feed.
   ##
-  #set ($list = $xwiki.searchDocuments($sql , 20 , 0))
+  #set ($list = $services.query.hql($sql).setLimit(20).execute())
   #set ($feed = $xwiki.feed.getDocumentFeed($list, {}, {}))
   #set ($feedURI = $xwiki.getDocument($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI'))).getExternalURL("view"))
   #set ($discard = $feed.setLink($feedURI))

xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/BrowseWorkspacesLiveTableResultsMacros.xml

@@ -180,7 +180,7 @@
   #set($allMatchingTags = $xwiki.tag.getTagCountForQuery($allMatchingTagsFrom, $allMatchingTagsWhere, $allMatchingParams))
   #set($countSql = ", BaseObject as workspaceObject $countSql and workspaceObject.name=doc.fullName and workspaceObject.className='WorkspaceManager.WorkspaceClass'")
   #set($sql = "$countSql $!{orderSql}")
-  #set($items = $xwiki.searchDocuments($sql, $limit, $offset, $sqlParams))
+  #set($items = $services.query.hql($sql).setLimit($limit).setOffset($offset).bindValues($sqlParams).execute())
   #set($totalItems = $xwiki.countDocuments($countSql, $sqlParams))
   #set($returnedItems = $items.size())
   ##