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

Re: [xwiki-devs] [xwiki-notifications] r25288 - enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/xmlrpc platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc platform/core/trunk/xwiki-xmlrpc/xwiki-xmlrpc-client/src/main/java/org/xwiki/xmlrpc platform/core/trunk/xwiki-xmlrpc/xwiki-xmlrpc-model/src/main/java/org/xwiki/xmlrpc
by Sergiu Dumitriu 30 Nov '09

30 Nov '09

On 11/26/2009 04:28 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-11-26 16:28:25 +0100 (Thu, 26 Nov 2009) > New Revision: 25288 > > Added: > enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/xmlrpc/RenderingTest.java > Modified: > enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/AllTests.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXmlRpcApiImpl.java > platform/core/trunk/xwiki-xmlrpc/xwiki-xmlrpc-client/src/main/java/org/xwiki/xmlrpc/XWikiXmlRpcClient.java > platform/core/trunk/xwiki-xmlrpc/xwiki-xmlrpc-model/src/main/java/org/xwiki/xmlrpc/XWikiXmlRpcApi.java > Log: > XWIKI-4464: Extend the XmlRpc API with new rendering features > * Apply patch from Florin Ciubotaru: > ** New getRenderedContendMethods added to the api(We still need a few votes on devs for these to get commited). Completed the client with the new additions. > ** Added integration tests. > > Modified: enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/AllTests.java > =================================================================== > --- enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/AllTests.java 2009-11-26 11:14:42 UTC (rev 25287) > +++ enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/AllTests.java 2009-11-26 15:28:25 UTC (rev 25288) > @@ -62,6 +62,7 @@ > addTestCase(suite, org.xwiki.xmlrpc.XWikiClassesTest.class); > addTestCase(suite, org.xwiki.xmlrpc.XWikiObjectsTest.class); > addTestCase(suite, org.xwiki.xmlrpc.SearchTest.class); > + addTestCase(suite, org.xwiki.xmlrpc.RenderingTest.class); > > return new XWikiTestSetup(suite); > } > > Added: enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/xmlrpc/RenderingTest.java > =================================================================== > --- enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/xmlrpc/RenderingTest.java (rev 0) > +++ enterprise/trunk/distribution-test/xmlrpc-tests/src/test/it/org/xwiki/xmlrpc/RenderingTest.java 2009-11-26 15:28:25 UTC (rev 25288) > @@ -0,0 +1,145 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + * > + */ > +package org.xwiki.xmlrpc; > + > +import java.util.List; > + > +import junit.framework.Assert; > + > +import org.apache.xmlrpc.XmlRpcException; > +import org.xwiki.xmlrpc.model.XWikiPage; > + > +public class RenderingTest extends AbstractXWikiXmlRpcTest > +{ > + public void testGetInputSyntaxes() throws XmlRpcException > + { > + List<String> syntaxes = rpc.getInputSyntaxes(); > + > + TestUtils.banner("TEST: getInputSyntaxes()"); I'd swap the banner setting and the retrieval method, since if the method fails, then the banner won't be set. Also, System.out should not be used. > + System.out.format("%d conversion input syntaxes found:\n", syntaxes.size()); > + for (String syntaxId : syntaxes) { > + System.out.format("%s\n", syntaxId); > + } > + Assert.assertTrue(syntaxes.size() != 0); > + } > + > + public void testGetOutputSyntaxes() throws XmlRpcException > + { > + List<String> syntaxes = rpc.getOutputSyntaxes(); > + > + TestUtils.banner("TEST: getOutputSyntaxes()"); > + System.out.format("%d conversion output syntaxes found:\n", syntaxes.size()); > + for (String syntaxId : syntaxes) { > + System.out.format("%s\n", syntaxId); > + } > + Assert.assertTrue(syntaxes.size() != 0); > + } > + > + public void testConvert() throws XmlRpcException > + { > + String inputXWiki = > + "**BoldText**//ItalicText//" + String.format("%n") + "==h2Text==" + String.format("%n") + "normalText"; Why String.format("%n")? Doesn't a simple \n suffice? Or, if the reak system endline must be used, for a reason I can't see now, how about org.apache.commons.lang.SystemUtils.LINE_SEPARATOR or the raw System.getProperty("line.separator")? > + String inputXhtml = > + "<div><p><strong>boldText</strong><br/><em>ItalicText</em></p>" + String.format("%n") > + + "<h2 id=\"h2Text\"><span>h2Text</span></h2><p>normalText</p></div>"; > + > + TestUtils.banner("TEST: convert()"); > + System.out.format("\nTesting xwiki/2.0 -> xhtml/1.0 conversion\n"); > + System.out.format("Input text:\n%s", inputXWiki); > + > + String outputXhtml = rpc.convert(inputXhtml, "xwiki/2.0", "xhtml/1.0"); > + > + System.out.format("\nOutput text:\n%s", outputXhtml); > + > + Assert.assertNotNull(outputXhtml); > + Assert.assertFalse(outputXhtml.equals("")); You could also test some generated markup here. > + Assert.assertTrue(outputXhtml.contains("strong")); > + Assert.assertTrue(outputXhtml.contains("normalText")); > + Assert.assertTrue(outputXhtml.contains("ItalicText")); > + > + System.out.format("\nTesting xhtml/1.0 -> xwiki/2.0 conversion\n"); > + System.out.format("Input text:\n%s", inputXhtml); > + > + String outputXWiki = rpc.convert(inputXhtml, "xhtml/1.0", "xwiki/2.0"); > + > + System.out.format("\nOutput text:\n%s\n", outputXWiki); > + > + Assert.assertNotNull(outputXWiki); > + Assert.assertFalse(outputXhtml.equals("")); > + Assert.assertTrue(outputXhtml.contains("normalText")); > + Assert.assertTrue(outputXhtml.contains("ItalicText")); > + } > + > + public void testGetRenderedContent() throws XmlRpcException > + { > + String pageContent = "**Text in Bold**{{velocity}}VelocityCode{{/velocity}}"; > + > + XWikiPage page = new XWikiPage(); > + page.setId(TestConstants.TEST_PAGE); > + page.setContent(pageContent); > + page.setSyntaxId("xwiki/2.0"); > + > + TestUtils.banner("TEST: getRenderedContent()"); > + System.out.format("\nCalling getRenderedContent for page %s\n", page.getId()); > + System.out.format("\nWiki content is:\n%s\n", pageContent); > + > + rpc.storePage(page); > + > + try { > + String renderedContent = rpc.getRenderedContent(page.getId(), "annotatedxhtml/1.0"); > + > + System.out.format("\nObtained rendered content:\n%s\n\n", renderedContent); > + > + Assert.assertTrue(renderedContent.contains("Text in Bold")); > + Assert.assertTrue(renderedContent.contains("startmacro")); > + } finally { > + rpc.removePage(page.getId()); > + } > + } > + > + public void testRenderPageContent() throws XmlRpcException > + { > + String pageContent = "**Text in Bold**{{velocity}}VelocityCode{{/velocity}}"; > + > + XWikiPage page = new XWikiPage(); > + page.setId(TestConstants.TEST_PAGE); > + page.setContent(pageContent); > + page.setSyntaxId("xwiki/2.0"); > + > + TestUtils.banner("TEST: renderPageContent"); > + System.out.format("\nCalling renderPageContent with context as page %s\n", TestConstants.TEST_PAGE); > + System.out.format("\nWiki content is:\n%s\n", pageContent); > + > + rpc.storePage(page); > + > + try { > + String renderedContent = > + rpc.renderPageContent(page.getId(), page.getContent(), page.getSyntaxId(), "annotatedxhtml/1.0"); > + > + System.out.format("\nObtained rendered content:\n%s\n\n", renderedContent); > + > + Assert.assertTrue(renderedContent.contains("Text in Bold")); > + Assert.assertTrue(renderedContent.contains("startmacro")); > + } finally { > + rpc.removePage(page.getId()); > + } > + } > +} > > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXmlRpcApiImpl.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXmlRpcApiImpl.java 2009-11-26 11:14:42 UTC (rev 25287) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXmlRpcApiImpl.java 2009-11-26 15:28:25 UTC (rev 25288) > @@ -1455,4 +1455,47 @@ > } > return syntaxes; > } > + > + /** > + * Renders a text in the context of a wiki page. > + * > + * @param token The authentication token. > + * @param pageId The id of the page. > + * @param content The context to be rendered. > + * @param sourceSyntaxId The syntax of the content. > + * @param targetSyntaxId The target syntax of the rendered content > + * @return The rendered content. > + * @throws Exception If a invalid token is provided, an unsupported syntax id is given or the rendering fails. > + */ Make sure a user can't use the programming rights of a page to interpret his own text. > + public String renderPageContent(String token, String pageId, String content, String sourceSyntaxId, > + String targetSyntaxId) throws Exception > + { > + XWikiXmlRpcUser user = XWikiUtils.checkToken(token, this.xwikiContext); > + LOG.debug(String.format("User %s has called renderPageContent()", user.getName())); > + > + Document doc = XWikiUtils.getDocument(this.xwikiApi, pageId, true); > + > + return doc.getRenderedContent(content, sourceSyntaxId, targetSyntaxId); > + } > + > + /** > + * Gets the rendered content of an existing document. > + * > + * @param token The authentication token. > + * @param pageId The id of the page. > + * @param syntaxId The target syntax of the rendered content > + * @return The rendered content > + * @throws Exception If a invalid token is provided, an unsupported syntax id is given or the rendering fails. > + */ > + public String getRenderedContent(String token, String pageId, String syntaxId) throws Exception > + { > + XWikiXmlRpcUser user = XWikiUtils.checkToken(token, this.xwikiContext); > + LOG.debug(String.format("User %s has called getRenderedContent()", user.getName())); > + > + Document doc = XWikiUtils.getDocument(this.xwikiApi, pageId, true); > + SyntaxFactory syntaxFactory = Utils.getComponent(SyntaxFactory.class); > + Syntax syntax = syntaxFactory.createSyntaxFromIdString(syntaxId); > + > + return doc.getRenderedContent(syntax); > + } > } > -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

[xwiki-devs] Generate URL Link and Save it in WYSIWYG editor
by Leon Wang 29 Nov '09

29 Nov '09

Hi Devs, Hi Marius, Could you give me some clues how to generate and save a page url that could locate to the position of a certain title/section of the article within the WYSIWYG editor, for example like this url, http://platform.xwiki.org/xwiki/bin/view/DevGuide/APIGuide#HAccessobjectsin…, click this link it will bring me to "Access objects in a page" subtitle. What I want to achieve is that in the WYSIWYG editor after I highlighted a sentence and clicked the Requirement tree node, it will highlight the background of the text and generate a link to the highlighted text, so this generated link could bring designer/system maintainer to the context of the document. Could you point me to the place of your WYSIWYG editor source code that I need to add/change? Do you know how can I get the value of the selected text, should I directly right javascript or should I modify your WYSIWYG source code? Thank you so much! Have a nice new week! Jue Wang (Leon)

1 0

[xwiki-devs] XOO
by Cristina Scheau 29 Nov '09

29 Nov '09

Hi all! How are you? I apologize that I wasn't so active recently. I spent all my time with tasks from my job and my Master. Now I have a little bit more free time (in the evenings and weekends) and I would like to continue the XOO project. I'm not clear what should I exactly do next and maybe you can help me with your feedback and ideas. I'd really like to contribute again to the XWiki software . Although I was not so happy with the API from OpenOffice , last summer was a really interesting experience for me. Thank you, Cristina S.

1 0

[xwiki-devs] [VOTE] New tool, xwiki-tool-standards-validator
by Jean-Vincent Drean 29 Nov '09

29 Nov '09

Hi, I'd like to commit a new standalone tool, xwiki-tool-standards-validator, it allows to run XHTML and Dutch Web Guidelines validation tests (only a few rules for the moment) on an InputStream. This tool will be used by a new enterprise module that I'll commit right after, xwiki-enterprise-test-webstandards which runs the validators on every pages present in the XE distrib. Here's my +1, JV.

7 12

Re: [xwiki-devs] [xwiki-users] Page Loading Optimization
by Jerome Velociter 29 Nov '09

29 Nov '09

Hi Thibaul, all Something easy to do that would contribute to reduce the number of CSS files is to concatenate all the WYSIWYG CSS files from the various plugins at build time (there are more than 10 AFAIK). Marius, have you looked into this? Do you know if this could be done in the 2.1 timeframe ? Note that the target of 1 CSS and 1 JS is pretty challenging for XWiki as we are also making it a modular software where CSS and JS extensions can be conditionally loaded on some (not all) of the pages. Something to investigate for JavaScript extensions could be a dynamic JS loading mecanism, a la dojo (http://dojocampus.org/content/2008/10/09/dojo-module-packaging-and-loading/) Jerome. PS: I put devs in copy as this is more a developer topic. On 11/5/09 5:28 PM, Thibaut Camberlin wrote: > Hi all, > > Page Loading time is a very important criteria when developing a web site. > According to a recent > survey<http://www.webdesignerwall.com/general/users-place-more-weight-on-design/>more > than half people would drive away from a site with slow loading pages. > > There are several interesting issues that could be implemented to > substantially improve page loading time in XWiki. > > Number one is aggreation of CSS and JS files in order to reduce HTTP > requests. (For info, we have a total of 25 external CSS and JS files on a > basic XWiki install when in the best world we would have just 2 - 1 CSS and > 1 JS) > > Someone interrested in working on this with me ? >

6 16

[xwiki-devs] Open Office server on myxwiki.org
by stephane barbey 28 Nov '09

28 Nov '09

Hi Team, Anybody knows if it's possible to make office document import on the myxwiki.org farm ? Thanks in advance. Stéphane Barbey.

2 1

[xwiki-devs] Sai (pvsaikrishna@gmail.com) personally selected you to receive a Shop It To Me invite
by Sai via Shop It To Me 27 Nov '09

27 Nov '09

<p>I know you like good deals on clothing/fashion so I got you a private invitation for Shop It To Me:</p> Go here: http://www.shopittome.com/expiring_invitation/abvba9a9a1e -Sai This private invitation will expire in 24 hours. Sai (pvsaikrishna(a)gmail.com) has sent you a private invitation for Shop It To Me. If you do not want to receive these messages, paste the following link into your browser: http://www.shopittome.com/blocked_email/ZGV2c0B4d2lraS5vcmc_ Shop It To Me, Inc. 340 Brannan Street #201 San Francisco, CA 94107

1 0

Re: [xwiki-devs] [ANN] XWiki Enterprise 2.0.4 and XWiki Enterprise Manager 2.0.4 Released
by Thomas Mortagne 27 Nov '09

27 Nov '09

It's XWiki Enterprise 2.0.4 obviously. On Fri, Nov 27, 2009 at 21:19, Thomas Mortagne <thomas.mortagne(a)xwiki.com> wrote: > The XWiki development team is pleased to announce the release of XWiki > Enterprise 2.0.4 and XWiki Enterprise Manager 2.0.4. > > Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download > > This is a bug fix and enhancement release. > > Among other things it contains: > > * this time statistics are working, promise > * several important users management related issue fixed mainly > visible in path based multiwiki mode > > For more informations see the Release notes at: > http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise204 > and http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM204. > > Thanks > - The XWiki dev team > -- Thomas Mortagne

1 0

[xwiki-devs] [ANN] XWiki Enterprise 2.0.3 and XWiki Enterprise Manager 2.0.4 Released
by Thomas Mortagne 27 Nov '09

27 Nov '09

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.0.4 and XWiki Enterprise Manager 2.0.4. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This is a bug fix and enhancement release. Among other things it contains: * this time statistics are working, promise * several important users management related issue fixed mainly visible in path based multiwiki mode For more informations see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise204 and http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM204. Thanks - The XWiki dev team

1 0

[xwiki-devs] [proposal]Add object manipulation to DocumentAccessBridge and getRenderedContent
by Anca Luca 27 Nov '09

27 Nov '09

Hi devs, in order to complete the clean implementation of the annotation features using components, I would need some API for manipulating objects from the DAB. I thought of 2 versions for it: 1/ create ObjectModelBridge interface implemented by BaseObject with: Object get(String propertyName) void set(String propertyName, Object propertyValue) int getNumber() Add to DAB: ObjectModelBridge createObject(DocumentName docName, String className) Collection<ObjectModelBridge> getObjects(DocumentName docName, String className) void removeObject(DocumentName docName, ObjectModelBridge object) void saveDocument(DocumentName docName) 2/ Add to DAB: int createObject(DocumentName docName, String className) Collection<Map<String, Object>> getObjects(DocumentName docName, String className) void setProperties(DocumentName docName, String className, int objNumber, Map<String, Object> properties) void removeObject(DocumentName docName, int objectNumber) void saveDocument(DocumentName docName) any of the two solutions is fine with me (maybe second a little more because it's minimal) WDYT? Also, since XWikiDocument.getRenderedContent() gets more and more used by various access API to XWiki (GWT, XMLRPC, etc), I propose to add to DAB: getRenderedContent(DocumentName docName, String text, Syntax sourceSyntax, Syntax finalSyntax) which would call XWikiDocument.getRenderedContent() but also xwiki.prepareResources() before so that the msg tools are initialized too (hoping this would help to programatically render a document as similar as possible with what is obtained through the view action & templates). Is there anything I'm missing from the list to achieve this? (any other setting, configuration needed, context setup, etc) Thanks, Anca

2 2