- xwiki-devs@xwiki.org - lists.xwiki.org

Re: [xwiki-commits] r4208 - in xwiki-products/xwiki-enterprise/trunk: . wiki/src/main/resources/Main wiki/src/main/resources/XWiki
by Vincent Massol 13 Aug '07

13 Aug '07

Hi JV, On Aug 12, 2007, at 9:13 PM, Jean-Vincent Drean wrote: [snip] > +#if($query != "") > + #set($lucene = $xwiki.getPlugin("lucene")) > + #if($lucene) [snip] > + #else > + Error: Lucene plugin not found. I think it would be nice to tell the user that the Lucene plugin is not enabled in xwiki's configuration and add a link to the old search here. Also what happens if the lucene plugin isn't found? It seems to me the rest of the code below will get executed, no? > + #end > +#end > + > +#set($doRebuild = $request.getParameter("rebuild")) > +#if($doRebuild=="yes") > + #set($lucene = $xwiki.getPlugin("lucene")) > + #if($lucene) > + #set($documentCount = $lucene.rebuildIndex($xwiki,$context)) > + #if(${documentCount}>=0) > + #info("Started index rebuild with $documentCount documents.\\ > + Will take some time depending on > the number of pages/attachments.") > + #else > + #error("Error: Index rebuild failed.") > + #end > + #end > +#else > + #if($xwiki.hasAdminRights()) > + #info ("[Rebuild the lucene index>${doc.web}.${doc.name}? > rebuild=yes]") > + #end > +#end > + > +#warning("This is the new lucene search engine.\\ > + You can still use the XWiki [default search > engine>WebSearch?text=$query]..")</content> There's an extra dot ("."). Shouldn't this be an "info" rather than a warning? Or it could stay a warning but in that case it might be better to tell the user that this is an experimental feature, WDYT? Thanks -Vincent

1 0

Re: [xwiki-commits] r4208 - in xwiki-products/xwiki-enterprise/trunk: . wiki/src/main/resources/Main wiki/src/main/resources/XWiki
by Vincent Massol 13 Aug '07

13 Aug '07

JV, We need the new search page to behave the same as the old one in term of "features". I haven't checked your code yet (will do in a few moments). Here's is what it should have: - a combo box to select the space to search in - exclusion of some spaces if the user is not admin - ability to pass a space in parameter - escaping of some special characters <, >, etc - etc In addition is the Lucene search searching in all places that the old hibernate search was searching in? From what I recall the old search was looking in: - document contents - document names - document object properties (string and textarea properties) (I know the new lucene search searches in attachments too which is a great new feature!) Thanks -Vincent On Aug 12, 2007, at 9:13 PM, Jean-Vincent Drean wrote: > Author: jvdrean > Date: 2007-08-12 21:13:05 +0200 (Sun, 12 Aug 2007) > New Revision: 4208 > > Added: > xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/ > Main/LuceneSearch > Modified: > xwiki-products/xwiki-enterprise/trunk/ > xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/ > XWiki/Results > Log: > XE-48 : Replace current hibernate search with the lucene plugin + > nice search page > > > Property changes on: xwiki-products/xwiki-enterprise/trunk > ___________________________________________________________________ > Name: svn:ignore > - *.iml > .project > .classpath > target > *.log > > + *.iml > .project > .classpath > target > *.log > idea > > > Added: xwiki-products/xwiki-enterprise/trunk/wiki/src/main/ > resources/Main/LuceneSearch > =================================================================== > --- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/ > Main/LuceneSearch 2007-08-12 19:12:39 UTC (rev 4207) > +++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/ > Main/LuceneSearch 2007-08-12 19:13:05 UTC (rev 4208) > @@ -0,0 +1,174 @@ > +<?xml version="1.0" encoding="ISO-8859-1"?> > + > +<xwikidoc> > +<web>Main</web> > +<name>LuceneSearch</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>1186588178000</creationDate> > +<date>1186942604000</date> > +<contentUpdateDate>1186942604000</contentUpdateDate> > +<version>1.2</version> > +<title></title> > +<template></template> > +<defaultTemplate></defaultTemplate> > +<validationScript></validationScript> > +<comment></comment> > +<minorEdit>false</minorEdit> > +<attachment> > +<filename>next.png</filename> > +<filesize>395</filesize> > +<author>XWiki.Admin</author> > +<date>1186927318000</date> > +<version>1.1</version> > +<comment></comment> > +<content>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/I > NwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEdSURBVDjLY/ > j//z8DJZiB6gY0rH7xpW7li3YKDHj1v2bli38lix61k2VA5fJn/9eeeP+/fcOL/wlT7/ > aRbEDegkf/Vxx/93/xobf/S5c8/u/ecm0eSQYkTX/4f+HBN/8nbX/xf+bul/ > 8Tp9/9r1N0dgnRBgT33QZqfPW/YdXj/42rH//v2vjkv3fHtf9SScceEWWAc8u1/ > xO2Pv9fsvjB//IlD4CGPPrvXH/5v2Tksc1EGWBaful/+/on/4sW3gfGxsP/9lUX/ > ksEH1gj6rqdhSgDlPPO/q9b8fB/5bIH/23LL/wXD9i7kqRAlEo6+b908f3/NiXn/ > 4t57V1EcjRKRB75b1145r+o684FZCUkMb8D/ > 0Uct88euMxEKgYA7Ojrv4CgE7EAAAAASUVORK5CYII=</content> > +</attachment> > +<attachment> > +<filename>previous.png</filename> > +<filesize>389</filesize> > +<author>XWiki.Admin</author> > +<date>1186927329000</date> > +<version>1.1</version> > +<comment></comment> > +<content>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/I > NwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEXSURBVDjLY/ > j//z8DJZiBLgZkz37Ynjrz4ReyDEideb89afrDf5ET7v4n2YCEqXf7qpY9/T9r76v/ > Xu03STMgasLteaVLHv+fufvl/6k7X/y3qrlCvAHBvTeXFC54ANbctv7p/95Nz/ > 5rFZ0nzoCAzpuPsuc++D91x4v/jasf/y9aeP9/89rH/6VTTxJngGPDtc3xU+/ > 879789H/5kgf/02fd+V+17OF/yZhjxBmgVXCaRT3v7BqP1mv/a1Y+/J824/b/woX3/ > osHHSAtECVjjqy0Lb/wP2/+3f+Zs+/8F3XfS3o0inntXWSeffJ/0tRb/ > 0Ucdv4nKyEJW25ZYBh/5L+w5fb/ZCdlQYMNs4WMt/wfuMyEDwMA0Irn/ > pDRT58AAAAASUVORK5CYII=</content> > +</attachment> > +<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>Main.LuceneSearch</name> > +<number>0</number> > +<className>XWiki.TagClass</className> > +<property> > +<tags/> > +</property> > +</object> > +<content>## =================== > +## Lucene search > +## =================== > +## Inputs : $request.text > +## Outputs : $list, $isScored > +## =================== > + > +1 Search > + > +#set($query = $request.getParameter("text")) > +#if(!$query) > + #set($query = "") > +#end > +#set($itemsPerPage = "30") > + > +{pre} > +<form action="$doc.name" method="post"> > +<input type="text" name="text" value="$query" /> > +<input type="submit" value="Search"/> > +</form> > +{/pre} > + > +#if($query != "") > + #set($lucene = $xwiki.getPlugin("lucene")) > + #if($lucene) > + ## --------------- > + ## Lucene search > + ## --------------- > + #set($wikinames = "xwiki") > + #set($languages = "default,en,de") > + #set($firstIndex = $request.getParameter("firstIndex")) > + #if(!$firstIndex) > + #set($firstIndex = "1") > + #end > + #set($searchresults = $lucene.getSearchResults($query, > $wikinames, $languages, $xwiki)) > + #set($results = $searchresults.getResults($firstIndex, > $itemsPerPage)) > + #if($searchresults.getHitcount()>0) > + ## ----------------- > + ## Results numbers > + ## ----------------- > + #set($lastIndex=$searchresults.getEndIndex($firstIndex, > $itemsPerPage)) > + #if($searchresults.getHitcount()==1) > + One result: > + #else > + Results $firstIndex - $lastIndex of ${searchresults.getHitcount > ()}: > + #end > + ## --------------- > + ## Previous page > + ## --------------- > + #if($searchresults.hasPrevious($firstIndex)) > + #set($linkfirstIndex = $searchresults.getPreviousIndex > ($firstIndex,$itemsPerPage)) > + #set($link = "${doc.name}?text=${query}&firstIndex=$ > {linkfirstIndex}") > + {pre} > + <a href="$link"><img src="${doc.getAttachmentURL > ("previous.png")}" alt="previous" />previous page</a> > + {/pre} > + #end > + ## ------------- > + ## Next page > + ## ------------- > + #if($searchresults.hasNext($firstIndex,$itemsPerPage)) > + #set($linkfirstIndex = $searchresults.getNextIndex($firstIndex, > $itemsPerPage)) > + #set($link = "${doc.name}?text=${query}&firstIndex=$ > {linkfirstIndex}") > + {pre} > + <a href="$link"><img src="${doc.getAttachmentURL > ("next.png")}" alt="next" />next page</a> > + {/pre} > + #end > + > + ## ----------------- > + ## Display results > + ## ----------------- > + #set ($list = $results) > + #set ($isScored = true) > + #includeInContext("XWiki.Results") > + #end > + #else > + Error: Lucene plugin not found. > + #end > +#end > + > +#set($doRebuild = $request.getParameter("rebuild")) > +#if($doRebuild=="yes") > + #set($lucene = $xwiki.getPlugin("lucene")) > + #if($lucene) > + #set($documentCount = $lucene.rebuildIndex($xwiki,$context)) > + #if(${documentCount}>=0) > + #info("Started index rebuild with $documentCount documents.\\ > + Will take some time depending on > the number of pages/attachments.") > + #else > + #error("Error: Index rebuild failed.") > + #end > + #end > +#else > + #if($xwiki.hasAdminRights()) > + #info ("[Rebuild the lucene index>${doc.web}.${doc.name}? > rebuild=yes]") > + #end > +#end > + > +#warning("This is the new lucene search engine.\\ > + You can still use the XWiki [default search > engine>WebSearch?text=$query]..")</content> > +</xwikidoc> > > Modified: xwiki-products/xwiki-enterprise/trunk/wiki/src/main/ > resources/XWiki/Results > =================================================================== > --- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/ > XWiki/Results 2007-08-12 19:12:39 UTC (rev 4207) > +++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/ > XWiki/Results 2007-08-12 19:13:05 UTC (rev 4208) > @@ -12,14 +12,15 @@ > <customClass></customClass> > <contentAuthor>XWiki.Admin</contentAuthor> > <creationDate>1158300067000</creationDate> > -<date>1180527554000</date> > -<contentUpdateDate>1180527554000</contentUpdateDate> > -<version>1.4</version> > +<date>1186942158000</date> > +<contentUpdateDate>1186942158000</contentUpdateDate> > +<version>1.5</version> > <title></title> > <template></template> > <defaultTemplate></defaultTemplate> > <validationScript></validationScript> > <comment></comment> > +<minorEdit>false</minorEdit> > <object> > <class> > <name>XWiki.TagClass</name> > @@ -31,18 +32,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> > @@ -67,14 +68,21 @@ > <th style="width:150px" class="selectFilter">Space</ > th> > <th style="width:150px">Date</th> > <th style="width:150px">Last Author</th> > + #if($isScored) > + <th style="width:150px">Score</th> > + #end > #if($xwiki.hasAdminRights()) > <th style="width:210px" class="unsortable > noFilter">Actions</th> > #end > </tr> > #foreach ($item in $list) > - #set($troubi ="non") > + #set($troubi = "non") > #if ($xwiki.hasAccessLevel("view", $context.user, "$ > {context.database}:${item}")) > - #set($bentrydoc = $xwiki.getDocument($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) > @@ -84,7 +92,7 @@ > #end > #set($createur = $xwiki.getUserName($bentrydoc.author)) > #set($ptitle = $bentrydoc.getDisplayTitle()) > - <tr><td style="text-align:left"> > + <tr><td style="text-align:left"> > #if($comments.size()>0) > #set($i = 0) > #set($cobj = $comments.get($i)) > @@ -103,13 +111,17 @@ > #else > [$bentrydoc.name>${bentrydoc.web}. > $bentrydoc.name] #if ($ptitle != $bentrydoc.name) <em>- > $ptitle</em>#end > #end > + ## LUCENE : entries are typed > + #elseif ($bentrydoc.type == "attachment") > + <a href="${bentrydoc.url}" > target="_blank"><img src="${xwiki.getSkinFile("disk.png")}" > ALT="download"> ${bentrydoc.filename}</a>\\ > + Attachment of [${bentrydoc.web}.${bentrydoc.name}] > #else > #set($comment = "") > [$bentrydoc.name>${bentrydoc.web}. > $bentrydoc.name.replaceAll("@","%40")] #if ($ptitle != > $bentrydoc.name) <em>- $ptitle</em>#end > #end > </td><td style="text-align:left"> > [$bentrydoc.web>${bentrydoc.web}.WebHome] > - </td><td style="text-align:left"> > + </td><td style="text-align:left"> > $xwiki.formatDate($bentrydoc.date,"yyyy MMM dd") at > $xwiki.formatDate($bentrydoc.date,"HH:mm")</td><td > style="text-align:center"> > #if($troubi =="oui") > #set($createur = $xwiki.getUserName($cobj.author) ) > @@ -120,6 +132,21 @@ > $createur > #end > </td> > + #if ($isScored) > + <td style="text-align:left"> > + #set($resval=$bentrydoc.score*100) > + #set($starurl=$xwiki.getSkinFile("star.png")) > + #set($star = "<img src='$starurl' alt='$resval'>") > + <span class="hidden">$bentrydoc.score</span> > + #if($resval>10) $star #end > + #if($resval>20) $star #end > + #if($resval>40) $star #end > + #if($resval>60) $star #end > + #if($resval>90) $star #end > + #set ($perc = $resval.toString()) > + ${perc.substring(0, $perc.indexOf("."))}% > + </td> > + #end > #if($xwiki.hasAdminRights()) > <td> > <a href="$xwiki.getURL("XWiki.CopyDocument", > "view", "sourcedoc=${bentrydoc.fullName}")">Copy</a> - > <a href="$bentrydoc.getURL("delete")">Delete</a> - > <a href="$bentrydoc.getURL("view", > "xpage=rename&amp;step=1")">Rename</a> - <a > href="$bentrydoc.getURL("edit", "editor=rights")">Rights</a> > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

1 0

Re: [xwiki-commits] r4207 - in xwiki-platform/web/trunk/standard/src/main/webapp/skins: albatross dodo finch
by Vincent Massol 13 Aug '07

13 Aug '07

Hi JV, What would you think about locating the images in icons/search (we need to rename icons in images later on too)? Here you've put the images at the top level of the skin along with the other 999 files... :) Thanks -Vincent On Aug 12, 2007, at 9:12 PM, Jean-Vincent Drean wrote: > Author: jvdrean > Date: 2007-08-12 21:12:39 +0200 (Sun, 12 Aug 2007) > New Revision: 4207 > > Added: > xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/disk.png > xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/star.png > xwiki-platform/web/trunk/standard/src/main/webapp/skins/dodo/ > disk.png > xwiki-platform/web/trunk/standard/src/main/webapp/skins/dodo/ > star.png > xwiki-platform/web/trunk/standard/src/main/webapp/skins/finch/ > disk.png > xwiki-platform/web/trunk/standard/src/main/webapp/skins/finch/ > star.png > Log: > XE-48 : Replace current hibernate search with the lucene plugin + > nice search page > > Added: xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/disk.png > =================================================================== > (Binary files differ) > > > Property changes on: xwiki-platform/web/trunk/standard/src/main/ > webapp/skins/albatross/disk.png > ___________________________________________________________________ > Name: svn:mime-type > + application/octet-stream > > Added: xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/star.png > =================================================================== > (Binary files differ) > > > Property changes on: xwiki-platform/web/trunk/standard/src/main/ > webapp/skins/albatross/star.png > ___________________________________________________________________ > Name: svn:mime-type > + application/octet-stream > > Added: xwiki-platform/web/trunk/standard/src/main/webapp/skins/dodo/ > disk.png > =================================================================== > (Binary files differ) > > > Property changes on: xwiki-platform/web/trunk/standard/src/main/ > webapp/skins/dodo/disk.png > ___________________________________________________________________ > Name: svn:mime-type > + application/octet-stream > > Added: xwiki-platform/web/trunk/standard/src/main/webapp/skins/dodo/ > star.png > =================================================================== > (Binary files differ) > > > Property changes on: xwiki-platform/web/trunk/standard/src/main/ > webapp/skins/dodo/star.png > ___________________________________________________________________ > Name: svn:mime-type > + application/octet-stream > > Added: xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > finch/disk.png > =================================================================== > (Binary files differ) > > > Property changes on: xwiki-platform/web/trunk/standard/src/main/ > webapp/skins/finch/disk.png > ___________________________________________________________________ > Name: svn:mime-type > + application/octet-stream > > Added: xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > finch/star.png > =================================================================== > (Binary files differ) > > > Property changes on: xwiki-platform/web/trunk/standard/src/main/ > webapp/skins/finch/star.png > ___________________________________________________________________ > Name: svn:mime-type > + application/octet-stream > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

1 0

Re: [xwiki-commits] r4205 - xwiki-platform/core/trunk/src/main/java/com/xpn/xwiki
by Vincent Massol 13 Aug '07

13 Aug '07

Thanks JV. Would be nice to improve the javadoc to explain: - what is a work directory and what xwiki is using it for - what is a temporary directory and what xwiki is using it for, and more specifically how it is different from a work dir - the algorithm to find the temporary directory. Thanks -Vincent On Aug 12, 2007, at 9:06 PM, Jean-Vincent Drean wrote: > Author: jvdrean > Date: 2007-08-12 21:06:28 +0200 (Sun, 12 Aug 2007) > New Revision: 4205 > > Modified: > xwiki-platform/core/trunk/src/main/java/com/xpn/xwiki/XWiki.java > Log: > XWIKI-1583 : Standard methods in XWiki to get a work or temp directory > > Modified: xwiki-platform/core/trunk/src/main/java/com/xpn/xwiki/ > XWiki.java > =================================================================== > --- xwiki-platform/core/trunk/src/main/java/com/xpn/xwiki/ > XWiki.java 2007-08-12 18:14:24 UTC (rev 4204) > +++ xwiki-platform/core/trunk/src/main/java/com/xpn/xwiki/ > XWiki.java 2007-08-12 19:06:28 UTC (rev 4205) > @@ -185,6 +185,16 @@ > */ > private static String configPath = null; > > + /* > + * Work directory > + */ > + private static File workDir = null; > + > + /* > + * Temp directory > + */ > + private static File tempDir = null; > + > private static String getConfigPath() throws NamingException > { > if (configPath == null) { > @@ -5438,4 +5448,150 @@ > else > return max; > } > + > + /** > + * Get the XWiki temporary filesystem directory (deleted on exit) > + * > + * @param context > + * @return temporary directory > + * @since 1.1 Milestone 4 > + */ > + public File getTempDirectory(XWikiContext context) > + { > + // if tempDir has already been set, return it > + if (tempDir != null) > + { > + return tempDir; > + } > + > + // xwiki.cfg > + String dirPath = context.getWiki().Param("xwiki.temp.dir"); > + if (dirPath != null) > + { > + try > + { > + tempDir = new File(dirPath.replaceAll("\\s+$", "")); > + if (tempDir.isDirectory() && tempDir.canWrite()) > + { > + tempDir.deleteOnExit(); > + return tempDir; > + } > + } > + catch(Exception e) > + { > + tempDir = null; > + LOG.warn("xwiki.temp.dir set in xwiki.cfg : " + > dirPath + " does not exist or is not writable", e); > + } > + } > + > + Object jsct = context.getEngineContext().getAttribute > ("javax.servlet.context.tempdir"); > + > + // javax.servlet.context.tempdir (File) > + if (jsct!=null && (jsct instanceof File)) > + { > + workDir=(File)jsct; > + if (workDir.isDirectory() && workDir.canWrite()) > + { > + return workDir; > + } > + } > + > + // javax.servlet.context.tempdir (String) > + if (jsct!=null && (jsct instanceof String)) > + { > + workDir=new File((String)jsct); > + > + if (workDir.isDirectory() && workDir.canWrite()) > + { > + return workDir; > + } > + } > + > + // Let's make a tempdir in java.io.tmpdir > + workDir = new File(System.getProperty("java.io.tmpdir"), > "xwikiTemp"); > + > + if (workDir.exists()) > + { > + workDir.deleteOnExit(); > + } > + else > + { > + workDir.mkdir(); > + workDir.deleteOnExit(); > + } > + > + return workDir; > + } > + > + /** > + * Get a new directory in the xwiki work directory > + * > + * @param subdir desired directory name > + * @param context > + * @return work subdirectory > + * @since 1.1 Milestone 4 > + */ > + public File getWorkSubdirectory(String subdir, XWikiContext > context) > + { > + File fdir = new File(this.getWorkDirectory > (context).getAbsolutePath(), subdir); > + if (!fdir.exists()) > + { > + fdir.mkdir(); > + } > + return fdir; > + } > + > + /** > + * Get the XWiki work directory > + * > + * @param context > + * @return work directory > + * @since 1.1 Milestone 4 > + */ > + public File getWorkDirectory(XWikiContext context) > + { > + String dirPath; > + > + // if workDir has already been set, return it > + if (workDir != null) > + { > + return workDir; > + } > + > + // xwiki.cfg > + dirPath = context.getWiki().Param("xwiki.work.dir"); > + if (dirPath != null) > + { > + try > + { > + workDir = new File(dirPath.replaceAll("\\s+$", "")); > + if (workDir.exists()) > + { > + if (workDir.isDirectory() && workDir.canWrite()) > + { > + return workDir; > + } > + } > + else > + { > + workDir.mkdir(); > + return workDir; > + } > + } > + catch(Exception e) > + { > + workDir = null; > + LOG.warn("xwiki.work.dir set in xwiki.cfg : " + > dirPath + " does not exist or is not writable", e); > + } > + } > + > + /* > + * TODO : it would be nice to create a subdirectory xwiki > in APPServer/work or WEBAPP/WEB-INF/work > + */ > + > + // No choices left, retreiving the temp directory > + workDir = this.getTempDirectory(context); > + > + return workDir; > + } > } > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

1 0

FW: [xwiki-users] xWiki and eXo 1.1.x
by Kito D. Mann 12 Aug '07

12 Aug '07

Can anyone answer this question? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Kito D. Mann - Author, JavaServer Faces in Action <http://www.virtua.com/> http://www.virtua.com - JSF/Java EE consulting, training, and mentoring <http://www.jsfcentral.com/> http://www.JSFCentral.com - JavaServer Faces FAQ, news, and info From: Kito D. Mann [mailto:[email protected]] Sent: Sunday, August 05, 2007 2:15 AM To: xwiki-users(a)objectweb.org Subject: [xwiki-users] xWiki and eXo 1.1.x Hello, Is there a version of xWiki that works with eXo portal 1.1.x? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Kito D. Mann - Author, JavaServer Faces in Action <http://www.virtua.com/> http://www.virtua.com - JSF/Java EE consulting, training, and mentoring <http://www.jsfcentral.com/> http://www.JSFCentral.com - JavaServer Faces FAQ, news, and info * Sign up for the JSF Central newsletter! http://oi.vresp.com/?fid=ac048d0e17 *

2 1

Re: [xwiki-commits] r4196 - xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross
by Vincent Massol 12 Aug '07

12 Aug '07

Hi Sergiu, I thought this was done in some previous release. I can see it's on xwiki.org which is using 1.1M3 and I've found this in the release notes of 1.1M2: "When deleting a page, first show the list of pages linking to it and warn about them". Or is this something different? Thanks -Vincent On Aug 12, 2007, at 3:03 AM, Sergiu Dumitriu wrote: > Author: sdumitriu > Date: 2007-08-12 03:03:46 +0200 (Sun, 12 Aug 2007) > New Revision: 4196 > > Modified: > xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/delete.vm > Log: > XWIKI-1297: When deleting a page, first show the list of pages that > will be orphaned > Done (velocity files) > > > Modified: xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/delete.vm > =================================================================== > --- xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/delete.vm 2007-08-11 23:59:11 UTC (rev 4195) > +++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/ > albatross/delete.vm 2007-08-12 01:03:46 UTC (rev 4196) > @@ -8,23 +8,41 @@ > <div id="xwikimessage">$message</div> > #end > #set($links=$doc.getBacklinks()) > +#set($orphans = $xwiki.searchDocuments(" where doc.fullName <> '$ > {doc.fullName}as' and (doc.parent = '${doc.fullName}' or > (doc.parent = '${doc.name}' and doc.web = '${doc.web}'))")) > #if($request.xredirect) > #set($redirectparam = "&xredirect=$request.xredirect") > #end > +#set($quote = '"') > +#set($hasInlinks = false) > +#set($fullmsg = "") > #if($links && $links.size() > 0) > - #set($quote = '"') > - #set ($fullmsg="</p><ul style=${quote}text-align: left;${quote}>") > + #set($tmpmsg = "</p><ul style=${quote}text-align: left;${quote}>") > #foreach($docname in $links) > #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument > ()) > - #set($fullmsg = "${fullmsg}<li><a href=${quote}${rdoc.getURL > ('view')}${quote}>${rdoc.displayTitle}</a></li>") > + #set($tmpmsg = "${tmpmsg}<li><a href=${quote}${rdoc.getURL > ('view')}${quote}>${rdoc.displayTitle}</a></li>") > #end > - #set($fullmsg = "${fullmsg}</ul><p class=${quote}xwikimessage$ > {quote}>") > - #set($fullmsg=$msg.get("core.delete.backlinksWarning", [$fullmsg])) > - #set($fullmsg="${fullmsg}</p><p class=${quote}xwikimessage$ > {quote}>"+$msg.get("core.delete.confirmWithBacklinks")) > - #xwikimessagebox($msg.get("core.delete") $fullmsg $doc.getURL > ("delete", "confirm=1$!{redirectparam}&$languageparams") > $doc.getURL("view") $msg.get("yes") $msg.get("no")) > + #set($tmpmsg = "${tmpmsg}</ul><p class=${quote}xwikimessage$ > {quote}>") > + #set($tmpmsg = $msg.get("core.delete.backlinksWarning", [$tmpmsg])) > + #set($fullmsg="${fullmsg}${tmpmsg}</p><p class=${quote} > xwikimessage${quote}>") > + #set($hasInlinks = true) > +#end > +#if($orphans && $orphans.size() > 0) > + #set($tmpmsg ="</p><ul style=${quote}text-align: left;${quote}>") > + #foreach($docname in $orphans) > + #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument > ()) > + #set($tmpmsg = "${tmpmsg}<li><a href=${quote}${rdoc.getURL > ('view')}${quote}>${rdoc.displayTitle}</a></li>") > + #end > + #set($tmpmsg = "${tmpmsg}</ul><p class=${quote}xwikimessage$ > {quote}>") > + #set($tmpmsg = $msg.get("core.delete.orphansWarning", [$tmpmsg])) > + #set($fullmsg="${fullmsg}${tmpmsg}</p><p class=${quote} > xwikimessage${quote}>") > + #set($hasInlinks = true) > +#end > +#if($hasInlinks) > + #set($fullmsg="${fullmsg}${msg.get > ('core.delete.confirmWithInlinks')}") > #else > - #xwikimessagebox($msg.get("core.delete") $msg.get > ("core.delete.confirm") $doc.getURL("delete", "confirm=1$! > {redirectparam}&$languageparams") $doc.getURL("view") $msg.get > ("yes") $msg.get("no")) > + #set($fullmsg = $msg.get("core.delete.confirm")) > #end > +#xwikimessagebox($msg.get("core.delete") $fullmsg $doc.getURL > ("delete", "confirm=1$!{redirectparam}&$languageparams") > $doc.getURL("view") $msg.get("yes") $msg.get("no")) > </div> > <div class="clearfloats"></div> > #template("endpage.vm") > \ No newline at end of file > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

2 2

Why do we throw exceptions in the ConfluenceRpcInterface methods?
by Vincent Massol 11 Aug '07

11 Aug '07

Hi, If our goal is to implement the Confluence XMLRPC interface (http:// confluence.atlassian.com/display/DOC/Remote+API+Specification) then it seems to me we shouldn't throw XWikiException in any method in our ConfluenceRpcInterface interface. Several methods instead should return a boolean to indicate success or failure. Does anyone know why we're throwing them? Are we ok to remove all exception throwing? Thanks -Vincent

4 19

What happened to Page titles ? :`(
by Asiri Rathnayake 11 Aug '07

11 Aug '07

Hi All, Until recently XMLRPCs returned pages with titles of the form "<space-name>.<page-title>" but after i built xwiki's latest sources today, i figured out that they now have the form "<page-title>" (space name is gone). We need to change XEclipse a bit to accommodate this change (a very very tiny change). Anyway, what caused this change ? am I missing something ? Thanks. - Asiri

2 2

Proposal: XML-RPC API - True Interoperability with Confluence
by Catalin Hritcu 11 Aug '07

11 Aug '07

Hello, We have decided to implement the Confluence Remote API because the interoperability would bring many advantages to XWiki (as Vincent explained here http://tinyurl.com/ypfamt) However at this moment the XWiki implementation of this API is not yet interoperable with Confluence. And this is not only because we are implementing only a very small subset of the API, but more important because nobody ever checked that we are in fact behaving similarly. The goal should be to write clients that are able to run against XWiki or Confluence servers without being able to tell any difference. At this moment this is not the case and there are many reasons for this. One reason is that we are currently relying on dynamic proxies in our client code (http://ws.apache.org/xmlrpc/advanced.html) In this setting the client and the server have to use the same Java interface, namely com.xpn.xwiki.xmlrpc.ConfluenceRpcInterface. And no, there is absolutely no chance to convince the Confluence team to implement this XWiki-specific interface. One way around this is to write client code which does not use dynamic proxies, but that is tedious and error prone (e.g. you can pass as many agruments as you like and you can call methods that don't exist). Remote calls look like this: token = (String)rpc.execute("confluence1.login", new Object[] {token, username, password}); There is however a better option, and that is to use swizzle-confluence, a client proxy for the confluence XML-RPC API (http://docs.codehaus.org/display/SWIZZLE) This would offer all the advantages of calling a typed proxy. Still all calls would eventually look like the one above, so they could go to any server that implements the interface (whether it's XWiki or Confluence). There are many other advantages: swizzle is intuitive, well-documented, well-tested and makes it unnecessary to explicitly pass a token around. Switching to swizzle would mean that all our client code would need to be modified. I already started to convert our tests to swizzle and it seems an easy task. Setup is a lot easier than before. Compare this: XmlRpcClientConfigImpl clientConfig = new XmlRpcClientConfigImpl(); clientConfig.setServerURL(new URL("http://127.0.0.1:8080/xwiki/xmlrpc")); XmlRpcClient rpcClient = new XmlRpcClient(); rpcClient.setConfig(clientConfig); ClientFactory factory = new ClientFactory(rpcClient); xwikiRpc = (ConfluenceRpcInterface)factory.newInstance(ConfluenceRpcInterface.class); to this Confluence rpc = new Confluence("http://127.0.0.1:8080/xwiki/xmlrpc"); And using swizzle for the tests will allow not only to test the xwiki implementation, but to validate that we are testing the right behavior by running the tests against a confluence instance (this can be done once when designing the test, not all the time). Using swizzle is however not enough. Additionally we need to ensure that the observable behavior of XWiki matches that of Confluence. For example we will need to adjust the way we deal with page modifications and histories to the way Confluence does it. And we will need to mirror even strange behavior in Confluence. For example we will need to convert all non-string primitive values (e.g int, Date) into strings in the maps and lists that get exchanged between the client and server. Even if this is strange, this is how Confluence does it and this is how clients (like the ones using swizzle) expect their results. I'm already working on these modifications and if everybody agrees they will make it into the trunk after the M4 release. The easiest way to adapt clients to these changes will be to make them use swizzle. Regards, Catalin

4 4

Problems with Permissions in XWiki Cache
by georg.mayrhauser＠jku.at 10 Aug '07

10 Aug '07

Hi! We have a (maybe very small) problem that keeps us busy for weeks now, and we do not find the solution. We want to create XWiki-documents from another web-application and set also the document-rights depending on the rights the user has in that other web-application. Creating the document works very fine and also the document-rights are set correctly in the database. But with the document-rights we unfortunately have (presumably) problems with the cache. When a user opens the link to a XWiki-document, the document-rights of that document are newly set before the document is openend. So when user "1" opens a new XWiki-document, the user "XWiki.1" (xws_value) is entered in the db-table "xwikistrings" along with the value "users" in the "xws_name"-column (xws_id of the document). And that user can then correctly see the XWiki-document. But when a second user "2" wants to open that same document, he only gets the message "You are not allowed to view this document or perform this action" although he is correctly entered in the "xwikistrings"-table: xws_id = id of document; xws_name = users; xws_value = "XWiki.1,XWiki.2". That second user can see the document not until a $xwiki.flushcache() is performed (which is not easy to automatically realize in that process) or the tomcat is restartet. A com.xpn.xwiki.XWiki.flushCache() in our Java-Code - which would serve us best - does somehow not have the desired effect. If we run XWiki without Cache (xwiki.store.cache) our procedure works also correctly. Hence, it seems like flushing the cache from our java-code does not work for any reason. Here is our code for setting the document-rights: private boolean doUpdateRight(String fullname, String user, String group, String level, boolean allow, boolean global) throws XWikiException { this.xdoc = xwiki.getDocument(fullname, context); this.bobj = new BaseObject(); this.bobj.setName(fullname); if (global) this.bclass = xwiki.getGlobalRightsClass(context); else this.bclass = xwiki.getRightsClass(context); this.bobj = (BaseObject) xdoc.getObject(bclass.getName()); String oldusers = bobj.getStringValue("users"); if(!(oldusers.contains(user))) { bobj.setStringValue("users", oldusers+","+user); XWikiDocument tdoc; tdoc = xdoc; XWikiDocument olddoc = (XWikiDocument) tdoc.clone(); tdoc.setObject(bclass.getClassName(), 0, bobj); xwiki.saveDocument(tdoc, olddoc, context); xwiki.flushCache(); } return true; } When starting Xwiki we get the warning, that oscache.properties and oscache-local.properties are not loade although they are existing in the WEB-INF folder ([http-8080-Processor24] WARN com.xpn.xwiki.cache.impl.OSCacheService - Could not load cache properties oscache.properties: null [http-8080-Processor24] WARN com.xpn.xwiki.cache.impl.OSCacheService - Could not load cache properties oscache-local.properties: null). Could that have an influence on the XWiki-cache problem mentioned above? We are working with XWiki 1.0 We would be very pleased if anybody could help us out. We do have no further ideas what else to try :-( Thanks in advance! Georg

2 1