xwiki-devs July 2009

xwiki-devs@xwiki.org

35 participants
108 discussions

Re: [xwiki-devs] [xwiki-notifications] r21865 - in platform/web/trunk/wysiwyg/src/main: java/com/xpn/xwiki/wysiwyg/client java/com/xpn/xwiki/wysiwyg/client/editor java/com/xpn/xwiki/wysiwyg/client/plugin/image/ui java/com/xpn/xwiki/wysiwyg/client/plugin/link/ui java/com/xpn/xwiki/wysiwyg/client/widget/wizard/util java/com/xpn/xwiki/wysiwyg/server resources/com/xpn/xwiki/wysiwyg/client/editor resources/com/xpn/xwiki/wysiwyg/public resources/com/xpn/xwiki/wysiwyg/public/images resources/com/xpn/xwiki/wysiwyg/

by Sergiu Dumitriu

Marius Dumitru Florea wrote: > Hi Anca, >> + /** >> + * Builds a selector from a list of pages of the specified page. >> + * >> + * @param editedResource the currently edited resource (page for which editing is done) >> + */ >> + public AbstractPageListSelectorWizardStep(ResourceName editedResource) >> + { > >> + super(); > > Isn't this called by default? Yes, by default the super constructor with no parameters is called, so this line is not needed. It makes sense to call super only when calling a constructor with parameters. >> + return LinkWizardSteps.WIKIPAGECREATOR.toString(); > > Since I can't use camelcase on constant names I use an underscore > instead to separate words: WIKI_PAGE_CREATOR. I don't know if this is a > code style convension but it is surely more readable. Yes, this is how it should be done. I'll add it on http://dev.xwiki.org/xwiki/bin/view/Community/CodeStyle a bit later. Related, I'd like to change the codestyle to allow two consecutive underscores to better separate chunks of the name, like a kind of prefix: DOC_COMMENT__TAG_ADDED, DOC_COMMENT__TAG_REMOVED... -- Sergiu Dumitriu http://purl.org/net/sergiu/

15 years, 5 months

[xwiki-devs] [GSoc][XEclipse-Navigator] Mid Term Status.

by Venkatesh Nandakumar

Hi all, You can test the latest xeclipse code by following the README here :- http://svn.xwiki.org/svnroot/xwiki/sandbox/gsoc/xeclipse/README The status of the features completed is here:- http://gsoc.myxwiki.org/xwiki/bin/view/XEclipse/ The svn log gives a more detailed explanation of features. http://svn.xwiki.org/svnroot/xwiki/sandbox/gsoc/xeclipse/log [svn log copy] The bugs I already know of are written in readme. Please let me know how you think the features have shaped up till now, and of course if you find any bugs. Suggestions for more possible features to the Navigator also welcome. A crude approximation gave me the statistic that I've added upto 7.56% of 1.2rc1 xeclipse codebase. Venkatesh Nandakumar Department of Electronics & Computer Engineering Indian Institute of Technology Roorkee

15 years, 5 months

[xwiki-devs] document name with "." in it?

by Pascal Voitot

Hello, For example, I have a space "Space" and I want to create a doc "mydoc.name" in it I do xwiki.getDocument("Space.mydoc.name") but it creates a space "Space.mydoc" and a doc with name "name" is it possible to do that? Pascal

15 years, 5 months

by Vincent Massol

On Jul 5, 2009, at 4:32 PM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2009-07-05 16:32:57 +0200 (Sun, 05 Jul 2009) > New Revision: 21829 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/pom.xml > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/internal/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/internal/ > macro/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/internal/ > macro/footnote/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/internal/ > macro/footnote/FootnoteMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/internal/ > macro/footnote/PutFootnotesMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/macro/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/macro/ > footnote/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/java/org/xwiki/rendering/macro/ > footnote/FootnoteMacroParameters.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/resources/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/resources/META-INF/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/main/resources/META-INF/components.txt > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/java/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/java/org/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/java/org/xwiki/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/java/org/xwiki/rendering/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/java/org/xwiki/rendering/ > RenderingTests.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/resources/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/resources/macrofootnote1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-footnotes/src/test/resources/macrofootnote2.test > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml > Log: > XWIKI-4065: New Footnote macro > Done. > > More functional tests need to be added. [snip] > +/** > + * Generate footnotes, listed at the end of the page. A reference > to the generated footnote is inserted at the location > + * where the macro is called. > + * > + * @version $Id$ > + * @since 2.0M2 > + */ > +(a)Component(FootnoteMacro.MACRO_NAME) > +public class FootnoteMacro extends > AbstractMacro<FootnoteMacroParameters> > +{ > + /** The name of this macro. */ > + public static final String MACRO_NAME = "footnote"; > + > + /** The description of the macro. */ > + private static final String DESCRIPTION = "Genereates a > footnote to display at the end of the page."; typo: generates [snip] Thanks -Vincent

15 years, 5 months

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

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

15 years, 5 months

[xwiki-devs] default behavior of editsection when including documents?

by Pascal Voitot

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

15 years, 5 months

[xwiki-devs] section editing in wiki/2.0

by Pascal Voitot

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

15 years, 5 months

[xwiki-devs] [xoo] XOO status

by Cristina Scheau

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

15 years, 5 months

[xwiki-devs] [VOTE] Move wiki macro instantiation code into xwiki-core

by Asiri Rathnayake

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

15 years, 5 months

[xwiki-devs] Accessing the XWiki Source

by Lawry, Joe

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

15 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs July 2009