On Fri, Nov 22, 2013 at 1:08 PM, Thomas Mortagne <[email protected]> wrote: > On Fri, Nov 22, 2013 at 12:04 PM, Caleb James DeLisle <[email protected]> > wrote: >> I just ran again after updating my git repo, not much changed. >> Here are the vms: >> >> #set ($wikiPrettyName = >> $services.wikimanager.getWikiDocument($wikiName).wikiPrettyName) >> ./xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/extension.vm >> #set ($wikiName = >> $!{services.wikimanager.getWikiDocument($xcontext.getDatabase()).getWikiPrettyName()}) >> ./xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/menuview.vm >> >
> I created http://jira.xwiki.org/browse/XWIKI-9713, I'm sure Guillaume > just forgot to check xwiki-platform-web. I fixed it but note that the old $services.wikimanager is still used even inside the new xwiki-platform-wiki-ui-mainwiki module: WikiManager.WikisSuggestLuceneService WikiManager.WikisSuggestSolrService Unfortunately the API used there (getting a WikiDescriptor instance from a document that has a wiki descriptor xobject) is not available in the new API. I'll let Guillaume deal with this. Thanks, Marius > >> The xml's seem to be >> >> xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui >> xwiki-platform-search/xwiki-platform-search-solr >> xwiki-platform-watchlist/xwiki-platform-watchlist-ui >> xwiki-platform-workspace/xwiki-platform-workspace-ui >> xwiki-platform-workspace/xwiki-platform-workspace-template-features > > xwiki-platform-wiki-manager is of course not relevant, > xwiki-platform-workspace properly declare a dependency on wikimanager > and others are suposed to declare that dependency and wrongly don't. > >> >> Not as bad as it first appears. >> >> Thanks, >> Caleb >> >> >> >> On 11/22/2013 11:48 AM, Caleb James DeLisle wrote: >>> FWIW these are the locations, some of them look like they're non-extension. >>> >>> Thanks, >>> Caleb >>> >>> user@ubnta8:~/wrk/xwiki-trunks$ find ./ -wholename '*/target/*' -prune -o >>> -wholename '*/.git/*' -prune -o -type f -exec grep 'services.wikimanager' >>> {} \; -print >>> <content>#set($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/src/test/resources/SampleWikiXMLDocument.input >>> <title>#set($wikiDescriptor = >>> $services.wikimanager.getWikiDocument($xcontext.database))#{if}("$!wikiDescriptor.getValue('wikiprettyname')" >>> != >>> '')$wikiDescriptor.getValue('wikiprettyname')#{else}$wikiDescriptor.wikiName#{end}</title> >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-template-features/src/main/resources/Main/WebHome.xml >>> #set ($wiki = >>> $services.wikimanager.getWikiFromDocumentName("$documentReference")) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/WorkspacesSuggestSolrService.xml >>> #set($itemWikiDocument = >>> $services.wikimanager.getWikiFromDocumentName($itemfullname)) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/WorkspacesSuggestLuceneService.xml >>> #set ($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/CreateNewWorkspace.xml >>> #set ($itemWikiDocument = >>> $services.wikimanager.getWikiFromDocumentName($itemDoc.fullName)) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/BrowseWorkspacesLiveTableResultsMacros.xml >>> #set ($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/Install.xml >>> #if (!$services.wikimanager.isWikiNameAvailable($request.wikiname)) >>> #if ($services.wikimanager.getWikiFromName($request.wikiname).isNew()) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/IsWikiOrDatabaseOrWorkspaceAvailableService.xml >>> #set ($wikiPrettyName = >>> $services.wikimanager.getWikiDocument($wikiName).wikiPrettyName) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/extension.vm >>> #set ($wikiName = >>> $!{services.wikimanager.getWikiDocument($xcontext.getDatabase()).getWikiPrettyName()}) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/menuview.vm >>> #if($services.wikimanager) >>> #set($wikiPrettyName = >>> $services.wikimanager.getWikiDocument($wikiName).getWikiPrettyName()) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-watchlist/xwiki-platform-watchlist-ui/src/main/resources/XWiki/XWikiUserWatchListLiveTableResults.xml >>> #set ($wikiPrettyName = >>> $services.wikimanager.getWikiDocument($wikiName).wikiPrettyName) >>> #set ($wikiPrettyName = >>> $services.wikimanager.getWikiDocument($searchResult.wiki).wikiPrettyName) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/src/main/resources/Main/SolrSearch.xml >>> #set ($wikiPrettyName = >>> $services.wikimanager.getWikiDocument($wiki).wikiPrettyName) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/src/main/resources/XWiki/SolrSearchAdmin.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiManager/WebHome.xml >>> #set ($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiManager/CreateNewWiki.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/UserWikisIsUserWidget.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/UserWikisIsAdminWidget.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/LastCreatedWikisCode.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/UserWikisIsOwnerWidget.xml >>> #if (!$services.wikimanager.isWikiNameAvailable($request.wikiname)) >>> #if ($services.wikimanager.getWikiFromName($request.wikiname).isNew()) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/IsWikiOrDatabaseAvailableService.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/LastWikiModificationsCode.xml >>> #set ($WikiManager = $services.wikimanager) >>> ./xwiki-platform/xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/XWiki/XWikiServerClassSheet.xml >>> #if ($xwiki.isVirtualMode() && $services.wikimanager) >>> #set ($wikiName = >>> $services.wikimanager.getWikiDocument($xcontext.getDatabase()).getWikiPrettyName()) >>> ./xwiki-manager/xwiki-manager-web/overlays/org.xwiki.enterprise.xwiki-enterprise-web-3.5.1/templates/menuview.vm >>> #if >>> ("$!{services.wikimanager.getWikiTemplateDocument('workspacetemplate')}" == >>> '') >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/Main/WebHome.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/WikiManager/Dashboard.es.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/WikiManager/Dashboard.lv.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/WikiManager/Dashboard.sv.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/WikiManager/Dashboard.fr.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/WikiManager/Dashboard.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/WikiManager/Dashboard.it.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/WikiManager/Dashboard.ca.xml >>> <content>#set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/src/main/resources/XemManager/Install.xml >>> <content>#set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/XemManager/Install.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/WikiManager/Dashboard.ca.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/WikiManager/Dashboard.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/WikiManager/Dashboard.it.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/WikiManager/Dashboard.es.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/WikiManager/Dashboard.lv.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/WikiManager/Dashboard.fr.xml >>> #set($WikiManager = $services.wikimanager) >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/WikiManager/Dashboard.sv.xml >>> #if >>> ("$!{services.wikimanager.getWikiTemplateDocument('workspacetemplate')}" == >>> '') >>> ./xwiki-manager/xwiki-manager-ui/target-eclipse/classes/Main/WebHome.xml >>> user@ubnta8:~/wrk/xwiki-trunks$ >>> >>> >>> On 11/22/2013 11:40 AM, Marius Dumitru Florea wrote: >>>> Guys, I didn't pay enough attention to this topic (thus my +0) but >>>> what we did is very bad! I used myself $services.wikimanager in lots >>>> of places and I'm sure others have used it also (especially since we >>>> moved to virtual mode on by default) so we cannot simply remove an API >>>> like this. This is not different than removing a method or a class >>>> from a public API (which would be caught by CLIRR). We need to apply >>>> the same deprecation strategy: mark $services.wikimanager as >>>> deprecated, move to legacy, log warning messages when it is used, >>>> update all places in platform where it is currently used, etc. >>>> >>>> I just found out that the Wiki search facet isn't displayed as I >>>> advertised it in the release notes of 5.3M2 >>>> http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXWiki53M2#HSearchFacets >>>> because the Wiki Manager API has been removed >>>> https://github.com/xwiki/xwiki-enterprise/commit/b8fcbc7267ff587807698b4afd745f7c3f81e0ae#diff-0 >>>> after I closed my issue http://jira.xwiki.org/browse/XWIKI-9613 .. >>>> >>>> We need ensure that the public API of Wiki Manager (e.g. the script >>>> service) is still available. It can wrap the new API or it can do what >>>> it currently does but it has to remain available. >>>> >>>> Thanks, >>>> Marius >>>> >>>> On Thu, Nov 14, 2013 at 5:56 PM, Marius Dumitru Florea >>>> <[email protected]> wrote: >>>>> +0 >>>>> >>>>> Thanks, >>>>> Marius >>>>> >>>>> On Wed, Nov 13, 2013 at 6:45 PM, Guillaume "Louis-Marie" Delhumeau >>>>> <[email protected]> wrote: >>>>>> Hi devs. >>>>>> >>>>>> Thomas has merged my pull request for the new wiki API. I'm happy! >>>>>> >>>>>> Now, xwiki-platform-wiki-manager and xwiki-platform-workspaces are >>>>>> obsoletes. We should delete them or move them to xwiki-contrib. >>>>>> >>>>>> Here is my +1 for the move! >>>>>> >>>>>> Thanks >>>>>> Louis-Marie >>>>>> _______________________________________________ >>>>>> devs mailing list >>>>>> [email protected] >>>>>> http://lists.xwiki.org/mailman/listinfo/devs >>>> _______________________________________________ >>>> devs mailing list >>>> [email protected] >>>> http://lists.xwiki.org/mailman/listinfo/devs >>>> >>> _______________________________________________ >>> devs mailing list >>> [email protected] >>> http://lists.xwiki.org/mailman/listinfo/devs >>> >> _______________________________________________ >> devs mailing list >> [email protected] >> http://lists.xwiki.org/mailman/listinfo/devs > > > > -- > Thomas Mortagne > _______________________________________________ > devs mailing list > [email protected] > http://lists.xwiki.org/mailman/listinfo/devs _______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
