June 2009 - xwiki-devs@xwiki.org

[xwiki-devs] [DISCUSSION] XWiki Chart Api & Chart Macro
by Asiri Rathnayake 26 Jun '09

26 Jun '09

Hello Devs, I have been examining Dan Miron's patches for http://jira.xwiki.org/jira/browse/XWIKI-3313 & http://jira.xwiki.org/jira/browse/XWIKI-2883 and they are working fine. However I think there are few improvements / refactorings that should be done before comitting the code. Most importantly, I would like us to agree upon the xwiki-chart api and xwiki-chart-macro format. xwiki-chart module ============== In dan's implementation, the chart module is actually called xwiki-jfreechart because it is dependant on the jfreechart api. However I think we can extract a generic chart api from dan's implementation without much of a trouble. In his implementation there are three interfaces: * ChartGenerator * DataSource * DataSourceFactory * PlotFactory Out of these interfaces only PlotFactory is dependant on jfreechart. IMO we can construct a generic chart api by making ChartGenerator & DataSource interfaces component roles, hiding PlotFactory in an internal package and getting rid of DataSourceFactory. So the final API would be something like: interface ChartGenerator { File buildChart(DataSource dataSource, Map<String, Object> parameters, File outputDirectory) throws ChartGeneratorException; } And interface DataSource { // Usual tablemodel like api (from dan's implementation) void init (params) // Initializes this datasource from the parameters passed in, no need of a separate factory. } We can also go to a api / implementation approach with multiple modules as in: /platform/core/trunk/xwiki-chart | |-> xwiki-chart-api | |-> xwiki-chart-jfree But I don't know if this is worth the trouble. xwiki-chart-macro ============= Currently the chart macro has a format like: {{chart chartType="line" source="type:XDOM; table_number:1;range:A1-C3;series:rows" title="line (xy_line_and_shape, default)" width="640" height="480"/}} I think we should change the "chartType" parameter to just "type" and the source parameter would be changed like: source="<id>|<params>" here we will use the <id> part as the component hint for the corresponding DataSource... and the <params> string can be anything specific for that DataSource (so we don't put any restrictions). For an example, we could have a datasource named "xdom" like: source="xdom|document=Main.WebHome;table=someTableId;series=rows;hasHeaderRow=true;hasHeaderColumn=true" We load the DataSource corresponding to "xdom" and let it initialize with the parameters string.... (that's why i put a init() method inside DataSource component role). The rest of the parameters would be standard : title, height, width etc. As a start we will have two types of DataSources: XDom and Inline (Already there). This is a quite big discussion and I don't know If I have explained myself correctly. Please let me know what you think about this and how it can be improved. Thanks a lot. - Asiri

3 5

[xwiki-devs] [ANN] XWiki Enterprise 2.0 Milestone 1 released
by Thomas Mortagne 25 Jun '09

25 Jun '09

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.0 Milestone 1. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download It's the first milstone of the 2.0 version. The main goal of 2.0 is to make XWiki fully Xwiki 2.0 syntax. Main changes from 1.9: * Lots of improvements and new features in the new WYSIWYG editor * Lots of improvements and bugfixes in the rendering engine and the syntax converter * New Chart macro for XWiki 2.0 syntax * New info, warning and error macros * Improvements for the blog application * New Search Interface * New events for XWiki startup/shutdown For more information see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise20M1 Thanks -The XWiki dev team

1 0

Re: [xwiki-devs] XWiki Translation
by Ludovic Dubost 25 Jun '09

25 Jun '09

To late, Please make any changes in the future to l10n. Because we cannot reload changes from the Application Resources file. We can only do that once intially. After it's better to do it with l10n because we can handle reviews and view changes needed. It would be great if you could find somebody to run a "review" using the review function on l10n. This allows then to setup a gradual review system for new translations. So, to summarize, l10n is now the reference for latvian translations and we will regularly (before releases) commit changes done there in our svn repository. The current status is commited both in XWiki 1.9 branch and 2.0. So it will be part of 1.9.1 and 2.0M2 (it was too late for 2.0M1) Thanks for your contribution Ludovic Valdis Vītoliņš a écrit : > Hmm... > I found that minor updates are easier to make in resource file. > Please use attached resource file > > Valdis > > >> Translation in l10n.xwiki.org >> >> Valdis >> >>> I see you have put things on l10n.xwiki.org. Which one is the most up to >>> date ? The file added to XE-444 or the translations on l10n.xwiki.org ? >>> >>> Ludovic >>> >>> Valdis Vītoliņš a écrit : >>> >>>> Thanks Ludovic! >>>> It looks quite good. >>>> >>>> When I will do some updates, do I need to care about >>>> http://l10n.xwiki.org/xwiki/bin/view/XE/ only? >>>> I assume all other stuff to implement it in vanilla Xwiki you will do >>>> "automagically"? >>>> >>>> Valdis >>>> >>>> >>>>> To test it, copy your resource file to >>>>> >>>>> webapps/xwiki/WEB-INF/classes/ApplicationResources_lv.properties >>>>> >>>>> and restart your instance. >>>>> >>>>> Ludovic >>>>> >>>>> Valdis Vītoliņš a écrit : >>>>> >>>>> >>>>>> Hello Ludovic! >>>>>> I've prepared resource file and attached it to the bug in >>>>>> http://jira.xwiki.org/jira/browse/XE-444 >>>>>> >>>>>> Can you provide guide how can I import it in test instance? >>>>>> (Do I need the latest XWiki version or ~ similar?) >>>>>> >>>>>> Thanks, >>>>>> Valdis >>>>>> >>>>>> >>>>>> >>>>>> >>>>>>> Attach us your initial resource file to the bug if you have one already >>>>>>> >>>>>>> Ludovic >>>>>>> >>>>>>> Valdis Vītoliņš a écrit : >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Thanks Ludovic! >>>>>>>> >>>>>>>> I've created task in jira, look at description in >>>>>>>> http://jira.xwiki.org/jira/browse/XE-444 >>>>>>>> >>>>>>>> 2 character ISO code for Latvian is lv. >>>>>>>> >>>>>>>> http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes >>>>>>>> >>>>>>>> Valdis >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> Hi, >>>>>>>>> >>>>>>>>> Great ! This is very cool. >>>>>>>>> >>>>>>>>> Guillaume will add the language for you. What's the ISO code for latvian ? >>>>>>>>> Concerning the initial loading of the resource file we have to do it. >>>>>>>>> You can create a task on http://jira.xwiki.org and once it's commited >>>>>>>>> we'll load the file in l10n.xwiki.org >>>>>>>>> >>>>>>>>> Ludovic >>>>>>>>> >>>>>>>>> >>>>>>>>> Valdis Vītoliņš a écrit : >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> Hello Ludovic! >>>>>>>>>> I'd like to participate in Xwiki translation to Latvian. >>>>>>>>>> Guide in http://l10n.xwiki.org/xwiki/bin/view/L10N/ is too short. >>>>>>>>>> It doesn't say how to add new language and how to upload resource file. >>>>>>>>>> >>>>>>>>>> Also by looking examples I understood non ASCII characters should be >>>>>>>>>> written as escape sequences. >>>>>>>>>> What is the most efficient/user friendly way to do it? >>>>>>>>>> >>>>>>>>>> Thanks in advance, >>>>>>>>>> Valdis Vitolins >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>> >>>>> >>>> >>>> >>> -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

2 1

Re: [xwiki-devs] XWiki Translation
by Ludovic Dubost 25 Jun '09

25 Jun '09

To test it, copy your resource file to webapps/xwiki/WEB-INF/classes/ApplicationResources_lv.properties and restart your instance. Ludovic Valdis Vītoliņš a écrit : > Hello Ludovic! > I've prepared resource file and attached it to the bug in > http://jira.xwiki.org/jira/browse/XE-444 > > Can you provide guide how can I import it in test instance? > (Do I need the latest XWiki version or ~ similar?) > > Thanks, > Valdis > > >> Attach us your initial resource file to the bug if you have one already >> >> Ludovic >> >> Valdis Vītoliņš a écrit : >> >>> Thanks Ludovic! >>> >>> I've created task in jira, look at description in >>> http://jira.xwiki.org/jira/browse/XE-444 >>> >>> 2 character ISO code for Latvian is lv. >>> >>> http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes >>> >>> Valdis >>> >>> >>>> Hi, >>>> >>>> Great ! This is very cool. >>>> >>>> Guillaume will add the language for you. What's the ISO code for latvian ? >>>> Concerning the initial loading of the resource file we have to do it. >>>> You can create a task on http://jira.xwiki.org and once it's commited >>>> we'll load the file in l10n.xwiki.org >>>> >>>> Ludovic >>>> >>>> >>>> Valdis Vītoliņš a écrit : >>>> >>>> >>>>> Hello Ludovic! >>>>> I'd like to participate in Xwiki translation to Latvian. >>>>> Guide in http://l10n.xwiki.org/xwiki/bin/view/L10N/ is too short. >>>>> It doesn't say how to add new language and how to upload resource file. >>>>> >>>>> Also by looking examples I understood non ASCII characters should be >>>>> written as escape sequences. >>>>> What is the most efficient/user friendly way to do it? >>>>> >>>>> Thanks in advance, >>>>> Valdis Vitolins >>>>> >>>>> >>>>> >>>>> >>>>> >>>> >>>> >>> >>> >> -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

1 0

[xwiki-devs] [VOTE] Release XWiki Enterprise 2.0 Milestone 1
by Thomas Mortagne 24 Jun '09

24 Jun '09

Hi devs, Here is a vote for the release of the first milestone of XWiki Enterprise 2.0. The main goal of this release is to make XE fully 2.0 syntax and new WYSIWYG. Among other things (72 fixed issues since 1.9 version) this release introduce: - new char macro - new info, warning, error macros - new search UI - components can receive XWiki startup/shutdown events - it's now easier to change velocity engine properties and provide tools And many other improvements and bugfixes. Here is my +1 -- Thomas Mortagne

4 3

[xwiki-devs] [PROPOSAL] Change default velocity macro filter (was Re: [VOTE] HTML and Velocity macro NL/WS behaviors (TAKE 2))
by Thomas Mortagne 24 Jun '09

24 Jun '09

Hi devs, The chosen filter (B2) is becoming more and more complex (I had to code an almost complete velocity parser to support it correctly) and after some more usability tests from Vincent it does not look so good after all. I coded a very simple parser (based on another of the ideas listed) which only take care of indentation: basically it mean it remove all first white spaces of each line. Vincent tested it and use ## to aerate code and actually it looks pretty good. See http://pastebin.com/m4a681aaf for example (the B2 based one is http://pastebin.com/m17149f85) and most of all it's just one line a code, a simple and quick regexp replaceAll. So i propose to put the new filter as default filter. WDYT ? Here is my +1 On Thu, Jun 4, 2009 at 12:54, Vincent Massol<vincent(a)massol.net> wrote: > Hi, > > We really need to close this before 1.9 final. After discussing it > with Thomas here's what we propose: > > * Introduce a "mode" parameter to the Velocity macro. It's a cleaning mode. > * Implement 2 modes for now: > - the current mode where no cleaning is done > - the B2 mode as defined below (using $nl and $sp) > * Introduce a xwiki.properties config to define the default mode > (which would be B2 by default for now) > > This allows users who are already using the 2.0 syntax today to keep > using the current mode. It also allows us to introduce new cleaning > mode later on (such as the one Ludovic wanted). > > WDYT? > > Here's my +1 > > Thanks > -Vincent > > PS: Please answer ASAP since 1.9 is supposed to be today and Thomas > will need a few hours to implement this. > > On Thu, Apr 16, 2009 at 3:56 PM, Vincent Massol <vincent(a)massol.net> wrote: >> Hi devs, >> We need to come to a conclusion for handling New Lines(NL) and white spaces >> (WS) in HTML and Velocity Macro. >> If you remember from http://markmail.org/thread/mhqhxnz5twhev5se the current >> problem is that we cannot indent scripts since WS and NL are meaningful. >> I'd like to reiterate the proposal that was sent but not enough people voted >> on it (only Thomas did). >> A) For the HTML macro, we propose to make the following changes: >> - strip NL/WS between elements (elements that don't accept CDATA) >> - strip leading/trailing NL/WS for element content before passing them to >> the wiki syntax parser >> B) for the Velocity macro we have 2 choices I can think of: >> 1) strip all leading spaces for all lines (but keep NL) >> Note that this means that inside a velocity macro you wouldn't be able to >> have a line break with the new line starting with spaces without escaping >> the leading space with ~(space). >> Note also that this means we will not be able to add extra new lines to >> format the text nicely (since that would add new paragraphs) or split a >> single line into several lines for extra readability. This is the case today >> with the old syntax and it's a pain not to be able to aerate the text with >> empty lines. >> Ex: >> some text >> ~ next line #if (...) this goes on the same line #something(...) #end >> This is a new paragraph >> In this example notice that we need the velocity #if to be on the same line >> since NL are significant. >> 2) strip all leading spaces for all lines + remove all NL too. >> This means we need to ensure we still have one space remaining between >> "words" (same as HTML). >> The user would use something like $nl and $sp to explicitely enter new lines >> and spaces. >> The advantage is that you control completely the formatting (no magic >> anymore) at the cost of a little extra work (adding the $nl where >> required). >> Basically this means the same pros/cons as when you work with HTML where you >> need to explicitly add <br/> when you want new lines. >> Ex: >> some text $nl >> $sp next line >> #if (...) >> this goes on the same line >> #something(...) <-- this is also on the same line >> #end >> $nl $nl >> This a new paragraph >> Note: I've aerated the text by putting extra new lines around the velocity >> #if to show that it would work. >> 3) Same as 1) + strip 1 NL (i.e. line breaks) and only allow "forced" line >> breaks with "\\". >> The exact algorithm is: if there's 1 NL remove it, if there's more than 1 >> leave them. >> Ex: >> some text\\ >> ~ next line >> #if (...) >> this goes on the same line >> #something(...) <-- this is also on the same line >> #end >> This a new paragraph >> I'm +1 for A) >> For B) I think the most flexible is 2) but I'm wondering if it's too big a >> change for our users or not. If not 2) then 3). >> Thanks >> -Vincent >> > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Thomas Mortagne

4 4

[xwiki-devs] XWiki syntax page broken?
by xwikiml＠emailias.com 24 Jun '09

24 Jun '09

When I go to the syntax page at http://platform.xwiki.org/xwiki/bin/view/Main/XWikiSyntax the contents are empty except for a message: Error number 4001 in 4: Error while parsing velocity page Main.XWikiSyntax Wrapped Exception: Failed to evaluate content with id XWiki Syntax. The current page version is 38.1 and I see the same or similar behavior for versions 37.5, 37.4, 37.3, 37.2 and 37.1. The most recent version that works for me is 36.1. There is a mention of this error in the devs mailing list archive as being fixed in 2008: http://markmail.org/message/wiqd7lrcpre3lo2b Regards, Kevin

1 0

[xwiki-devs] XWiki will be on Stand 107 in Halle 7.2a at LinuxTag Berlin
by Guillaume Lerouge 23 Jun '09

23 Jun '09

Hi XWikiers, LinuxTag will be held in Berlin from tomorrow to saturday onwards. I'll be there to talk about XWiki. >From their website ( http://www.linuxtag.org/ ): "LinuxTag is the most important place for Linux and open source software in Europe. In 2009, the 15th LinuxTag presents news for professional users, decision makers, developers, beginners and the Linux community - from 24th until 27th June on the Fairground in Berlin." If you're around please come say hello and ask all your questions about XWiki ;-) Guillaume

1 0

Re: [xwiki-devs] [xwiki-notifications] r21367 - in sandbox/xwiki-annotation: xwiki-component-annotation/src/main/java/com/xpn/xwiki/component/annotation xwiki-component-annotation/src/main/java/com/xpn/xwiki/component/annotation/internal xwiki-component-annotation/src/main/java/com/xpn/xwiki/component/annotation/internal/alterer xwiki-component-annotation/src/main/java/com/xpn/xwiki/component/annotation/internal/annotation xwiki-component-annotation/src/main/java/com/xpn/xwiki/component/annotation/internal/
by Vincent Massol 23 Jun '09

23 Jun '09

Hi Lucien, Are you sure you've tried all existing diff tools since we must absolutely reduce to the maximum the number of lines of code we write? We're already using jrcs diff and there's also http://code.google.com/p/google-diff-match-patch/ which could help. I'm sure there are others too. Maybe they don't fit your use case but I'd like to be sure we're not adding unnecessary lines of code. Also I'm worried that xwiki committers haven't reviewed your code so far since if there's some problems in the design we won't be able to integrate your module easily. It's better to validate early than late. Thanks -Vincent On Jun 20, 2009, at 4:44 PM, lpereira (SVN) wrote: > Author: lpereira > Date: 2009-06-20 16:44:49 +0200 (Sat, 20 Jun 2009) > New Revision: 21367 > > Added: > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/maintainment/ > AnnotationState.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/maintainment/ > XDiffAnnotationMaintainer.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/maintainment/diff/ > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/maintainment/diff/ > XDiff.java > Modified: > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/AnnotationMaintainer.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/AnnotationService.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/ContentAlterer.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/ContextAlterer.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/DocumentService.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/SelectionService.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/SyntaxFilter.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/ > DefaultAnnotationService.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/alterer/ > DefaultContentAlterer.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/alterer/ > DefaultContextAlterer.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/annotation/Annotation.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/annotation/ > AnnotationImpl.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/content/ > AlteredContent.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/content/ > AlteredContentImpl.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/context/ > AlteredContext.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/context/ > AlteredContextImpl.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/context/Context.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/context/ContextImpl.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/document/ > DefaultDocumentService.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/exception/ > ContextRetrievalException.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/exception/ > NoMatchException.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/exception/ > SelectionExpansionException.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/exception/ > TooMuchMatchesException.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/filter/ > DefaultSyntaxFilter.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/maintainment/ > DefaultAnnotationMaintainer.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/selection/ > AlteredSelection.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/selection/ > AlteredSelectionImpl.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/selection/ > DefaultSelectionService.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/selection/Selection.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/selection/ > SelectionImpl.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/java/ > com/xpn/xwiki/component/annotation/internal/selection/ > SelectionLocation.java > sandbox/xwiki-annotation/xwiki-component-annotation/src/main/ > resources/META-INF/components.txt > sandbox/xwiki-annotation/xwiki-rest-annotation/src/main/java/com/ > xpn/xwiki/rest/annotation/AnnotationRESTService.java > sandbox/xwiki-annotation/xwiki-rest-annotation/src/main/java/com/ > xpn/xwiki/rest/annotation/internal/AbstractAnnotationService.java > sandbox/xwiki-annotation/xwiki-rest-annotation/src/main/java/com/ > xpn/xwiki/rest/annotation/internal/DefaultAnnotationRESTService.java > sandbox/xwiki-annotation/xwiki-rest-annotation/src/main/java/com/ > xpn/xwiki/rest/annotation/internal/SingleAnnotationResource.java > Log: > - wrote a diff algorithm (java-diff is bugged) > - the API seems to use both '\n' and '\n\r' so removed '\r' before > processing (that was causing bugs)

2 1

Re: [xwiki-devs] [xwiki-notifications] r21427 - in sandbox/gsoc/xoo: . src/main/java/org/xwiki/xoo src/main/java/org/xwiki/xoo/xwikilib/converter/internal
by Vincent Massol 23 Jun '09

23 Jun '09

On Jun 22, 2009, at 8:40 PM, cristinas (SVN) wrote: > Author: cristinas > Date: 2009-06-22 20:40:42 +0200 (Mon, 22 Jun 2009) > New Revision: 21427 > > Modified: > sandbox/gsoc/xoo/pom.xml > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XOO.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/ > XWikiExtensionActions.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/xwikilib/converter/ > internal/DefaultBidirectionalConverter.java > Log: > exception solved [snip] > -public class DefaultBidirectionalConverter implements > BidirectionalConverter > +public class DefaultBidirectionalConverter implements > BidirectionalConverter, Initializable > { > > - public static final Syntax XHTML_SYNTAX = new > Syntax(SyntaxType.XHTML, "1.0"); > - > - public static final Syntax XWIKI_20 = new > Syntax(SyntaxType.XWIKI, "2.0"); > - > public String fromXHTML(String html) > { > // TODO Auto-generated method stub > @@ -54,18 +60,21 @@ > { > try { > > + EmbeddableComponentManager ecm = new > EmbeddableComponentManager(); > + ecm.initialize(this.getClass().getClassLoader()); The CM should be be instantiated only once when the app initializes IMO. Thanks -Vincent > + > // Parse > - Parser parser = new WikiModelXWikiParser(); > + Parser parser = ecm.lookup(Parser.class, > Syntax.XWIKI_2_0.toIdString()); > XDOM dom = parser.parse(new StringReader(source)); > > // Execute transformations > - TransformationManager txManager = new > DefaultTransformationManager(); > - txManager.performTransformations(dom, XWIKI_20); > + TransformationManager txManager = > (TransformationManager) ecm.lookup(TransformationManager.class); > + txManager.performTransformations(dom, > parser.getSyntax()); > > // Render > - WikiPrinter printer = new DefaultWikiPrinter(); > - PrintRendererFactory factory = new > DefaultPrintRendererFactory(); > - PrintRenderer renderer = > factory.createRenderer(XHTML_SYNTAX, printer); > + DefaultWikiPrinter printer = new DefaultWikiPrinter(); > + PrintRendererFactory factory = > ecm.lookup(PrintRendererFactory.class); > + Renderer renderer = > factory.createRenderer(Syntax.XHTML_1_0, printer); > dom.traverse(renderer); > > return printer.toString(); > @@ -76,4 +85,10 @@ > > } > > + public void initialize() throws InitializationException > + { > + // TODO Auto-generated method stub > + > + } > + > }

2 1