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

Re: [xwiki-devs] [xwiki-notifications] r21811 - in platform: core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/api core/trunk/xwiki-rendering/xwiki-rendering-api core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/parser core/trunk/xwiki-rendering/xwiki-rendering-api/src/main
by Vincent Massol 10 Jul '09

10 Jul '09

On Jul 4, 2009, at 2:44 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-07-04 14:44:30 +0200 (Sat, 04 Jul 2009) > New Revision: 21811 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > Document.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > XWiki.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > XWikiDocument.java > platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/api/ > XWikiTest.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/internal/renderer/ > DefaultPrintRendererFactory.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/parser/Syntax.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/parser/SyntaxType.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/renderer/PrintRendererFactory.java > platform/web/trunk/standard/src/main/webapp/templates/contentview.vm > platform/web/trunk/standard/src/main/webapp/templates/plain.vm > Log: > XWIKI-4042: Add a way to choose the renderer when viewing a page > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > api/Document.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > Document.java 2009-07-04 12:42:14 UTC (rev 21810) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > Document.java 2009-07-04 12:44:30 UTC (rev 21811) > @@ -37,6 +37,7 @@ > import org.suigeneris.jrcs.diff.DifferentiationFailedException; > import org.suigeneris.jrcs.diff.delta.Delta; > import org.suigeneris.jrcs.rcs.Version; > +import org.xwiki.rendering.parser.Syntax; > > import com.xpn.xwiki.XWiki; > import com.xpn.xwiki.XWikiContext; > @@ -473,6 +474,16 @@ > } > > /** > + * @param targetSyntax the syntax in which render the document > content > + * @return the rendered content > + * @throws XWikiException error when rendering content > + */ > + public String getRenderedContent(Syntax targetSyntax) throws > XWikiException > + { > + return this.doc.getRenderedContent(targetSyntax, > getXWikiContext()); > + } Since this is for Velocity, isn't it better to use a syntax Id String instead of a Syntax object which is hard to construct from velocity? > + > + /** > * return a escaped version of the content of this document > */ > public String getEscapedContent() throws XWikiException > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > api/XWiki.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > XWiki.java 2009-07-04 12:42:14 UTC (rev 21810) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/ > XWiki.java 2009-07-04 12:44:30 UTC (rev 21811) > @@ -30,6 +30,8 @@ > import org.apache.commons.logging.LogFactory; > import org.suigeneris.jrcs.diff.delta.Chunk; > import org.xwiki.query.QueryManager; > +import org.xwiki.rendering.parser.Syntax; > +import org.xwiki.rendering.renderer.PrintRendererFactory; > > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.XWikiException; > @@ -2685,4 +2687,42 @@ > { > return this.xwiki.getDefaultDocumentSyntax(); > } > + > + /** > + * Find the corresponding available renderer syntax. > + * <p> > + * If <code>syntaxVersion</code> is null the last version of > the available provided syntax type is returned. > + * > + * @param syntaxType the syntax type > + * @param syntaxVersion the syntax version > + * @return the available corresponding {@link Syntax}. Null if > no available renderer can be found. > + */ > + public Syntax getAvailableRendererSyntax(String syntaxType, > String syntaxVersion) > + { > + Syntax syntax = null; > + > + PrintRendererFactory printRendererFactory = > + (PrintRendererFactory) > Utils.getComponent(PrintRendererFactory.class); > + > + List<Syntax> availableSyntaxes = > printRendererFactory.getAvailableSyntaxes(); We already have the notion of available syntaxes in the SyntaxFactory. I don't understand why we need to have them in the PrintRendererFactory (which is not supposed to return syntaxes BTW, it's only supposed to return PrintRenderer(s). > + > + for (Syntax availableSyntax : availableSyntaxes) { Why not instead do: SyntaxType syntaxType = SyntaxType.getSyntaxType(syntaxTypeAsString); And then (when syntaxVersion != null): Syntax syntax = new Syntax(syntaxType, syntaxVersion); And then: syntaxFatory.getAvailableSyntaxes().contains(syntax) hmmm.... Actually thinking more about it, I believe this whole code should be moved out of XWikiDocument and instead go in the rendering module in SyntaxFactory. > + if (syntaxVersion != null) { > + if > (availableSyntax.getType().toIdString().equalsIgnoreCase(syntaxType) > + && > availableSyntax.getVersion().equals(syntaxVersion)) { > + syntax = availableSyntax; > + break; > + } > + } else { > + // TODO: improve version comparaison since it does > not work when comparing 2.0 and 10.0 for example. We > + // should have a Version which implements > Comparable like we have SyntaxId in Syntax > + if > (availableSyntax.getType().toIdString().equalsIgnoreCase(syntaxType) > + && (syntax == null || > availableSyntax.getVersion().compareTo(syntax.getVersion()) > 0)) { > + syntax = availableSyntax; > + } > + } > + } > + > + return syntax; > + } > } [snip] > > /** > + * @return the syntax of the document > + */ > + private Syntax getSyntax() > + { > + Syntax syntax = null; > + > + String syntaxId = getDefaultDocumentSyntax(); > + try { > + syntax = > this.syntaxFactory.createSyntaxFromIdString(getSyntaxId()); Shouldn't we save the Syntax object instead of syntaxId in XWikiDocument so that we don't perform the conversion every time getSyntax is called? > + } catch (ParseException e) { > + LOG.error("Failed to genrate Syntax object for syntax > identifier [" + syntaxId + "] in page [" Typo: generate > + + getDocumentName() + "]", e); > + > + syntaxId = getDefaultDocumentSyntax(); I don't understand this line above, it's the same as the one a few lines above. > + try { > + syntax = > this > .syntaxFactory.createSyntaxFromIdString(getDefaultDocumentSyntax()); It seems you're not using the syntaxId variable. > + } catch (ParseException e1) { > + LOG.error("Failed to genrate default Syntax object. > The defautlt syntax id in [" + syntaxId + "]", e); same typo [snip] > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/ > pom.xml > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > 2009-07-04 12:42:14 UTC (rev 21810) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > 2009-07-04 12:44:30 UTC (rev 21811) > @@ -187,7 +187,9 @@ >  > <exclude>org/xwiki/rendering/macro/MacroManager</ > exclude> > <exclude>org/xwiki/rendering/macro/MacroSource</ > exclude> > - <exclude>org/xwiki/rendering/macro/ > AbstractMacroSource</exclude> > + <exclude>org/xwiki/rendering/macro/ > AbstractMacroSource</exclude> > +  It doesn't normally (it' considered as an INFO level) unless it breaks binary compatibility. But I don't know why in your case (would need to check more the code, i'm only looking at the svn diff). > + <exclude>org/xwiki/rendering/renderer/ > PrintRendererFactory</exclude> > </excludes> > </configuration> > </execution> > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/ > src/main/java/org/xwiki/rendering/internal/renderer/ > DefaultPrintRendererFactory.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/internal/renderer/ > DefaultPrintRendererFactory.java 2009-07-04 12:42:14 UTC (rev 21810) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/internal/renderer/ > DefaultPrintRendererFactory.java 2009-07-04 12:44:30 UTC (rev 21811) > @@ -19,6 +19,10 @@ > */ > package org.xwiki.rendering.internal.renderer; > > +import java.util.Arrays; > +import java.util.Collections; > +import java.util.List; > + > import org.xwiki.component.annotation.Component; > import org.xwiki.component.annotation.Requirement; > import org.xwiki.rendering.parser.Syntax; > @@ -43,6 +47,10 @@ > @Component > public class DefaultPrintRendererFactory implements > PrintRendererFactory > { > + private static final List<Syntax> AVAILABLE_SYNTAXES = > + > Collections.unmodifiableList(Arrays.asList(Syntax.XHTML_1_0, > Syntax.XWIKI_2_0, Syntax.EVENT_1_0, > + Syntax.TEX_1_0, Syntax.PLAIN_1_0)); I don't like this, see above. > + > /** > * Factory to easily create an XHTML Image and Link Renderers. > */ > @@ -55,6 +63,16 @@ > /** > * {@inheritDoc} > * > + * @see > org > .xwiki.rendering.renderer.PrintRendererFactory#getAvailableSyntaxes() > + */ > + public List<Syntax> getAvailableSyntaxes() > + { > + return AVAILABLE_SYNTAXES; > + } > + I don't like this, see above. [snip] Thanks -Vincent

1 0

[xwiki-devs] default behavior of editsection when including documents?
by Pascal Voitot 10 Jul '09

10 Jul '09

Hello, I can now edit sections on my 1.9RCx (modifications where light so I could retrofit them) But when I do sthg like: {{include document="MyDocument"/}} I don't see the section editing for the included content. Is it the default behavior not to propose section editing when the document is included into another one? regards Pascal

2 2

[xwiki-devs] section editing in wiki/2.0
by Pascal Voitot 09 Jul '09

09 Jul '09

Hello, apparently this feature is no more "directly" available in wiki/2.0. But when I use /xwiki/bin/edit/MySpace/MyDoc?section=1, it edits the section 1 of my doc but when I save it, it keeps only section 1 in the doc and removes everything else. Is it a bug? regards Pascal

2 2

[xwiki-devs] [xoo] XOO status
by Cristina Scheau 08 Jul '09

08 Jul '09

Hi all! If you were curious about how is going with XOO, you can install it in your OpenOffice 3.0. You can find more details about how to install it and the extension archive in my blog : http://gsoc.myxwiki.org/xwiki/bin/view/XWiki+Integration+With+Open+Office/X… There are still a lot of features to implement, but your feedback is very important to me. Thank you, Cristina

4 7

[xwiki-devs] [VOTE] Move wiki macro instantiation code into xwiki-core
by Asiri Rathnayake 08 Jul '09

08 Jul '09

Hi Devs, This is about the wiki-macro-bridge. According to our previous discussion, I was going to put document listening, macro creation and macro registration logic into xwiki-core-rendering-macro-wikibridge module. But as it seems the macro creation part is going to be highly dependant on bridges (DAB) and would require a couple of more methods on DAB. Since DAB is becomming heavy and poluted, I'm proposing that we split the wikimacrobridge as follows: * Keep document listening, macro registration and macro de-registration logic inside xwiki-core-rendering-macro-wikibridge module as it is. * Differ the macro instantiation logic into some component interface (WikiMacroGenerator). * Have the default WikiMacroGenerator in xwiki-core. (perhaps inside com.xpn.xwiki.doc? any other place?) Here is my +1. Thanks. - Asiri

5 5

[xwiki-devs] Accessing the XWiki Source
by Lawry, Joe 07 Jul '09

07 Jul '09

All, I just started using XWiki recently and was curious as to how I can access its source. The reason I ask is because there's a link on the Main page that I'd like to modify but can't. The link itself is what users click to log into the wiki and is located above the Registration link on the Main page. I've added another link on the Main page as a temporary solution to the problem but would like to either redirect or remove the link altogether. Thank you in advance for your time. Respectfully, Joe Lawry

2 2

[xwiki-devs] Blog 2.0 Upgrade Status
by Andreas Schaefer 06 Jul '09

06 Jul '09

Hi With a seemingly futile attempt I finally was able to create blog documents with 2.0 syntax. The blog is displaying the the entries as well as the blog web home nicely. The only thing I noticed is that the document of the blog entry is still marked xwiki/1.0. For now except the Blog.WebHome all the changed documents contain a '2' prefix so that it is possible to compare them when needed. I am sure that there is more to be done but for now I am happy that at least the first step is done. As soon as I am back home I will export the blog documents and zip up the changed files. Because I cannot upload them onto this mailing list I was wondering if I should create a JIRA report and attached there. Have fun Andreas Schaefer CEO of Madplanet.com Inc. EMail: andreas.schaefer(a)madplanet.com schaefera(a)me.com Twitter: andy_mpc AIM: schaefera(a)me.com

2 1

[xwiki-devs] Blog Syntax Upgrade to XWiki Syntax 2.0
by Andreas Schaefer 06 Jul '09

06 Jul '09

Using the XWiki blog quite often I am sometimes frustrated by the fact that still in 2.0 M1 the syntax based on 1.0. Beside the fact that nobody found time and/or urge to attack that is there any other reason why this cannot be done ? In case it is possible and someone could tell me where to start looking into it I would try to accomplish that. For now I cannot promise anything because my time is very limited and free time is quite unpredictable. Cheers Andreas Schaefer CEO of Madplanet.com Inc. EMail: andreas.schaefer(a)madplanet.com schaefera(a)me.com Twitter: andy_mpc AIM: schaefera(a)me.com

3 3

[xwiki-devs] what's the best way to "scrape" an HTML document with Xwiki
by Niels Mayer 06 Jul '09

06 Jul '09

Is there anything like the Xwiki-feed-plugin except that instead of fetching a feed, it would fetch an HTML document via HTTP, returning a DOM structure that can be scanned or filtered by API-calls, e.g.: $fetchedDom = $xwiki.FetchPlugin.getDocumentDOM("http://nielsmayer.com") $images = $fetchedDom.getImgList() $media = $fetchedDom.getAnchorHREFsByExtension([".mp3", ".mv4", ".mp4"]) $content = $fetchedDom.getDivListById(['xwikicontent, 'container', 'content']) Since this would happen on the server, you'd probably need to "fake" being a real browser (or just capture the user's browser configuration and pass it via the call to the hypothetical "getDocumentDOM()" in order to capture an accurate scraped representation of a modern site.) The existing examples I've seen store an Xwiki document in the database first. I was hoping there was an "in memory" option that would allow for the document to be maintained in the app's context for long enough to process the remaining stream of plugin calls such as "getDivListById()" or "getAnchorHREFsByExtension()" and then appropriately dispose the DOM when no longer referenced, via garbage collection. Maybe compared to the implementation headaches -- of retrieving a potentially large document into memory incrementally, parsing it into a DOM incrementally, making that available in the context, etc -- maybe I should just write the damn document into the database, scrape it, and delete it. Since I would use Xwiki to store a JSON "scrape" of the document in the DB (as a xwiki doc), I could store it in XWiki.JavaScriptExtension[0] of the retrieved document, and then just delete the wiki-contents after scraping.... So actually, if anybody has any suggestions for "scraping" with a retrieved document, stored as Xwiki doc, please, suggest as well! This seems like an area potentially fraught with peril that many people have already dealt with, so I would appreciate advice. Thanks, Niels http://nielsmayer.com

3 3

[xwiki-devs] Blog 2.0 Conversion
by Andreas Schaefer 04 Jul '09

04 Jul '09

Hi Well, right now it is 1 step forward and 2 steps back. After much trial and error I finally did this: Convert to 2.0: - BlogSheet - CreatePost - BlogPostTemplate - BlogPostSheet This enables me to create a 2.0 blog entry but the display of that entry fails miserable. For example the Edit Tools (Publish/Hide, Edit, Delete) are having comment added to it because 2.0 adds comments of what it is doing into the HTML page but when that is inside a string ("") and the code contains double quotes as well all hell breaks loose. But when I tried to convert BlogCode (which contains the creation of the Edit Tools) then the panels start to fail. In turn these panels are still 1.0 and so I cannot convert all of them. Any idea how to fix that? Thanks - Andy

1 0