August 2007 - xwiki-devs@xwiki.org

store entities design in new history storage and recycle bin
by Artem Melentyev 14 Aug '07

14 Aug '07

Hello. I would like to discuss about some aspect of my work on XWIKI-543 (recycle bin) and XWIKI-1459 (new history storage). 1. [Proposal] Use common.lang.builders & AbstractSimpleClass When i write simple entity classes (POJO), i wouldn't like to implement equals, hashcode, toString by hand for first time (it has too much duplication). commons.lang.builders has fine builders for this. These builders can do these tasks via reflections. http://commons.apache.org/lang/api-release/org/apache/commons/lang/builder/… Can i create class "com.xpn.xwiki.util.AbstractSimpleClass" (maybe another name?) with these methods implemented via common.lang.builders (via reflections) for extending in my entities? I think it will be useful for others too. Implementation: http://rafb.net/p/G0OcJ427.html as +: + we will get equals(), hashCode() and nice toString() for free :). + we can always override these methods later if we will have some issues + we can easy switch toString() style in all extended classes - note: it is only for simple entities with no not-store specific fields. (So XWikiDocument is inapplicable i think) WDYT? 2. While i designed how to store history and recycle bin entities i found similar problems. I have following data in my entities: - id - metadata (several fields) - content (one field) One use case is fetch many metadatas for display. (i.e. history summary) Another use case is load one or several content to some hard work. (i.e. load old document from history, restore document from recycle bin) So problems is separate fetching metadata and content. How can i do it? 1) If i put all data in one class, i have to fetch all data via session.load and hql query. 2) It is possible to configure hibernate with 2 separate entity-name for one class and one table. So if we use specific entity-name, we fetch only metadata and content will be null. But i haven't tested it yet. It looks like hack. 3) solution i have for now is following: divide entity to EntityInfo and EntityContent. Both has id. You can see my solution it in patches at XWIKI-1459. Only defect is increase number of entities. Maybe there is another way? Or another design? -- Artem Melentyev

1 0

[IMPORTANT] Trunk is now XWiki 1.2-M1, branch created for 1.1RC1/RC2
by Vincent Massol 14 Aug '07

14 Aug '07

Hi devs, As previously agreed, I have created a branch for work on 1.1RC1/RC2 in the following modules: * platform/core * platform/web * products/enterprise * platform/applications/panels For all those modules trunk becomes 1.2-SNAPSHOT. This means that if you make a change to the 1.1 branch you MUST also merge that change to the trunk or it'll be lost forever... Thanks -Vincent

1 0

Re: [xwiki-commits] r4231 - in xwiki-platform/web/trunk/standard/src/main/webapp: tiny_mce wiki_editor/plugins
by Vincent Massol 14 Aug '07

14 Aug '07

Hi Ludovic, It seems you've encoded characters in this commit too and not just XWIKI-1198. This requires a JIRA issue in XWiki Platform. Also, what about Word/Excel and HTML copy paste in general? Thanks -Vincent On Aug 14, 2007, at 12:59 AM, Ludovic Dubost wrote: > Author: ludovic > Date: 2007-08-14 00:57:13 +0200 (Tue, 14 Aug 2007) > New Revision: 4231 > > Modified: > xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/ > tiny_mce.js > xwiki-platform/web/trunk/standard/src/main/webapp/wiki_editor/ > plugins/core.js > Log: > CURRIKI-718 and XWIKI-1198 Empty lines/spaces are compacted/remove > in some cases. Handling of 2 empty lines are now transformed to <br /> > > > Modified: xwiki-platform/web/trunk/standard/src/main/webapp/ > tiny_mce/tiny_mce.js > =================================================================== > --- xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/ > tiny_mce.js 2007-08-13 22:42:46 UTC (rev 4230) > +++ xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/ > tiny_mce.js 2007-08-13 22:57:13 UTC (rev 4231) > @@ -2241,7 +2241,6 @@ > s = s.replace(/\'/g, '''); // ' is not working in MSIE > s = s.replace(/</g, '<'); > s = s.replace(/>/g, '>'); > - > return s; > }, > > @@ -3019,7 +3018,8 @@ > value = tinyMCE.storeAwayURLs(value); > value = tinyMCE._customCleanup(this, "insert_to_editor", value); > tinyMCE._setHTML(doc, value); > - tinyMCE.setInnerHTML(doc.body, tinyMCE._cleanupHTML(this, doc, > tinyMCE.settings, doc.body)); > + // tinyMCE.setInnerHTML(doc.body, tinyMCE._cleanupHTML(this, > doc, tinyMCE.settings, doc.body)); > + tinyMCE.setInnerHTML(doc.body, value); > tinyMCE.convertAllRelativeURLs(doc.body); > > // Cleanup any mess left from storyAwayURLs > > Modified: xwiki-platform/web/trunk/standard/src/main/webapp/ > wiki_editor/plugins/core.js > =================================================================== > --- xwiki-platform/web/trunk/standard/src/main/webapp/wiki_editor/ > plugins/core.js 2007-08-13 22:42:46 UTC (rev 4230) > +++ xwiki-platform/web/trunk/standard/src/main/webapp/wiki_editor/ > plugins/core.js 2007-08-13 22:57:13 UTC (rev 4231) > @@ -15,7 +15,7 @@ > this.addExternalProcessor((/^\s*(1(\.1)*)\s+([^\r\n]*)$/im), > 'convertHeadingExternal'); > this.addInternalProcessor((/<h[1-7]\s*(([^>]*)class=\"heading([^>] > *))>([\s\S]+?)<\/h[1-7]>/i), 'convertHeadingInternal'); > > - this.addInternalProcessor((/<p[^>]*> <\/p>/gi), ""); > + this.addInternalProcessor((/<p[^>]*> ?<\/p>/gi), "\\\\\r > \n"); > > this.addExternalProcessor((/\\\\([\r\n]+)/gi), '<br />'); > > @@ -62,8 +62,8 @@ > this.addExternalProcessorBefore('convertParagraphExternal', (/ > ##([^\r\n]*)$|(#\*([\s\S]+?)\*#)/im), > 'convertVelocityCommentExternal'); > this.addInternalProcessorBefore('convertStyleInternal', (/<div > \s*([^>]*)class=\"vcomment\"\s*([^>]*)>([\s\S]+?)(\r?\n?)<\/div>/ > i), 'convertVelocityCommentInternal'); > > - this.addExternalProcessorBefore('convertTableExternal', (/\ > {style:\s*(.*?)\}([\s\S]+?)\{style\}/i), 'convertStyleExternal'); > - this.addInternalProcessorBefore('convertTableInternal', (/< > (font|span|div)\s*(.*?)>([\s\S]+?)<\/(font|span|div)>/i), > 'convertStyleInternal'); > + this.addExternalProcessorBefore('convertParagraphExternal', (/ > \r?\n?\{style:\s*(.*?)\}\r?\n?([\s\S]+?)\r?\n?\{style\}/i), > 'convertStyleExternal'); > + this.addInternalProcessorBefore('convertTableInternal', (/< > (font|span|div)\s*(.*?)>\r?\n?([\s\S]+?)\r?\n?\<\/(font|span|div)>/ > i), 'convertStyleInternal'); > > //this.addInternalProcessor((/ (?!\|)/gi), ""); > this.setHtmlTagRemover('removeHtmlTags_Groovy'); > @@ -344,7 +344,8 @@ > > WikiEditor.prototype.__removeBlankParagraphs = function(node) { > if(node.nodeName.toLowerCase() == "p" && this.trimString > (node.innerHTML) == "") { > - node.parentNode.removeChild(node); > + node.parentNode.innerHTML += "<br />"; > + node.parentNode.removeChild(node); > return; > } > for(var i=0; node.childNodes[i]; i++) { > @@ -371,6 +372,37 @@ > } > } > > +WikiEditor.prototype._encodeNode = function(node) { > + function encode(s) { > + s = "" + s; > + // Encoding wiki syntax > + s = s.replace(/\*/g, '*'); > + s = s.replace(/\~/g, '~'); > + s = s.replace(/\[/g, '['); > + s = s.replace(/\]/g, ']'); > + s = s.replace(/\_/g, '_'); > + s = s.replace(/\{/g, '#123;'); > + s = s.replace(/\}/g, '}'); > + // Encoding HTML > + // s = s.replace(/\'/g, '''); // ' is not working > in MSIE > + // s = s.replace(/</g, '<'); > + // s = s.replace(/>/g, '>'); > + // Encoding more wiki syntax > + // s = s.replace(/\-/g, '-'); > + // s = s.replace(/\1/g, '1'); > + return s; > + } > + > + function encodeNode(node) { > + for(var i=0; node.childNodes[i];i++) { > + encodeNode(node.childNodes[i]); > + } > + node.nodeValue = encode(node.nodeValue); > + } > + > + encodeNode(node); > +} > + > WikiEditor.prototype.handleSupAndSubButons = function(editor_id, > node, undo_index, undo_levels, visual_aid, any_selection) { > tinyMCE.switchClass(editor_id + '_sup', 'mceButtonNormal'); > tinyMCE.switchClass(editor_id + '_sub', 'mceButtonNormal'); > @@ -1429,7 +1461,7 @@ > if (this.core.isMSIE) { > str += "\r\n"; > } else if (result[1] == null || result[1] == "" || > this.trimString(result[1].toString()) == "/") { > - str += "\n"; > + str += "\r\n"; > } > return content.replace(regexp, str); > } > \ 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

1 1

Moving 1.1RC1 release date?
by Vincent Massol 14 Aug '07

14 Aug '07

Hi, We have delayed the 1.1M4 release so the 1.1RC1 release is now too close I think (planned for the 20th). I propose we move it to the 27th. We'll then see if we have many more bugs to fix for RC2 and take a call then if we have to delay the final release by a few day or not. WDYT? Thanks -Vincent

1 0

[VOTE] Release POM v3 and XWiki Tools v1.2
by Vincent Massol 13 Aug '07

13 Aug '07

Hi, I'd like to release those 2 projects in preparation for the release of the other modules. Changes for XWiki Tools v1.2: ** Bug * [XTOOLS-4] - Shutdown the database only for the HSQLDB database ** Improvement * [XTOOLS-6] - Move the Jetty container files to a module so that they can be reused by the different products without duplication ** Task * [XTOOLS-5] - Move the License files to the XWiki Configuration Resources JAR Here's my +1 Thanks -Vincent

5 4

Re: [xwiki-users] Interface XMLRPC
by Catalin Hritcu 13 Aug '07

13 Aug '07

Hi, As Sergiu pointed out I am currently working to improve the implementation of the XML-RPC API. The discussion is going on xwiki-dev: http://www.nabble.com/Proposal%3A-XML-RPC-API---True-Interoperability-with-… http://www.nabble.com/Why-do-we-throw-exceptions-in-the-ConfluenceRpcInterf… This JIRA issue is also relevant: http://jira.xwiki.org/jira/browse/XWIKI-1560 There are many changes which I will commit after the M4 release, and any additional help on testing them would be appreciated (especially if you can provide us automated tests). On 8/13/07, diaga(a)nomade.fr <diaga(a)nomade.fr> wrote: > Hi, > I am still testing the XMLRPC interface. This the first result I have noticed: > > 1.There are some messages that are not implemented: > -public Map getUser(String token, String username); > -public void addGroup(String token, String group); > -public Object[] getUserGroups(String token, String username); > -public void addUserToGroup(String token, String username, String groupname); > True, they are not yet implemented. But there are many others as well: http://jira.xwiki.org/jira/browse/XWIKI-1559 > 2.To make the update or the creation of a page work normally, I have to get the content of a page and to modify his element to have the result I want. This is linked with the fact that we have to use a Map Object to define a page or Map is an interface. So the other solution I haven't tested is to implement the interface Map instead of getting a page and modifying it. I don't follow you here. Can you please explain better what bothers you here. Or maybe just give the code you had to write now, and how you would like it to be. > 3.For "public Object[] getComments(String token, String pageId);" I have some problem to make it work normally. I would advise you to wait a couple more days and try the new implementation of this method from the SVN repository. > 4.Another result is that I have to flush the cash very often in order to make the Update and creation of a page work. If I don't do that I have to restart my server to see the changes. When all work correct with a login/logout, we see the changes. There were some complaints before that the modifications through xmlrpc don't work well with the caches: http://www.nabble.com/Trouble-with-refresh-after-update-from-xmlrpc-tf39287… http://www.nabble.com/XML-RPC-oddities-tf3607425.html http://www.nabble.com/On-Which-Features-Should-I-Focus-When-Testing--tf3890… Since xmlrpc does not use any sort of caching I always thought that the problem should be somewhere else :) ... But well, maybe we should do something to use those caches. Any suggestions what to do? > 5.When I try to get the content of a document created by a Class, I get the content of the Template linked to the Class. I don't know if this is normal or not. I don't know either. What else would you expect ? Regards, Catalin

2 1

Feature Freeze: 1.1 M4
by Vincent Massol 13 Aug '07

13 Aug '07

Hi, I'd like us to stop committing stuff now and focus on testing and committing fixes for regressions and errors in what we have committed (no more patch applications for stuff in 1.1M3). We need to stabilize now and release 1.1M4 but we can't done that with a minimum of testing. WDYT? Is that ok for everyone? What would be nice is that each of us takes some issues from the 1.1 release notes, test that the implementation works and report it in JIRA as such. Preferably pick issues that you haven't done yourself as it'll be more effective. WDYT? Thanks -Vincent

2 2

Updated 1.1M4 release date
by Vincent Massol 13 Aug '07

13 Aug '07

Hi, We need to start releasing 1.1M4. Here's a tentative release date: * Code freeze tonight (Monday, 23:59PM) * I start doing the release tomorrow morning. Will take me 1 full day I think, meaning 1.1M4 can be released Tuesday night. * I create the 1.1 branch on tuesday too. Bug fixes for RC1 and RC2 go there. * Work on 1.2 trunk can start on Wednesday (I'm not sure how to release from a branch with maven yet as otherwise I could have branched right now - I need to check this out). WDYT? Thanks -Vincent

1 0

Wiki 1.1M4 release: what's left?
by Vincent Massol 13 Aug '07

13 Aug '07

Hi, We need to release 1.1M4. However there are a few things to finish before being able to release it. Here's my list: 1) Do some testing on the new features introduced recently: - nested style macros - history table and related modifications - full screen - wysiwyg new features If everyone could help here that'd be great. 2) Fix code macro as my changed has been rolled back is it was causing problems with other macros coming after. 3) Finish fixing TC so that we can have a full clean build 4) Assess scheduler plugin state and verify it works fine. It's missing some feature (like restart jobs when the server restarts) but that's ok if they are documented and jira issues created for fixing this later on 5) Finish testing the installer 6) Restore xwiki.org clean to remove vandalism + write release notes for 1.1M4 Anything more? Thanks -Vincent

3 5

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