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

Re: [xwiki-devs] [xwiki-notifications] r24746 - in platform/web/trunk/wysiwyg: . src/main/java/com/xpn/xwiki/wysiwyg/client src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync src/main/java/com/xpn/xwiki/wysiwyg/server src/main/java/com/xpn/xwiki/wysiwyg/server/filter src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/internal src/main/resources/META-INF src/main/webapp/WEB-INF src/test/java/com/xpn/xwiki/wysiwyg/server/plugin/sync

by Marius Dumitru Florea

mflorea (SVN) wrote: > Author: mflorea > Date: 2009-10-28 11:51:16 +0100 (Wed, 28 Oct 2009) > New Revision: 24746 > > Added: > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncService.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncServiceAsync.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/filter/XWikiContextInitializationFilter.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/XWikiSyncService.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/internal/ > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/internal/DefaultSyncEngine.java > Removed: > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/DefaultSyncEngine.java > Modified: > platform/web/trunk/wysiwyg/pom.xml > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/WysiwygService.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/WysiwygServiceAsync.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/WysiwygServiceAsyncCacheProxy.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncPlugin.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncPluginFactory.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncResult.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncStatus.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncTools.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/DefaultWysiwygService.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/SyncEngine.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/SyncException.java > platform/web/trunk/wysiwyg/src/main/resources/META-INF/components.txt > platform/web/trunk/wysiwyg/src/main/webapp/WEB-INF/web.xml > platform/web/trunk/wysiwyg/src/test/java/com/xpn/xwiki/wysiwyg/server/plugin/sync/SyncTest.java > Log: > XWIKI-4534: Create a SyncService component to be used by SyncPlugin > Also: > * Refactored and cleaned the sync plugin classes a bit > * Made SyncEngine a component > * Added a filter to initialize the XWiki context. This filter is generic and could be moved to xwiki-core. > > > Modified: platform/web/trunk/wysiwyg/pom.xml > =================================================================== > --- platform/web/trunk/wysiwyg/pom.xml 2009-10-28 10:31:41 UTC (rev 24745) > +++ platform/web/trunk/wysiwyg/pom.xml 2009-10-28 10:51:16 UTC (rev 24746) > @@ -107,6 +107,12 @@ > <scope>provided</scope> > </dependency> > <dependency> > + <groupId>org.xwiki.platform</groupId> > + <artifactId>xwiki-core-container-api</artifactId> > + <version>${platform.core.version}</version> > + <scope>provided</scope> > + </dependency> > + <dependency> I don't understand why I need to declare this dependency while the web-gwt module doesn't need to. XWikiServiceImpl uses the Container component and the web-gwt pom has only a dependency on xwiki-core. mvn compiler:compile succeeds. XWikiContextInitializationFilter uses the same Container component and mvn compiler:compile throws "package org.xwiki.container not found". > <groupId>commons-logging</groupId> > <artifactId>commons-logging</artifactId> > <scope>provided</scope> > @@ -198,9 +204,10 @@ > com/xpn/xwiki/wysiwyg/client/plugin/link/LinkConfig.java, > com/xpn/xwiki/wysiwyg/client/plugin/link/LinkConfigTest.java, > com/xpn/xwiki/wysiwyg/client/plugin/image/ImageConfig.java, > - com/xpn/xwiki/wysiwyg/client/plugin/sync/**/*, > - com/xpn/xwiki/wysiwyg/server/plugin/sync/**/*, > - com/xpn/xwiki/wysiwyg/server/DefaultWysiwygService.java, > + com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncPlugin.java, > + com/xpn/xwiki/wysiwyg/client/plugin/sync/SyncTools.java, > + com/xpn/xwiki/wysiwyg/server/plugin/sync/internal/DefaultSyncEngine.java, > + com/xpn/xwiki/wysiwyg/server/plugin/sync/SyncTest.java, > com/xpn/xwiki/wysiwyg/server/DefaultWysiwygServiceTest.java</excludes> > </configuration> > </plugin> > [snip] > Added: platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/filter/XWikiContextInitializationFilter.java > =================================================================== > --- platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/filter/XWikiContextInitializationFilter.java (rev 0) > +++ platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/filter/XWikiContextInitializationFilter.java 2009-10-28 10:51:16 UTC (rev 24746) > @@ -0,0 +1,159 @@ > +/* > + * 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 com.xpn.xwiki.wysiwyg.server.filter; > + > +import java.io.IOException; > + > +import javax.servlet.Filter; > +import javax.servlet.FilterChain; > +import javax.servlet.FilterConfig; > +import javax.servlet.ServletException; > +import javax.servlet.ServletRequest; > +import javax.servlet.ServletResponse; > +import javax.servlet.http.HttpServletRequest; > +import javax.servlet.http.HttpServletResponse; > + > +import org.xwiki.container.Container; > +import org.xwiki.container.servlet.ServletContainerException; > +import org.xwiki.container.servlet.ServletContainerInitializer; > +import org.xwiki.context.Execution; > + > +import com.xpn.xwiki.XWiki; > +import com.xpn.xwiki.XWikiContext; > +import com.xpn.xwiki.XWikiException; > +import com.xpn.xwiki.web.Utils; > +import com.xpn.xwiki.web.XWikiEngineContext; > +import com.xpn.xwiki.web.XWikiRequest; > +import com.xpn.xwiki.web.XWikiResponse; > +import com.xpn.xwiki.web.XWikiServletContext; > +import com.xpn.xwiki.web.XWikiServletRequest; > +import com.xpn.xwiki.web.XWikiServletResponse; > + > +/** > + * This filter can be used to initialize the XWiki context before processing a request. > + * > + * @version $Id$ > + */ > +public class XWikiContextInitializationFilter implements Filter > +{ > + /** > + * The filter configuration object. > + */ > + private FilterConfig filterConfig; > + > + /** > + * {@inheritDoc} > + * > + * @see Filter#destroy() > + */ > + public void destroy() > + { > + filterConfig = null; > + } > + > + /** > + * {@inheritDoc} > + * > + * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain) > + */ > + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, > + ServletException > + { > + try { > + initializeXWikiContext(request, response); > + chain.doFilter(request, response); > + } finally { > + cleanupComponents(); > + } > + } > + > + /** > + * {@inheritDoc} > + * > + * @see Filter#init(FilterConfig) > + */ > + public void init(FilterConfig filterConfig) throws ServletException > + { > + this.filterConfig = filterConfig; > + } > + > + /** > + * Initializes the XWiki context. > + * > + * @param request the request being processed > + * @param response the response > + * @throws ServletException if the initialization fails > + */ > + protected void initializeXWikiContext(ServletRequest request, ServletResponse response) throws ServletException > + { > + XWikiEngineContext xwikiEngine = new XWikiServletContext(filterConfig.getServletContext()); > + XWikiRequest xwikiRequest = new XWikiServletRequest((HttpServletRequest) request); > + XWikiResponse xwikiResponse = new XWikiServletResponse((HttpServletResponse) response); > + > + XWikiContext context; > + try { > + // Create the XWiki context. > + context = Utils.prepareContext("", xwikiRequest, xwikiResponse, xwikiEngine); > + // Initialize the XWiki database. The following method calls context.setWiki(XWiki). > + XWiki.getXWiki(context); > + } catch (XWikiException e) { > + throw new ServletException("Failed to prepare the XWiki context.", e); > + } > + > + // Initialize the Container component which is the new way of transporting the Context in the new component > + // architecture. > + initializeContainerComponent(context); > + } > + > + /** > + * @param context the XWiki context > + * @throws ServletException if the container component initialization fails > + */ > + protected void initializeContainerComponent(XWikiContext context) throws ServletException > + { > + // Initialize the Container fields (request, response, session). Note that this is a bridge between the old core > + // and the component architecture. In the new component architecture we use ThreadLocal to transport the > + // request, response and session to components which require them. > + ServletContainerInitializer containerInitializer = Utils.getComponent(ServletContainerInitializer.class); > + > + try { > + containerInitializer.initializeRequest(context.getRequest().getHttpServletRequest(), context); > + containerInitializer.initializeResponse(context.getResponse().getHttpServletResponse()); > + containerInitializer.initializeSession(context.getRequest().getHttpServletRequest()); > + } catch (ServletContainerException e) { > + throw new ServletException("Failed to initialize Request/Response or Session", e); > + } > + } > + > + /** > + * We must ensure we clean the ThreadLocal variables located in the Container and Execution components as otherwise > + * we will have a potential memory leak. > + */ > + protected void cleanupComponents() > + { > + Container container = Utils.getComponent(Container.class); > + container.removeRequest(); > + container.removeResponse(); > + container.removeSession(); > + > + Execution execution = Utils.getComponent(Execution.class); > + execution.removeContext(); > + } > +} I committed the context initialization filter in the wysiwyg module for now but I think we should move it to xwiki-core if it's generic enough to be used by other servlets (besides the XWikiRemoteServiceServlet). Thanks, Marius

15 years, 11 months

1
0
0 0

[xwiki-devs] Initialize XWikiContext in a servlet filter

by Marius Dumitru Florea

Hi devs, I recently wrote a small servlet that receives GWT requests, calls the component that matches the request and sends back the result. It works fine with components that don't use the XWikiContext. For those components that use it, like DocumentAccessBridge, I need to initialize the XWikiContext. I looked in XWikiServiceImpl (web-gwt) and XWikiAction (xwiki-core) to see how it's done. Most of the initialization code is duplicated and since I don't want to increase the redundancy I was wondering if we could have a servlet filter to do the (generic) initialization instead. WDYT? Thanks, Marius

15 years, 11 months

2
4
0 0

Re: [xwiki-devs] [xwiki-notifications] XWiki updates, 11 documents have been modified since 2009/10/27 00:00

by Anca Luca

Hi devs, it seems that all links to pages from the "xwiki" wiki point to playground.xwiki.org. Is this known / normal? Thanks, Anca On 10/27/2009 07:36 PM, notifications(a)xwiki.org wrote: > > Contents > > * code <#code> > o Plugins <#code:Plugins> > + SwizzlePlugin <#code:Plugins.SwizzlePlugin> > * xwiki <#xwiki> > o Main <#xwiki:Main> > + Download XWiki Products <#xwiki:Main.Download> > + External Links <#xwiki:Main.ExternalLinks> > + Release Notes for XWiki Enterprise 2.0.1 > <#xwiki:Main.ReleaseNotesXWikiEnterprise201> > o XWiki <#xwiki:XWiki> > + Hoormataime <#xwiki:XWiki.Hoormataime> > + PennyWu <#xwiki:XWiki.PennyWu> > + SoubhagyaRanjan <#xwiki:XWiki.SoubhagyaRanjan> > + WatchListMessage <#xwiki:XWiki.WatchListMessage> > + boszme <#xwiki:XWiki.boszme> > + gtvilela <#xwiki:XWiki.gtvilela> > + jvdrean <#xwiki:XWiki.jvdrean> > > Hello Developers, > > This message is sent by XWiki. Here are the documents in your watchlist > that have been modified since the last notification: > > > code > > > Plugins > > > SwizzlePlugin > <http://code.xwiki.org/xwiki/bin/view/Plugins/SwizzlePlugin> <#nav> > > Plugins.SwizzlePlugin > > > On 2009/10/27 11:48, the document has been modified by Vincent > Massol > > XWiki.PluginClass > content: > XWiki.XWikiComments > author: > xwiki:XWiki.VincentMassol > comment: > Julien, I see you’ve changed the link to the swizzle jar. Can you > explain why? > date: > 27/10/2009 11:48:32 > author: xwiki:XWiki.jurevert > xwiki:XWiki.VincentMassol > > > xwiki > > > Main > > > Download XWiki Products > <http://playground.xwiki.org/xwiki/bin/view/Main/Download> <#nav> > > Main.Download > > > Between 2009/10/27 17:07 and 2009/10/27 17:41, the document has > been modified 3 times, by 2 users: Thomas Mortagne, Gabriel Vilela > > #set($enterpriseManagerXemApp = 136817)13817) > #set($enterpriseManagerMysql = 136816)13816) > #set($enterpriseManagerWeb = 136815)13815) > #set($enterpriseManagerWiki = 136818)13818) > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > comment: > XWiki.XWikiComments > author: > XWiki.gtvilela > comment: > Hi, there is a broken link for the file > xwiki-enterprise-manager-mysql-2.0.2.zip ! > Thanks, > Gabriel > date: > 27/10/2009 17:07:07 > XWiki.XWikiComments > author: > XWiki.ThomasMortagne > comment: > Fixed, thanks for the report > date: > 27/10/2009 17:41:35 > replyto: > 32 > > > External Links > <http://playground.xwiki.org/xwiki/bin/view/Main/ExternalLinks> <#nav> > > Main.ExternalLinks > > > Between 2009/10/27 07:44 and 2009/10/27 10:24, the document has > been modified 4 times, by 1 user: Vincent Massol > > #startfloatingbox(){{box cssClass="floatinginfobox" > title="**Contents**"}}{{toc/}}{{/box}} > *Contents* > #toc ("2" "3" "") > #endfloatingbox() > 1 External Links > 1.1= Articles/Presentations and Blog postsposts = > {table}|=Date|=Link|=Description > Date | Link | Description|2009-10-27|[[Un wiki pas comme les > autres>>http://www.toolinux.com/lininfo/toolinux-information/developpement/article/… > in TooLinux presenting a global overview of XWiki Enterprise (French) > 2009-10-07 | [Configure|2009-10-07|[[Configure XWiki and Create a > Formular With Field > Validation>http://blog.ropardo.ro/2009/10/07/configure-xwiki-and-create-a-formular-wit…] > | > NiceValidation>>http://blog.ropardo.ro/2009/10/07/configure-xwiki-and-create-a-formular-wit… > article explaining how to add form validation to forms > 2009-07-02 | [Wiki|2009-07-02|[[Wiki vs > CMS>http://massol.myxwiki.org/xwiki/bin/view/Blog/WikiVsCmsUsi2009] | > SlidesCMS>>http://massol.myxwiki.org/xwiki/bin/view/Blog/WikiVsCmsUsi2009]]|Slides > from Vincent Massol and Tugdual Grall’s presentation at USI 2009 > 2009-06-25 | [Next|2009-06-25|[[Next Gen Wikis: Mixing Content-Oriented > Applications with > Wikis>http://massol.myxwiki.org/xwiki/bin/view/Blog/XWikiAtJazoon2009] | > SlidesWikis>>http://massol.myxwiki.org/xwiki/bin/view/Blog/XWikiAtJazoon2009]]|Slides > from Vincent Massol’s presentation at Jazoon 2009 > 2009-02-06 | [XWiki:|2009-02-06|[[XWiki: What’s new for > 2009>http://massol.myxwiki.org/xwiki/bin/view/Blog/XWikiNews2009] | > Slides2009>>http://massol.myxwiki.org/xwiki/bin/view/Blog/XWikiNews2009]]|Slides > from Vincent Massol’s presentation at a breakfast organized by XWiki SAS > + reused on GlassFish TV > 2008-11-12 | [XEclipse|2008-11-12|[[XEclipse presentation at > EclipseDemo>http://www.slideshare.net/Enygma2002/xeclipse-presentation] > | > SlidesEclipseDemo>>http://www.slideshare.net/Enygma2002/xeclipse-presentation]]|Slides > from Eduard Moraru presenting at EclipseDemo Camps in Iasi > 2008-10-15 | [XWiki|2008-10-15|[[XWiki - User Authentication with Oracle > SSO>http://bodez.wordpress.com/2008/10/15/xwiki-user-authentication-with-oracle…] > | > ExplainsSSO>>http://bodez.wordpress.com/2008/10/15/xwiki-user-authentication-with-oracle… > how to create a custom XWiki authentication implementation to use Oracle > SSO for authenticating users > 2008-09-26 | [Bundling|2008-09-26|[[Bundling GlassFish v3 and > XWiki>http://blogs.sun.com/alexismp/entry/bundling_glassfish_v3_prelude_xwiki] > | > ExplainsXWiki>>http://blogs.sun.com/alexismp/entry/bundling_glassfish_v3_prelude_xwiki]]|E… > how to install XWiki on GlassFish v3 and with JavaDB. > 2008-06-26 | [Wiki > 2.0>http://www.linux-magazine.com.br/images/uploads/pdf_aberto/LM43_56-61.pdf] > | Very|2008-06-26|[[Wiki > 2.0>>http://www.linux-magazine.com.br/images/uploads/pdf_aberto/LM43_56-61.pdf]]… > nice Article for Linux Magazine in Brazilian about XWiki and second > generation wikis. > 2008-02-28 | [Working|2008-02-28|[[Working with > Wikis>http://encodo.ch/en/blogs.php?entry_id=64] | > DescribesWikis>>http://encodo.ch/en/blogs.php?entry_id=64]]|Describes > what is an enterprise wiki and compares several wiki implementation, > including XWiki. > 2008-02-24 | [Towards|2008-02-24|[[Towards End-User Programming with > Wikis>http://www.riehle.org/2008/02/24/towards-end-user-programming-with-wikis/] > | > WhenWikis>>http://www.riehle.org/2008/02/24/towards-end-user-programming-with-wikis/]]… > business software fails to provide the desired functionality, users > typically turn to spreadsheets to perform simple but general > computational tasks. However, spreadsheets enforce a view of the world > that consists mostly of tables and numbers rather than the domain > concepts users have in mind. We are using wikis as a platform for > empowering end-users to perform computational tasks of their choice. > This paper discusses how core properties of wikis can support end-user > programming. > 2008-01-22 | [Optimizing > XWiki>http://encodo.ch/en/blogs.php?entry_id=124] | > Describes|2008-01-22|[[Optimizing > XWiki>>http://encodo.ch/en/blogs.php?entry_id=124]]|Describes tips to > tune XWiki (performance, editor, skin, etc) > 2008-01-22 | [Improving|2008-01-22|[[Improving XWiki?s > Search>http://encodo.com/en/blogs.php?entry_id=123] | > ExplainsSearch>>http://encodo.com/en/blogs.php?entry_id=123]]|Explains > how to customize XWiki’s search page. > 2008-01-22 | From|2008-01-22|From MediaWiki to XWiki. [Part > I>http://encodo.com/en/blogs.php?entry_id=73], [Part > II>http://encodo.com/en/blogs.php?entry_id=74], [Part > III>http://encodo.com/en/blogs.php?entry_id=118] | Excellent[[Part > I>>http://encodo.com/en/blogs.php?entry_id=73]], [[Part > II>>http://encodo.com/en/blogs.php?entry_id=74]], [[Part > III>>http://encodo.com/en/blogs.php?entry_id=118]]|Excellent articles on > migrating from MediaWiki to XWiki with lots of details and code. > 2008-01-16 | [Installing|2008-01-16|[[Installing XWiki on JBoss and > Firebird database>http://blog.progs.be/?p=57] | > Tutorialdatabase>>http://blog.progs.be/?p=57]]|Tutorial about installing > XWiki on JBoss, using a Firebird database > 2007-11-16 | [XWiki|2007-11-16|[[XWiki vies for top spot in enterprise > market>http://www.itmanagersjournal.com/feature/28835] | > Articlemarket>>http://www.itmanagersjournal.com/feature/28835]]|Article > from Mike Ho who attended a XWiki user group meeting > 2007-10-29 | [Valtech|2007-10-29|[[Valtech Days: XWiki as an application > development > platform>http://ericlefevre.net/wordpress/2007/10/29/valtech-days-xwiki-as-an-applic…] > | > Anplatform>>http://ericlefevre.net/wordpress/2007/10/29/valtech-days-xwiki-as-an-applic… > article about the presentation of XWiki Vincent gave during the Valtech > Days 2007 in Paris > 2007-10-11 | [XWiki > Meetup>http://www.nelz.net/roller/nelz/entry/20071011] | > A|2007-10-11|[[XWiki > Meetup>>http://www.nelz.net/roller/nelz/entry/20071011]]|A summary of > the XWiki meetup meeting in San Francisco held on 2007-10-10. > 2007-10-11 | [Clustering > XWiki>http://orionl.blogspot.com/2007/10/clustering-xwiki.html] | > An|2007-10-11|[[Clustering > XWiki>>http://orionl.blogspot.com/2007/10/clustering-xwiki.html]]|An > article about how XWiki was clustered with Terracotta. XEclipse & > OSCache are mentioned along the way. > 2007-09-10 | [Créer|2007-09-10|[[Créer un site associatif avec > XWiki>http://agoncalves.developpez.com/tutoriels/xwiki/creer-un-site-associatif/] > | > VeryXWiki>>http://agoncalves.developpez.com/tutoriels/xwiki/creer-un-site-associatif/]… > good tutorial for installing XWiki (In French) > 2007-06-29 | [XWiki|2007-06-29|[[XWiki 1.0 release on > InfoQ>http://www.infoq.com/news/2007/06/xwiki] | > AnnouncementInfoQ>>http://www.infoq.com/news/2007/06/xwiki]]|Announcement of > the XWiki 1.0 release > 2007-03-13 | [XWiki|2007-03-13|[[XWiki Plugins: Tips & > Tricks>http://hritcu.wordpress.com/2007/03/13/xwiki-plugins-tips-and-tricks/#more-…] > | > FocusTricks>>http://hritcu.wordpress.com/2007/03/13/xwiki-plugins-tips-and-tricks/#more-… > on advanced aspects, in particular on interfacing with XWiki itself and > using some of the extension points. > 2007-03-05 | [UML > Plugin>http://hritcu.wordpress.com/2007/02/19/uml-plugin-for-xwiki/] | > Announcement|2007-03-05|[[UML > Plugin>>http://hritcu.wordpress.com/2007/02/19/uml-plugin-for-xwiki/]]|Announcement > of a UML Plugin for XWiki in the work > 2007-01-29 | [XWiki|2007-01-29|[[XWiki meets > Glassfish>http://blogs.sun.com/alexismp/entry/xwiki_meets_glassfish_v2] > | > InstructionsGlassfish>>http://blogs.sun.com/alexismp/entry/xwiki_meets_glassfish_v2]]|Instructions > on how to run XWiki on GlassFish > 2006-08-22 | [Create|2006-08-22|[[Create and deploy blog and wiki > modules with Apache > Geronimo>http://www-128.ibm.com/developerworks/library/os-ag-wikiblog/index.html] > | > BlogsGeronimo>>http://www-128.ibm.com/developerworks/library/os-ag-wikiblog/index.html]]|B… > and wikis are taking the Internet by storm. These new ways to share > ideas and collaborate with friends have proven worthy of close attention > from all kinds of social groups --~-~- from a few buddies to large > corporations. One reason these technologies thrive is simplicity for > both end users and administrators. Administrators find that Apache > Geronimo is a robust and secure platform for creating new blog and wiki > applications. Find out how you, too, can create blog and wiki > applications using Geronimo and other open source components. > {table} > 1.1= XWiki in the PressPress = > * [Articles[[Articles on XWiki on > Diigo>http://www.diigo.com/user/xwikisas]Diigo>>http://www.diigo.com/user/xwikisas]] > 1.1= Sites referencing XWikiXWiki = > {table}|=Links|=Description > Links | > Description|[[Del.icio.us>>http://del.icio.us/tag/xwiki]]|Collaborative > bookmarking > [Del.icio.us>http://del.icio.us/tag/xwiki] | Collaborative > bookmarking|[[Flickr>>http://www.flickr.com/photos/tags/xwiki/]]|Pictures related > to XWiki > [Flickr>http://www.flickr.com/photos/tags/xwiki/] | Pictures related to > XWiki|[[Framasoft>>http://www.framasoft.net/article3086.html]]|Directory > of Open Source projects > [Framasoft>http://www.framasoft.net/article3086.html] | Directory of > Open Source > projects|[[FreshMeat>>http://freshmeat.net/projects/xwiki/]]|Provides > updates about software releases > [FreshMeat>http://freshmeat.net/projects/xwiki/] | Provides updates > about software releases|[[Gilo IdealX > (fr)>>http://gilo.idealx.com/index.php/XWiki]]|Directory of numerous > Open Source projects, provides a good overview of XWiki (fr) > [Gilo IdealX > (fr)>http://gilo.idealx.com/index.php/XWiki]|Directory|[[Java-Source>>http://java-source.net/open-source/wiki-engines/xwiki]]|Directory > of numerous Open Source projects, provides a good overview of XWiki > (fr)projects > [Java-Source>http://java-source.net/open-source/wiki-engines/xwiki] | > Directory of Open Source > projects|[[Ohloh>>http://www.ohloh.net/projects/68]]|Metrics about open > source projects, like project activity, project cost, active committers, etc > [Ohloh>http://www.ohloh.net/projects/68] | > Metrics|[[SlideShare>>http://www.slideshare.net/tag/xwiki]]|Slides about > open source projects, like project activity, project cost, active > committers, etcXWiki > [SlideShare>http://www.slideshare.net/tag/xwiki] | > Slides|[[Sonar>>http://nemo.sonarsource.org/components/index/XWIKI]]|Development > Metrics about XWikiXWiki projects > [Sonar>http://nemo.sonarsource.org/components/index/XWIKI] | Development > Metrics about XWiki projects|[[Swik>>http://swik.net/XWiki]]|Links > related to XWiki > [Swik>http://swik.net/XWiki] | Links related > to|[[Technorati>>http://technorati.com/tag/xwiki]]|Tags about XWiki on > Technorati > [Technorati>http://technorati.com/tag/xwiki] | Tags about XWiki on > Technorati|[[WikiConsulting>>http://xwiki.blogs.wikiconsulting.com/]]|"Publicize > the goals and practices of leading Wiki Consultants from around the > world, helping the wiki-curious understand the the nature of > transformational change possible with wikis, and helping wiki > professionals to discover one another and network with clients." > [WikiConsulting>http://xwiki.blogs.wikiconsulting.com/] | "Publicize the > goals and > practices|[[WikiIndex>>http://www.wikiindex.org/XWiki]]|"WikiIndex is a > wiki of leading Wiki Consultants from around the world, helping the > wiki-curious understand the the nature of transformational change > possible with wikis, and helping wiki professionals to discover one > anotherpeople and network with clients."wiki ideas." > [WikiIndex>http://www.wikiindex.org/XWiki] | "WikiIndex is a wiki of > wikis, wiki people and wiki > ideas."|[[WikiMatrix>>http://www.wikimatrix.org/show/XWiki]]|A web site > dedicated to comparing Wikis > [WikiMatrix>http://www.wikimatrix.org/show/XWiki] | A web site dedicated > to comparing Wikis|[[Wikipedia(En)>>http://en.wikipedia.org/wiki/XWiki]] > [[Wikipedia(Fr)>>http://fr.wikipedia.org/wiki/XWiki]]|Description of > XWiki on Wikipedia > [Wikipedia(En)>http://en.wikipedia.org/wiki/XWiki] > [Wikipedia(Fr)>http://fr.wikipedia.org/wiki/XWiki]| Description of XWiki > on Wikipedia > {table} > 1.1= Blogs that regularly speak of XWikiXWiki = > * [Ludovic Dubost>http://www.ludovic.org/][[Ludovic > Dubost>>http://www.ludovic.org/]] > * [Vincent Massol>http://massol.net/][[Vincent Massol>>http://massol.net/]] > * [Asiri > Rathnayake>http://asiri.rathnayake.org/xwiki/bin/view/Blog/][[Asiri > Rathnayake>>http://asiri.rathnayake.org/xwiki/bin/view/Blog/]] > * [Jerome > Velociter>http://jerome.myxwiki.org/xwiki/bin/view/Blog/][[Jerome > Velociter>>http://jerome.myxwiki.org/xwiki/bin/view/Blog/]] > * [Stephane Barbey>http://www.collimateur.fr/blog/][[Stephane > Barbey>>http://www.collimateur.fr/blog/]] (in French) > parent: > Main.WebHome > > > Release Notes for XWiki Enterprise 2.0.1 > <http://playground.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise…> > <#nav> > > Main.ReleaseNotesXWikiEnterprise201 > > > On 2009/10/27 18:28, the document has been modified by Thomas > Mortagne > > * XWIKI-4371 - A macro just after a header is wrongly matched as inline > > > XWiki > > > Hoormataime > <http://playground.xwiki.org/xwiki/bin/view/XWiki/Hoormataime> <#nav> > > XWiki.Hoormataime > > > On 2009/10/27 16:20, the document has been created by XWikiGuest > > #includeForm("XWiki.XWikiUserSheet") > XWiki.XWikiRights > allow: > Allow > groups: > XWiki.XWikiAdminGroup > levels: > edit > XWiki.XWikiRights > allow: > Allow > levels: > edit > users: > XWiki.Hoormataime > XWiki.XWikiUsers > active: > Yes > email: > ****************** > first_name: > Hoormataime > last_name: > Hoormataime > password: > ****************** > parent: > XWiki.XWikiUsers > author: > XWiki.Hoormataime > > > PennyWu <http://playground.xwiki.org/xwiki/bin/view/XWiki/PennyWu> > <#nav> > > XWiki.PennyWu > > > On 2009/10/27 16:06, the document has been created by XWikiGuest > > #includeForm("XWiki.XWikiUserSheet") > XWiki.XWikiRights > allow: > Allow > groups: > XWiki.XWikiAdminGroup > levels: > edit > XWiki.XWikiRights > allow: > Allow > levels: > edit > users: > XWiki.PennyWu > XWiki.XWikiUsers > active: > Yes > email: > ****************** > first_name: > Penny > last_name: > Wu > password: > ****************** > parent: > XWiki.XWikiUsers > author: > XWiki.PennyWu > > > SoubhagyaRanjan > <http://playground.xwiki.org/xwiki/bin/view/XWiki/SoubhagyaRanjan> > <#nav> > > XWiki.SoubhagyaRanjan > > > On 2009/10/27 10:04, the document has been created by XWikiGuest > > #includeForm("XWiki.XWikiUserSheet") > XWiki.XWikiRights > allow: > Allow > groups: > XWiki.XWikiAdminGroup > levels: > edit > XWiki.XWikiRights > allow: > Allow > levels: > edit > users: > XWiki.SoubhagyaRanjan > XWiki.XWikiUsers > active: > Yes > email: > ****************** > first_name: > Soubhagya > last_name: > ranjan > password: > ****************** > parent: > XWiki.XWikiUsers > author: > XWiki.SoubhagyaRanjan > > > WatchListMessage > <http://playground.xwiki.org/xwiki/bin/view/XWiki/WatchListMessage> <#nav> > > XWiki.WatchListMessage > > > Between 2009/10/27 16:42 and 2009/10/27 18:35, the document has > been modified 25 times, by 1 user: Jean-Vincent Drean > > XWiki.Mail > html: > #set($containerStyle = "width:800px;font-family:"font-family: Arial, > Verdana;")Verdana;font-size:95%") > #set($leftColumnStyle#set($rightColumnStyle = > "float:left;width:600px;font-size:80%;")"float:right;border:solid 1px > ${darkGray};background:white;margin-left:2em;margin-bottom:2em;padding-right:0.5em;") > #set($rightColumnStyle#set($rightColumnUlStyle = > "float:right;width:200px;border-left:solid 1px > $darkgray;")"margin-left:1em;padding-left:0;") > #set($rightColumnUlStyle = > "margin-left:1em;padding-left:0;font-size:90%;list-style-type:empty-circle;") > #set($rightColumnTitleStyle = "margin:0.5em;") > <div style="$rightColumnStyle"> > <h2 style="$rightColumnTitleStyle">$msg.get("Contents")<a > name="nav"><span> </span></a></h2> > #set($firstEntry = true) > #set($previousEvent = "") > #set($previousDoc = "") > <ul style="$rightColumnUlStyle"> > #foreach ($event in $events) > #set($prefixedFullName = $event.getPrefixedFullName()) > #set($newWiki = ($event.getWiki() != $previousEvent.getWiki())) > #if ($newWiki) > #if (!$firstEntry) </ul></li></ul></li> #else #set($firstEntry = false) #end > #set($previousEvent = "") > <li><a href="#$event.getWiki()" > style="$rightColumnAStyle">$event.getWiki()</a> > <ul style="$rightColumnUlStyle"> > #end > #set($newSpace = ($event.getSpace() != $previousEvent.getSpace())) > #if ($newSpace) > #if (!$firstEntry && !$newWiki) </ul></li> #end > #set($previousEvent = "") > <li><a href="#${event.getWiki()}:$event.getSpace()" > style="$rightColumnAStyle">$event.getSpace()</a> > <ul style="$rightColumnUlStyle"> > #end > #set($newDocument = $prefixedFullName != $previousDoc.getPrefixedFullName()) > #if($newDocument) > #set($currentDoc = $xwiki.getDocument($prefixedFullName)) > <li><a href="#$prefixedFullName" > style="$rightColumnAStyle">$currentDoc.getDisplayTitle()</a></li> > #end > #set($previousEvent = $event) > #set($previousDoc = $currentDoc) > #end > </ul></li></ul></li> > </ul> > </div> > <div style="clear:both;heigth:0;"></div>#set($firstEntry = true) > <div style="$leftColumnStyle"> > #foreach ($event in $events)$events) > #set($firstEntry = ($previousEvent == "")) > #set($newWiki = ($event.getWiki() != > $previousEvent.getWiki()))$previousEvent.getWiki())) > #set($newSpace = ($event.getSpace() != $previousEvent.getSpace())) > #set($newDocument = $prefixedFullName != $previousDoc.getPrefixedFullName()) > #if (!$firstEntry) </div></div></div> #else #set($firstEntry = false) #end > #set($previousEvent = "") > <h1 style="$h1Style" id="$event.getWiki()"><imgstyle="$h1Style"><img > src="cid:wiki.gif" style="$iconStyle" ${iconAttrs} /> > $event.getWiki()</h1>/><a > name="$event.getWiki()"><span> </span></a>$event.getWiki()</h1> > #set($newSpace = ($event.getSpace() != $previousEvent.getSpace())) > #set($previousEvent = "") > <h2 style="$h2Style" > id="${event.getWiki()}:$event.getSpace()"><imgstyle="$h2Style"><img > src="cid:space.gif" style="$iconStyle" ${iconAttrs} /> > $event.getSpace()</h2>/><a > name="${event.getWiki()}:$event.getSpace()"><span> </span></a>$event.getSpace()</h2> > #set($newDocument = $prefixedFullName != $previousDoc.getPrefixedFullName()) > <h3 id="$prefixedFullName" style="$h3Style"><img src="cid:document.gif" > style="$iconStyle" ${iconAttrs} /><a > href="$event.getUrl()">$currentDoc.getDisplayTitle()</a>name="$prefixedFullName" > href="$event.getUrl()"><span>$currentDoc.getDisplayTitle()</span></a> <a > href="#nav" > style="text-decoration:none;padding-top:8px;"/><imgstyle="text-decoration:none;padding-top:8px;"><img > src="cid:arrowup.gif" style="border:0;" /></a></h3>width="16px" > height="16px"/></a></h3> > <div id="nav" style="$rightColumnStyle"> > #set($previousEvent = "") > #set($previousDoc = "") > <ul style="$rightColumnUlStyle"> > #foreach ($event in $events) > #set($firstEntry = ($previousEvent == "")) > #set($prefixedFullName = $event.getPrefixedFullName()) > #set($newWiki = ($event.getWiki() != $previousEvent.getWiki())) > #set($newSpace = ($event.getSpace() != $previousEvent.getSpace())) > #set($newDocument = $prefixedFullName != $previousDoc.getPrefixedFullName()) > #if ($newWiki) > #if (!$firstEntry) </ul></li> #end > <li><a href="#$event.getWiki()" > style="$rightColumnAStyle">$event.getWiki()</a> > <ul style="$rightColumnUlStyle"> > #end > #if ($newSpace) > #if (!$firstEntry && !$newWiki) </ul></li> #end > <li><a href="#${event.getWiki()}:$event.getSpace()" > style="$rightColumnAStyle">$event.getSpace()</a> > <ul style="$rightColumnUlStyle"> > #end > #if($newDocument) > #set($currentDoc = $xwiki.getDocument($prefixedFullName)) > <li><a href="#$prefixedFullName" > style="$rightColumnAStyle">$currentDoc.getDisplayTitle()</a></li> > #end > #set($previousEvent = $event) > #set($previousDoc = $currentDoc) > #end > </ul></li></ul> > </div> > </div> > author: XWiki.Admin > XWiki.jvdrean > > > boszme <http://playground.xwiki.org/xwiki/bin/view/XWiki/boszme> > <#nav> > > XWiki.boszme > > > Between 2009/10/27 12:24 and 2009/10/27 12:35, the document has > been modified 2 times, by 1 user: Andras Fejes > > XWiki.XWikiUsers > usertype: > Advanced > XWiki.WatchListClass > > > On 2009/10/27 12:23, the document has been created by XWikiGuest > > #includeForm("XWiki.XWikiUserSheet") > XWiki.XWikiRights > allow: > Allow > groups: > XWiki.XWikiAdminGroup > levels: > edit > XWiki.XWikiRights > allow: > Allow > levels: > edit > users: > XWiki.boszme > XWiki.XWikiUsers > active: > Yes > email: > ****************** > first_name: > Andras > last_name: > Fejes > password: > ****************** > parent: > XWiki.XWikiUsers > author: > XWiki.boszme > > > gtvilela > <http://playground.xwiki.org/xwiki/bin/view/XWiki/gtvilela> <#nav> > > XWiki.gtvilela > > > On 2009/10/27 17:05, the document has been modified by Gabriel > Vilela > > XWiki.WatchListClass > > > On 2009/10/27 17:04, the document has been created by XWikiGuest > > #includeForm("XWiki.XWikiUserSheet") > XWiki.XWikiRights > allow: > Allow > groups: > XWiki.XWikiAdminGroup > levels: > edit > XWiki.XWikiRights > allow: > Allow > levels: > edit > users: > XWiki.gtvilela > XWiki.XWikiUsers > active: > Yes > email: > ****************** > first_name: > Gabriel > last_name: > Vilela > password: > ****************** > parent: > XWiki.XWikiUsers > author: > XWiki.gtvilela > > > jvdrean <http://playground.xwiki.org/xwiki/bin/view/XWiki/jvdrean> > <#nav> > > XWiki.jvdrean > > > Between 2009/10/27 16:45 and 2009/10/27 18:16, the document has > been modified 2 times, by 1 user: Jean-Vincent Drean > > XWiki.WatchListClass > wikis: > xwiki,platform,dev,code,xwiki,dev,code,platform,enterprise,watch,workspaces,xoffice,xeclipse > > > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

15 years, 11 months

1
0
0 0

[xwiki-devs] [Proposal] XWiki "2.0" Syntax

by Vincent Massol

Hi, Since I'm rewriting the new Rendering component (see http://dev.xwiki.org/xwiki/bin/view/Design/NewRenderingArchitecture) , we need to finalize the new syntax we want to have. Right now I'v planned to use the same wiki syntax as now (http://platform.xwiki.org/xwiki/bin/view/Main/ XWikiSyntax#HTextStyles) with only one change: all macros now need to be closed. For example: {macro}...{/macro} and {macro:text|param=value|.../} Is that ok with everyone or do we want to make changes? Thanks -Vincent

15 years, 11 months

4
4
0 0

Re: [xwiki-devs] [xwiki-notifications] r24726 - platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist

by Vincent Massol

On Oct 27, 2009, at 12:31 PM, jvdrean (SVN) wrote: > Author: jvdrean > Date: 2009-10-27 12:31:28 +0100 (Tue, 27 Oct 2009) > New Revision: 24726 > > Modified: > platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/ > plugin/watchlist/WatchListEvent.java > Log: > XPWATCHLIST-91 : Hide email fields in notifications > > Properties named "email" are now obfuscated. > > Modified: platform/xwiki-plugins/trunk/watchlist/src/main/java/com/ > xpn/xwiki/plugin/watchlist/WatchListEvent.java > =================================================================== > --- platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/ > xwiki/plugin/watchlist/WatchListEvent.java 2009-10-26 16:45:15 UTC > (rev 24725) > +++ platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/ > xwiki/plugin/watchlist/WatchListEvent.java 2009-10-27 11:31:28 UTC > (rev 24726) > @@ -78,6 +78,16 @@ > private static final String PREINITIAL_DOCUMENT_VERSION = "1.0"; > > /** > + * Value to display in diffs for hidden properties (email, > password, etc). > + */ > + private static final String HIDDEN_PROPERTIES_OBFUSCATED_VALUE > = "******************"; > + > + /** > + * Name of email property. > + */ > + private static final String EMAIL_PROPERTY_NAME = "email"; > + If you wanted to make this generic you'd need to provide a callback (an interface called) so that applications can have a say in how their data is displayed. There would be default displayers but apps would be able to override them. Then the User application (or the admin app if users are considered inside the admin app) would override the display for XWikiUsers properties named email. That said, it's probably a good idea to obsfucate all email properties by default so an email property type would be a good thing too. Just some ideas for the future and for improved comments in the source code (so that we remember). Thanks -Vincent > + /** > * Event hashcode. > */ > private final int hashCode; > @@ -437,9 +447,10 @@ > > diff.getDifferencesAsHTML(objectDiff.getPrevValue().toString(), > objectDiff.getNewValue().toString(), > false); > > - if > (objectDiff > .getPropType > ().equals > (StringUtils.substringAfterLast(PasswordClass.class.getName(), ".")) > - && !StringUtils.isBlank(propDiff)) { > - propDiff = "******************"; > + // We hide PasswordClass properties and properties named > "email" from notifications for security reasons. > + if > ((objectDiff > .getPropType > ().equals > (StringUtils.substringAfterLast(PasswordClass.class.getName(), ".")) > + || > objectDiff.getPropName().equals(EMAIL_PROPERTY_NAME)) && ! > StringUtils.isBlank(propDiff)) { > + propDiff = HIDDEN_PROPERTIES_OBFUSCATED_VALUE; > } > > return propDiff;

15 years, 11 months

1
0
0 0

Re: [xwiki-devs] Use WYSIWG New Backgournd Color API

by Leon Wang

Hi Marius, I have change it to $wnd["wysiwyg_editor"], so now it looks like: native void setBackgroudColor(String color) /*-{ $wnd["wysiwyg_editor"].getCommandManager().execute('backcolor', color); alert($wnd["wysiwyg_editor"].getCommandManager().getValue('backcolor')); }-*/; And this time the error says:"$wnd[ab].getCommandManager is not a function" Please see the screenshot: http://picasaweb.google.com/lh/photo/wLOJbhbvl0xZe1ZWshA5wg?feat=directlink I was wondering is it because the Java code setBackgroudColor("yellow"); and in native JavaScript do not accept double quoted string only single quoted string? I do deleted all xwiki web 2.0 jar files in lib and replaced with 2.02 jar files. I have no idea what went wrong. Any advise? Thank you, Marius! -Leon

15 years, 11 months

1
0
0 0

Re: [xwiki-devs] Use WYSIWG New Backgournd Color API

by Leon Wang

Hi Marius, I successfully load the tree panel in the WYSIWYG editing model. Thank you so much! :-) I put the compiled xwiki-web-gwt, xwiki-web-wysiwyg and xwiki-webdav 2.02 jar file to the lib folder. After the tree loaded, I found there 2 errors using firebug (thank you for recommendation), one is saying "isc is not defined" in overwritesc.js(), one is saying "isc is not defined" in overwritesc.js(). Here is the screenshot: http://picasaweb.google.com/lh/photo/BxK7IksttDQFB4KtJAJOvg?feat=directlink. Here is what I did, first I modify the template/macros.vm file: Wysiwyg.onModuleLoad(function() { window["wysiwyg_editor"] = new WysiwygEditor($jsVarName); $jsVarName = undefined; }); In the GWT file: native void setBackgroudColor(String color) /*-{ wysiwyg_editor.getCommandManager().execute('backcolor', 'yellow'); alert(wysiwyg_editor.getCommandManager().getValue('backcolor') ); }-*/; /** * This is the entry point method. */ @SuppressWarnings("unchecked") public void onModuleLoad() { Tree tree = new Tree(); tree.setAnimationEnabled(true); TreeItem outerRoot = new TreeItem("DR Tag Tree"); outerRoot.addItem("Alternative"); outerRoot.addItem("Assumption"); outerRoot.addItem("Argument"); outerRoot.addItem("Claim"); outerRoot.addItem("Decision"); outerRoot.addItem("Requirement"); tree.addItem(outerRoot); tree.addSelectionHandler(new SelectionHandler() { public void onSelection(SelectionEvent event) { if (((TreeItem) event.getSelectedItem()).getText().equals( "Alternative")) { setBackgroudColor("yellow"); } else if (((TreeItem) event.getSelectedItem()).getText() .equals("Requirement")) { setBackgroudColor("blue"); } else if (((TreeItem) event.getSelectedItem()).getText() .equals("Decision")) { setBackgroudColor("green"); } Window.alert(((TreeItem) event.getSelectedItem()).getText()); } }); Could you give me some ideas what is wrong? Or what I missed? Thank you, Marius! -Leon

15 years, 11 months

2
1
0 0

[xwiki-devs] [VOTE] Modify ParameterDescriptor/PropertyDescriptor to support id/name

by Thomas Mortagne

Hi devs, We want to display macros parameters pretty names in the WYSIWYG. For that we need to provide it in the WYSIWYG. The current ParameterDescriptor#getName actually return the parameter identifier/technical name. So I see two solutions: 1) the general rule in new XWiki architecture is to use id/name instead of name/prettyname so i propose to break ParameterDescriptor and PropertyDescriptor to follow this rule. 2) add a getDisplayName method and let getName for the identifier WDYT ? +1 for 1). I never like to break an API but doubt this API is used a lots yet except by us internally and it would like we use the same rule everywhere as much as possible. -- Thomas Mortagne

15 years, 11 months

5
5
0 0

[xwiki-devs] Fwd: [ANN] Maven Javadoc Plugin 2.6.1 Released

by Vincent Massol

I'm upgrading our top level POM. Thanks -Vincent Begin forwarded message: > From: Vincent Siveton <vsiveton(a)apache.org> > Date: October 26, 2009 4:36:01 PM CEST > To: announce(a)maven.apache.org, users(a)maven.apache.org > Subject: [ANN] Maven Javadoc Plugin 2.6.1 Released > Reply-To: "Maven Users List" <users(a)maven.apache.org> > > The Maven team is pleased to announce the release of the Maven Javadoc > Plugin, version 2.6.1 > > This plugin uses the javadoc tool for generating javadocs for the > specified project. > > http://maven.apache.org/plugins/maven-javadoc-plugin/ > > You should specify the version in your project's plugin configuration: > > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-javadoc-plugin</artifactId> > <version>2.6.1</version> > </plugin> > > > Release Notes - Maven 2.x Javadoc Plugin - Version 2.6.1 > > ** Bug > * [MJAVADOC-244] - Javadoc plugin: java files under > src/main/javadoc and doc-files directory are being compiled > * [MJAVADOC-246] - ExceptionInInitializerError with > maven-site-plugin:2.1-SNAPSHOT and mvn > 2.1 > * [MJAVADOC-251] - Configuration of javadoc:javadoc fails with NPE > upon disadvantageous order of config injection > * [MJAVADOC-252] - javadoc link : nonproxyhosts not used > * [MJAVADOC-257] - maven-javadoc-plugin 2.5, 2.6 and mojo: Error > extracting plugin descriptor > * [MJAVADOC-259] - Resource copying from javadoc dir is incomplete > * [MJAVADOC-262] - Parameters like sourcepath depend on system > path separator (colon/semicolon) > * [MJAVADOC-268] - performance problem in > AbstractJavadocMojo.getModulesLinks() > > ** Improvement > * [MJAVADOC-258] - Grouping example could show multiple packages > per group > * [MJAVADOC-266] - META-INF directory copied from resource > artifacts > * [MJAVADOC-267] - Allow changing the reportOutputDirectory from > the commandline > > > ** Task > * [MJAVADOC-248] - Site 'Usage' page references 2.5 version of m- > javadoc-p > > Enjoy, > > -The Maven team

15 years, 11 months

1
0
0 0

Re: [xwiki-devs] [xwiki-users] Call for testimonials

by Vincent Massol

Hi everyone, I've just started a Testimonial page on xwiki.org at http://www.xwiki.org/xwiki/bin/view/References/Testimonials If you want to give a testimony feel free to edit the page or add a comment to it. If you find existing testimonies please help me move them there. Thanks -Vincent On Mon, Oct 26, 2009 at 10:50 AM, Emilie Ogez <Emilie.Ogez(a)xwiki.com> wrote: > Hi! > > XWiki SAS is interestred to gather testimonials about XWiki Enterprise > and propose an original way to get them. Tell us why you love this > solution, why you find it interesting, innovating... in less than 140 > characters on Twitter (by sending a tweet to @xwiki > <http://www.twitter.com/xwiki>). All the tweets will be listed on > http://xwiki.com and http://www.xwiki.org > > "You can also help the project by creating a page on > http://www.xwiki.org/xwiki/bin/view/References/ that explains how you > use XWiki." > > Many Thanks, in advance, for your participation. > > Emilie Ogez

15 years, 11 months

1
0
0 0

[xwiki-devs] Date format is appearing wrong

by Jasvent Singh

Hi, I am using xwiki for my organization. In some cases the date format is appearing wrong, like the month filed is displaying "36". How can it be possible and what should i do to correct this. Warm Regards Jasvent Singh Eperium Business Solutions India Pvt Ltd 2nd/3rd Floor, NSIC-STP Extension, Administrative Block, NTSC Okhla Phase III, New Delhi - 110020 Email : jasvent.singh(a)eperiumindia.com Ph. No.(Off) : 91-11-46583900 Mob. No. : 91- 9015781898 Web : http://www.eperiumindia.com <http://www.eperiumindia.com/> eperium. e-commerce unlimited This message may contain confidential or legally privileged information. In the event of any error in transmission, unauthorized recipients are requested to contact the sender immediately and not to disclose or make use of this information. No warranties or assurance are made or given as to the accuracy of the information given or in relation to the safety of this e-mail and any attachments. No liability whatsoever is accepted for any consequences arising from this e-mail.

15 years, 11 months

1
0
0 0

[xwiki-devs] Moving the new Skins Tutorial in the Dev Guide

by Raluca Stavro

Hello, I would like to move the new Skins Tutorial ( http://dev.xwiki.org/xwiki/bin/view/Drafts/XWikiNewSkin ) in the Dev Guide and link it from Adminstration Guide. Here is my +1. Thank you, Raluca.

15 years, 11 months

5
8
0 0

[xwiki-devs] Call for testimonials

by Emilie Ogez

Hi! XWiki SAS is interestred to gather testimonials about XWiki Enterprise and propose an original way to get them. Tell us why you love this solution, why you find it interesting, innovating... in less than 140 characters on Twitter (by sending a tweet to @xwiki <http://www.twitter.com/xwiki>). All the tweets will be listed on http://xwiki.com and http://www.xwiki.org "You can also help the project by creating a page on http://www.xwiki.org/xwiki/bin/view/References/ that explains how you use XWiki." Many Thanks, in advance, for your participation. Emilie Ogez -- Marketing & Communication Manager Mob. : +33( 0)623414368 Email : Emilie.Ogez(a)xwiki.com http://www.xwiki.com http://www.twitter.com/eogez

15 years, 11 months

1
0
0 0

[xwiki-devs] Editor Panels

by Leon Wang

Hi Everyone, I met some problem with adding my personal edit panel to the panels displayed in the WYSIWYG editing mode and Wiki editing mode. Here is what I did: I imitate the script of Class Switcher and Rights Help. Here is what I wrote: Name: DesignRationale Type:edit Category: Information Content: #largepanelheader($msg.get('Design Rationale')) $xwiki.jsfx.use("js/xwiki/treeview/treeview.nocache.js", true) <div id="DR_TreeView"></div> #panelfooter() When I specify its type is "view", it can display in the right panel. Then I modify the template file: editpanelsvars.vm . I add "Panels.DesignRationale" to both $editorPanelsWysiwyg and $editorPanelsWysiwyg . Here is the result: #set($editorPanelsWiki = "Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp, Panels. DesignRationale") #set($editorPanelsWysiwyg = "Panels.DocumentInformation,Panels.EditTranslations,Panels.SyntaxHelp,Panels. DesignRationale") I reload the Tomcat and refresh the Xwiki page in WYSIWYG editing or Wiki editing page. My customized panel did not appear. Even I modify these two line like this: #set($editorPanelsWiki = "Panels.DocumentInformation") #set($editorPanelsWysiwyg = "Panels.DocumentInformation") After I reload Tomcat, the other edit panel like SyntaxHelp and EditTranslations would not disappear. Could anyone Guru give me some idea what I missed? I do found out that in editpanelsvars.vm there one line comment: ## Define variables containing the list of edit panels for the Albatross skin Does it mean it only take effect on albatross skin? Big thanks in advance! :-)

15 years, 11 months

2
1
0 0

[xwiki-devs] Use WYSIWG New Backgournd Color API

by Leon Wang

Hi Marius, Thank you for creating the API! I am still trying to figure out how to display the gwt tree edit panel in the WYSIWYG editing mode. Is it correct that I use the new api like last time you told me? Please see the code below: native void setBackgroudColor(String color) /*-{ editorJSReference.execute('backcolor', color); }-*/; and if (((TreeItem)event.getSelectedItem()).getText().equals("Alternative")) { setBackgroudColor("yellow"); } What do you think? Do you think that will work? Thank you! Hope I could get it done before meeting in the coming week. Otherwise, my advisors will give me unhappy look again =_= If there are anything I could help free feel to let me know, like documenting how to use your new background API. Remember you have to create the page for me first. Leon

15 years, 11 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r24669 - in platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/test: java/org/xwiki/rendering java/org/xwiki/rendering/internal/macro/wikibridge resources resources/M

by Asiri Rathnayake

Hi Vincent, On Fri, Oct 23, 2009 at 11:20 PM, Vincent Massol <vincent(a)massol.net> wrote: > Asiri, > > Can you document the test case (wikimaro2.test) and add comments to > explain what the test tests? (it's not obvious IMO). > Ok. > Also you might want to consider writing a unit test proper instead of > using the rendering test fwk maybe since I'm not sure what it brings > here (but I haven't really checked enough so I may be wrong). > IMO writing a rendering test is more appropriate here because we are testing a rendering macro. In this particular case I'm checking whether a wiki macro (which contains a nested macro) is behaving correctly when operating in inline mode. If I'm to write a unit test, I need to define the input and analyze the output XDOM to see if it has behaved correctly - but this is very easy to do with a rendering test. Thanks. - Asiri > > -Vincent > > On Oct 23, 2009, at 1:11 PM, asiri (SVN) wrote: > > > Author: asiri > > Date: 2009-10-23 13:11:30 +0200 (Fri, 23 Oct 2009) > > New Revision: 24669 > > > > Added: > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > > Removed: > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/META-INF/components.txt > > Modified: > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > Log: > > XWIKI-4520: Not possible to generate inline content from wiki macros > > when the macro body starts with another macro. > > > > * Added a test case to exploit the issue. > > > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java 2009-10-23 10:23:04 UTC (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > RenderingTests.java 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -20,6 +20,9 @@ > > > > package org.xwiki.rendering; > > > > +import java.util.ArrayList; > > +import java.util.List; > > + > > import junit.framework.Test; > > import junit.framework.TestCase; > > > > @@ -28,6 +31,13 @@ > > import org.xwiki.bridge.DocumentAccessBridge; > > import org.xwiki.component.descriptor.DefaultComponentDescriptor; > > import org.xwiki.component.embed.EmbeddableComponentManager; > > +import > > org.xwiki.rendering.internal.macro.wikibridge.DefaultWikiMacro; > > +import org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro; > > +import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacroManager; > > +import > > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > > import org.xwiki.rendering.scaffolding.RenderingTestSuite; > > import org.xwiki.test.ComponentManagerTestSetup; > > > > @@ -50,6 +60,7 @@ > > RenderingTestSuite suite = new RenderingTestSuite("Test Wiki > > Macro Bridge"); > > > > suite.addTestsFromResource("wikimacro1", true); > > + suite.addTestsFromResource("wikimacro2", true); > > > > ComponentManagerTestSetup testSetup = new > > ComponentManagerTestSetup(suite); > > setUpMocks(testSetup.getComponentManager()); > > @@ -67,9 +78,35 @@ > > new DefaultComponentDescriptor<DocumentAccessBridge>(); > > descriptorDAB.setRole(DocumentAccessBridge.class); > > componentManager.registerComponent(descriptorDAB, > > mockDocumentAccessBridge); > > + > > + // Register mock wiki macros. > > + WikiMacroManager wikiMacroManager = > > componentManager.lookup(WikiMacroManager.class); > > + > > + // Mock wiki macro - 1. > > + WikiMacroParameterDescriptor param1 = new > > WikiMacroParameterDescriptor("param1", "This is param1", true); > > + WikiMacroParameterDescriptor param2 = new > > WikiMacroParameterDescriptor("param2", "This is param2", true); > > + List<WikiMacroParameterDescriptor> params = new > > ArrayList<WikiMacroParameterDescriptor>(); > > + params.add(param1); > > + params.add(param2); > > + WikiMacroDescriptor descriptor = new > > WikiMacroDescriptor("Mock Wiki Macro - 1", "Description", "Test", > > + new DefaultContentDescriptor(false), params); > > + WikiMacro wikiMacro = new MockWikiMacro(new > > DefaultWikiMacro("xwiki:Main.MockWikiMacro1", "mockwikimacro1", > > + true, descriptor, "This is **mockwikimacro1**", "xwiki/ > > 2.0", componentManager), componentManager); > > + > > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro1", > > wikiMacro); > > + > > + // Mock wiki macro - 2. > > + params = new ArrayList<WikiMacroParameterDescriptor>(); > > + descriptor = new WikiMacroDescriptor("Mock Wiki Macro - 2", > > "Description", "Test", > > + new DefaultContentDescriptor(false), params); > > + wikiMacro = new MockWikiMacro(new > > DefaultWikiMacro("xwiki:Main.MockWikiMacro2", "mockwikimacro2", > > + true, descriptor, "{{mockwikimacro1 param1=\"p1\" > > param2=\"p2\"/}}", "xwiki/2.0", componentManager), > > + componentManager); > > + > > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro2", > > wikiMacro); > > + > > > > context.checking(new Expectations() {{ > > - > > oneOf > > (mockDocumentAccessBridge).getDocument("xwiki:Main.TestWikiMacro"); > > will(returnValue(null)); > > + > > allowing > > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro1"); > > will(returnValue(null)); > > + > > allowing > > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro2"); > > will(returnValue(null)); > > }}); > > } > > } > > > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 10:23:04 UTC > > (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 11:11:30 UTC > > (rev 24669) > > @@ -20,72 +20,48 @@ > > > > package org.xwiki.rendering.internal.macro.wikibridge; > > > > -import java.util.ArrayList; > > import java.util.HashMap; > > import java.util.List; > > > > -import org.xwiki.component.annotation.Component; > > -import org.xwiki.component.annotation.Requirement; > > +import org.xwiki.component.manager.ComponentLookupException; > > import org.xwiki.component.manager.ComponentManager; > > -import org.xwiki.component.phase.Initializable; > > -import org.xwiki.component.phase.InitializationException; > > import org.xwiki.context.Execution; > > import org.xwiki.rendering.block.Block; > > import org.xwiki.rendering.macro.Macro; > > import org.xwiki.rendering.macro.MacroExecutionException; > > -import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > > import org.xwiki.rendering.macro.descriptor.MacroDescriptor; > > -import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > > -import > > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > > import org.xwiki.rendering.macro.wikibridge.WikiMacroParameters; > > import org.xwiki.rendering.transformation.MacroTransformationContext; > > > > /** > > - * A wrapper macro used for testing a {@link DefaultWikiMacro} > > instance. > > + * A wrapper macro used for testing wiki macros. > > * > > * @version $Id$ > > * @since 2.0M2 > > */ > > -@Component("testwikimacro") > > -public class MockWikiMacro implements Macro<WikiMacroParameters>, > > Initializable > > +public class MockWikiMacro implements WikiMacro > > { > > /** > > - * The internal {@link DefaultWikiMacro} instance. > > + * The internal wiki macro instance. > > */ > > - private DefaultWikiMacro wikiMacro; > > + private WikiMacro wikiMacro; > > > > /** > > * The {@link ComponentManager} component. > > */ > > - @Requirement > > private ComponentManager componentManager; > > - > > + > > /** > > - * The {@link Execution} component. > > + * Creates a new mock wiki macro encapsulating the given wiki > > macro instance. > > + * > > + * @param wikiMacro encapsulated wiki macro instance. > > + * @param componentManager component manager. > > */ > > - @Requirement > > - private Execution execution; > > - > > - /** > > - * {@inheritDoc} > > - */ > > - public void initialize() throws InitializationException > > + public MockWikiMacro(WikiMacro wikiMacro, ComponentManager > > componentManager) > > { > > - // Require two parameters, one mandatory and one optional. > > - WikiMacroParameterDescriptor param1 = new > > WikiMacroParameterDescriptor("param1", "This is param1", true); > > - WikiMacroParameterDescriptor param2 = new > > WikiMacroParameterDescriptor("param2", "This is param2", true); > > - List<WikiMacroParameterDescriptor> params = new > > ArrayList<WikiMacroParameterDescriptor>(); > > - params.add(param1); > > - params.add(param2); > > - > > - // Initialize the internal WikiMacro instance. > > - WikiMacroDescriptor descriptor = new > > WikiMacroDescriptor("Test Wiki Macro", "Description", "Test", > > - new DefaultContentDescriptor(false), params); > > - this.wikiMacro = new > > DefaultWikiMacro("xwiki:Main.TestWikiMacro", "testwikimacro", true, > > descriptor, > > - "This is **testwikimacro**", "xwiki/2.0", > > componentManager); > > - > > - // Set a dummy XWikiContext. > > - execution.getContext().setProperty("xwikicontext", new > > HashMap<String, Object>()); > > + this.wikiMacro = wikiMacro; > > + this.componentManager = componentManager; > > } > > > > /** > > @@ -94,10 +70,26 @@ > > public List<Block> execute(WikiMacroParameters parameters, > > String content, MacroTransformationContext context) > > throws MacroExecutionException > > { > > + // Use a dummy XWikiContext. > > + try { > > + Execution execution = > > componentManager.lookup(Execution.class); > > + execution.getContext().setProperty("xwikicontext", new > > HashMap<String, Object>()); > > + } catch (ComponentLookupException ex) { > > + throw new MacroExecutionException(ex.getMessage(), ex); > > + } > > + > > return this.wikiMacro.execute(parameters, content, context); > > } > > > > /** > > + * {@inheritDoc} > > + */ > > + public String getId() > > + { > > + return this.wikiMacro.getId(); > > + } > > + > > + /** > > * {@inheritDoc} > > */ > > public MacroDescriptor getDescriptor() > > > > Deleted: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/resources/META-INF/ > > components.txt > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/META-INF/ > > components.txt 2009-10-23 10:23:04 UTC (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/META-INF/ > > components.txt 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -1 +0,0 @@ > > -org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro > > \ No newline at end of file > > > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > 2009-10-23 10:23:04 UTC (rev 24668) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > > 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -1,20 +1,20 @@ > > .#----------------------------------------------------- > > .input|xwiki/2.0 > > .#----------------------------------------------------- > > -{{testwikimacro param1="val1" param2="val2"/}} > > +{{mockwikimacro1 param1="val1" param2="val2"/}} > > .#----------------------------------------------------- > > .expect|event/1.0 > > .#----------------------------------------------------- > > beginDocument > > -beginMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > > +beginMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > > beginParagraph > > onWord [This] > > onSpace > > onWord [is] > > onSpace > > beginFormat [BOLD] > > -onWord [testwikimacro] > > +onWord [mockwikimacro1] > > endFormat [BOLD] > > endParagraph > > -endMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > > +endMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > > endDocument > > \ No newline at end of file > > > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro2.test > > =================================================================== > > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/ > > wikimacro2.test (rev 0) > > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > > 2009-10-23 11:11:30 UTC (rev 24669) > > @@ -0,0 +1,8 @@ > > +.#----------------------------------------------------- > > +.input|xwiki/2.0 > > +.#----------------------------------------------------- > > +Hello! {{mockwikimacro2/}} > > +.#----------------------------------------------------- > > +.expect|xhtml/1.0 > > +.#----------------------------------------------------- > > +<p>Hello! This is <strong>mockwikimacro1</strong></p> > > \ No newline at end of file > > > > _______________________________________________ > > notifications mailing list > > notifications(a)xwiki.org > > http://lists.xwiki.org/mailman/listinfo/notifications > > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs >

15 years, 11 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r24669 - in platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/test: java/org/xwiki/rendering java/org/xwiki/rendering/internal/macro/wikibridge resources resources/META-INF

by Vincent Massol

Asiri, Can you document the test case (wikimaro2.test) and add comments to explain what the test tests? (it's not obvious IMO). Also you might want to consider writing a unit test proper instead of using the rendering test fwk maybe since I'm not sure what it brings here (but I haven't really checked enough so I may be wrong). -Vincent On Oct 23, 2009, at 1:11 PM, asiri (SVN) wrote: > Author: asiri > Date: 2009-10-23 13:11:30 +0200 (Fri, 23 Oct 2009) > New Revision: 24669 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > Removed: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/META-INF/components.txt > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > Log: > XWIKI-4520: Not possible to generate inline content from wiki macros > when the macro body starts with another macro. > > * Added a test case to exploit the issue. > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java 2009-10-23 10:23:04 UTC (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > RenderingTests.java 2009-10-23 11:11:30 UTC (rev 24669) > @@ -20,6 +20,9 @@ > > package org.xwiki.rendering; > > +import java.util.ArrayList; > +import java.util.List; > + > import junit.framework.Test; > import junit.framework.TestCase; > > @@ -28,6 +31,13 @@ > import org.xwiki.bridge.DocumentAccessBridge; > import org.xwiki.component.descriptor.DefaultComponentDescriptor; > import org.xwiki.component.embed.EmbeddableComponentManager; > +import > org.xwiki.rendering.internal.macro.wikibridge.DefaultWikiMacro; > +import org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro; > +import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > +import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > +import org.xwiki.rendering.macro.wikibridge.WikiMacroManager; > +import > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > import org.xwiki.rendering.scaffolding.RenderingTestSuite; > import org.xwiki.test.ComponentManagerTestSetup; > > @@ -50,6 +60,7 @@ > RenderingTestSuite suite = new RenderingTestSuite("Test Wiki > Macro Bridge"); > > suite.addTestsFromResource("wikimacro1", true); > + suite.addTestsFromResource("wikimacro2", true); > > ComponentManagerTestSetup testSetup = new > ComponentManagerTestSetup(suite); > setUpMocks(testSetup.getComponentManager()); > @@ -67,9 +78,35 @@ > new DefaultComponentDescriptor<DocumentAccessBridge>(); > descriptorDAB.setRole(DocumentAccessBridge.class); > componentManager.registerComponent(descriptorDAB, > mockDocumentAccessBridge); > + > + // Register mock wiki macros. > + WikiMacroManager wikiMacroManager = > componentManager.lookup(WikiMacroManager.class); > + > + // Mock wiki macro - 1. > + WikiMacroParameterDescriptor param1 = new > WikiMacroParameterDescriptor("param1", "This is param1", true); > + WikiMacroParameterDescriptor param2 = new > WikiMacroParameterDescriptor("param2", "This is param2", true); > + List<WikiMacroParameterDescriptor> params = new > ArrayList<WikiMacroParameterDescriptor>(); > + params.add(param1); > + params.add(param2); > + WikiMacroDescriptor descriptor = new > WikiMacroDescriptor("Mock Wiki Macro - 1", "Description", "Test", > + new DefaultContentDescriptor(false), params); > + WikiMacro wikiMacro = new MockWikiMacro(new > DefaultWikiMacro("xwiki:Main.MockWikiMacro1", "mockwikimacro1", > + true, descriptor, "This is **mockwikimacro1**", "xwiki/ > 2.0", componentManager), componentManager); > + > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro1", > wikiMacro); > + > + // Mock wiki macro - 2. > + params = new ArrayList<WikiMacroParameterDescriptor>(); > + descriptor = new WikiMacroDescriptor("Mock Wiki Macro - 2", > "Description", "Test", > + new DefaultContentDescriptor(false), params); > + wikiMacro = new MockWikiMacro(new > DefaultWikiMacro("xwiki:Main.MockWikiMacro2", "mockwikimacro2", > + true, descriptor, "{{mockwikimacro1 param1=\"p1\" > param2=\"p2\"/}}", "xwiki/2.0", componentManager), > + componentManager); > + > wikiMacroManager.registerWikiMacro("xwiki:Main.MockWikiMacro2", > wikiMacro); > + > > context.checking(new Expectations() {{ > - > oneOf > (mockDocumentAccessBridge).getDocument("xwiki:Main.TestWikiMacro"); > will(returnValue(null)); > + > allowing > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro1"); > will(returnValue(null)); > + > allowing > (mockDocumentAccessBridge).getDocument("xwiki:Main.MockWikiMacro2"); > will(returnValue(null)); > }}); > } > } > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 10:23:04 UTC > (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ > internal/macro/wikibridge/MockWikiMacro.java 2009-10-23 11:11:30 UTC > (rev 24669) > @@ -20,72 +20,48 @@ > > package org.xwiki.rendering.internal.macro.wikibridge; > > -import java.util.ArrayList; > import java.util.HashMap; > import java.util.List; > > -import org.xwiki.component.annotation.Component; > -import org.xwiki.component.annotation.Requirement; > +import org.xwiki.component.manager.ComponentLookupException; > import org.xwiki.component.manager.ComponentManager; > -import org.xwiki.component.phase.Initializable; > -import org.xwiki.component.phase.InitializationException; > import org.xwiki.context.Execution; > import org.xwiki.rendering.block.Block; > import org.xwiki.rendering.macro.Macro; > import org.xwiki.rendering.macro.MacroExecutionException; > -import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > import org.xwiki.rendering.macro.descriptor.MacroDescriptor; > -import org.xwiki.rendering.macro.wikibridge.WikiMacroDescriptor; > -import > org.xwiki.rendering.macro.wikibridge.WikiMacroParameterDescriptor; > +import org.xwiki.rendering.macro.wikibridge.WikiMacro; > import org.xwiki.rendering.macro.wikibridge.WikiMacroParameters; > import org.xwiki.rendering.transformation.MacroTransformationContext; > > /** > - * A wrapper macro used for testing a {@link DefaultWikiMacro} > instance. > + * A wrapper macro used for testing wiki macros. > * > * @version $Id$ > * @since 2.0M2 > */ > -@Component("testwikimacro") > -public class MockWikiMacro implements Macro<WikiMacroParameters>, > Initializable > +public class MockWikiMacro implements WikiMacro > { > /** > - * The internal {@link DefaultWikiMacro} instance. > + * The internal wiki macro instance. > */ > - private DefaultWikiMacro wikiMacro; > + private WikiMacro wikiMacro; > > /** > * The {@link ComponentManager} component. > */ > - @Requirement > private ComponentManager componentManager; > - > + > /** > - * The {@link Execution} component. > + * Creates a new mock wiki macro encapsulating the given wiki > macro instance. > + * > + * @param wikiMacro encapsulated wiki macro instance. > + * @param componentManager component manager. > */ > - @Requirement > - private Execution execution; > - > - /** > - * {@inheritDoc} > - */ > - public void initialize() throws InitializationException > + public MockWikiMacro(WikiMacro wikiMacro, ComponentManager > componentManager) > { > - // Require two parameters, one mandatory and one optional. > - WikiMacroParameterDescriptor param1 = new > WikiMacroParameterDescriptor("param1", "This is param1", true); > - WikiMacroParameterDescriptor param2 = new > WikiMacroParameterDescriptor("param2", "This is param2", true); > - List<WikiMacroParameterDescriptor> params = new > ArrayList<WikiMacroParameterDescriptor>(); > - params.add(param1); > - params.add(param2); > - > - // Initialize the internal WikiMacro instance. > - WikiMacroDescriptor descriptor = new > WikiMacroDescriptor("Test Wiki Macro", "Description", "Test", > - new DefaultContentDescriptor(false), params); > - this.wikiMacro = new > DefaultWikiMacro("xwiki:Main.TestWikiMacro", "testwikimacro", true, > descriptor, > - "This is **testwikimacro**", "xwiki/2.0", > componentManager); > - > - // Set a dummy XWikiContext. > - execution.getContext().setProperty("xwikicontext", new > HashMap<String, Object>()); > + this.wikiMacro = wikiMacro; > + this.componentManager = componentManager; > } > > /** > @@ -94,10 +70,26 @@ > public List<Block> execute(WikiMacroParameters parameters, > String content, MacroTransformationContext context) > throws MacroExecutionException > { > + // Use a dummy XWikiContext. > + try { > + Execution execution = > componentManager.lookup(Execution.class); > + execution.getContext().setProperty("xwikicontext", new > HashMap<String, Object>()); > + } catch (ComponentLookupException ex) { > + throw new MacroExecutionException(ex.getMessage(), ex); > + } > + > return this.wikiMacro.execute(parameters, content, context); > } > > /** > + * {@inheritDoc} > + */ > + public String getId() > + { > + return this.wikiMacro.getId(); > + } > + > + /** > * {@inheritDoc} > */ > public MacroDescriptor getDescriptor() > > Deleted: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/resources/META-INF/ > components.txt > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/META-INF/ > components.txt 2009-10-23 10:23:04 UTC (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/META-INF/ > components.txt 2009-10-23 11:11:30 UTC (rev 24669) > @@ -1 +0,0 @@ > -org.xwiki.rendering.internal.macro.wikibridge.MockWikiMacro > \ No newline at end of file > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro1.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > 2009-10-23 10:23:04 UTC (rev 24668) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro1.test > 2009-10-23 11:11:30 UTC (rev 24669) > @@ -1,20 +1,20 @@ > .#----------------------------------------------------- > .input|xwiki/2.0 > .#----------------------------------------------------- > -{{testwikimacro param1="val1" param2="val2"/}} > +{{mockwikimacro1 param1="val1" param2="val2"/}} > .#----------------------------------------------------- > .expect|event/1.0 > .#----------------------------------------------------- > beginDocument > -beginMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > +beginMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > beginParagraph > onWord [This] > onSpace > onWord [is] > onSpace > beginFormat [BOLD] > -onWord [testwikimacro] > +onWord [mockwikimacro1] > endFormat [BOLD] > endParagraph > -endMacroMarkerStandalone [testwikimacro] [param1=val1|param2=val2] > +endMacroMarkerStandalone [mockwikimacro1] [param1=val1|param2=val2] > endDocument > \ No newline at end of file > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/ > xwiki-rendering-macro-wikibridge/src/test/resources/wikimacro2.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/ > wikimacro2.test (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- > rendering-macro-wikibridge/src/test/resources/wikimacro2.test > 2009-10-23 11:11:30 UTC (rev 24669) > @@ -0,0 +1,8 @@ > +.#----------------------------------------------------- > +.input|xwiki/2.0 > +.#----------------------------------------------------- > +Hello! {{mockwikimacro2/}} > +.#----------------------------------------------------- > +.expect|xhtml/1.0 > +.#----------------------------------------------------- > +<p>Hello! This is <strong>mockwikimacro1</strong></p> > \ No newline at end of file > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

15 years, 11 months

1
0
0 0

[xwiki-devs] [Discussion] Annotations improvements -- allowing different annotation types

by Anca Luca

Hi devs, Following the previous mail with the desired improvements for the annotation feature, I would like to discuss some options for implementing the first of the enhancements, namely the ability to configure easily the type of added annotation. (see http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HFeaturesimpro… for details). Two alternatives for this would be: A) to preserve the current architecture of the annotations plugin and only add a map of "extra fields" to the annotation type. The type of the annotation would be known by the js client through the configuration of an XWiki class and the js client would create a "generic" form for any such type. See more details about this solution at http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HSolution1extr… . Pros: preserves the current annotations architecture, creates an easy way to plug an annotation storage service Cons: the Annotation class would be nothing else but a "BaseCollection" the same as a generic XWiki object, and we would be reimplementing view, save, edit, delete of this type (already implemented through the xwiki action) from the web forms level (editing and displaying an annotation), through the controller (REST this time instead of actions in the standard wiki servlet), to the storage level (XWikiIOService will only transform a map (the Annotation class) to another map (the XWikiObject in the xwiki document)). B) to make an XWiki object model based implementation where the js client, to create the UI, would just asynchronously fetch standard actions in XWiki (edit, view, save). In this case, where all is handled exclusively through the XWiki model, Scribo would be plugged as an external service performing periodic updates between the XWiki instance and its RDF store. See more details about this solution at: http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HSolution2XWik… Pros: uses the xwiki object model 100%, there's no reimplementing of the whole process of saving, editing objects, etc, the forms and views are light customizations of standard XWiki mechanisms Cons: the annotation mapping to document source cannot be implemented straightforward (there are changes needed in the architecture and algorithm), Scribo (or any other storage model different from XWiki) would need to duplicate data, and it would not be 100% real time (since it would be a periodical synchronizer) The current implementation is illustrated in the http://dev.xwiki.org/xwiki/bin/view/Design/AnnotationFeature#HCurrentImplem… section. I like the elegance of the first solution more, for the way a different storage can be easily plugged, but I don't like that we're reimplementing a lot of XWiki objects manipulation (which is why 2 would be a better solution). WDYT? Thanks, Anca

15 years, 11 months

2
2
0 0

Re: [xwiki-devs] GWT tree Interact with WYSIWYG editor

by Leon Wang

Hi Marius, I tried the the first way, "i) access the editor in Java (GWT) code by writing a simple native getter", the dependency is killing me. I can not compile it use eclipse the dependency is the way too complicated. I tried use maven to build it, but I tried for a whole afternoon and I really don't know how to write the correct pom to compile them together. Could you please extend the native JavaScript API so that I can write something like: native void setBackgroudColor(String color) /*-{ editorJSReference.execute('backcolor', color); }-*/; Could you please also tell me what you did to extend the native JavaScript API, so I can learn about how to save the location of highlighted sentence to help software maintainer easily trace back to the high lighted document. If you want I can collect your reply and write document for you for this one too. Here is another problem, please see the screenshot: http://picasaweb.google.com/freeleons/Xwiki#5394862411574232850 in the WYSIWYG edit mode, the customized sidebar are disappeared, which means that I can not use the GWT tree to interact with the WYSIWYG editor. Is there anyway to keep the customized toolbar? I have finished the document writeup here is the url: http://dev.xwiki.org/xwiki/bin/view/Drafts/LoadingGWTApplicationsInXWik You are literally saving my life. Thank you so much!

15 years, 11 months

2
1
0 0

[xwiki-devs] Prototype SocialCalc integration

by Ludovic Dubost

I've done a nice experiment with SocialCalc and I'm pretty happy of the results: It allows to edit a spreadsheet stored in a Wiki Page. It lacks a server-side transformation of the spreadsheet to a Wiki table for rendering, printing and pdfs, but it's already interesting. http://incubator.myxwiki.org/xwiki/bin/view/Test/Calc Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

15 years, 11 months

7
7
0 0

[xwiki-devs] [myxwiki] XWiki Enterprise 2.0.2 Upgrade

by Jean-Vincent Drean

Hello, myxwiki.org has been upgraded to XE 2.0.2, if you own a wiki hosted there you should have a look at : http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise202 We also strongly recommend an upgrade to the latest wiki version. To upgrade you must download XE 2.0.2 XWiki XAR from : http://www.xwiki.org/xwiki/bin/view/Main/Download And follow the upgrade guide available at : http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation#HUpgrading… To be notified of the myxwiki.org server upgrades you can follow myxwiki on twitter: http://twitter.com/myxwiki Thanks, JV.

15 years, 11 months

1
0
0 0

[xwiki-devs] [ANN] XWiki Enterprise 2.0.2 and XWiki Enterprise Manager 2.0.2 Released

by Thomas Mortagne

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.0.2 and XWiki Enterprise Manager 2.0.2. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This release fix two important regressions (office import doesn't work in multiwiki mode and a table followed by a block with params fail to render) and add many Watchlist improvements and bufixes. For more information see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise202 and http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM202. Thanks -The XWiki dev team

15 years, 11 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r12079 - in platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/rendering: macro transformation

by Vincent Massol

Hi Sergiu, Are you sure about this below? What's your use case? I find it strange to order by class name for an execution order. Thanks -Vincent On Aug 27, 2008, at 1:59 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2008-08-27 01:59:21 +0200 (Wed, 27 Aug 2008) > New Revision: 12079 > > Modified: > platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/macro/AbstractMacro.java > platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/transformation/AbstractTransformation.java > Log: > XWIKI-2568: Continue implementing the new Rendering Architecture > Improve the macro and transformation comparer so that component > implementations with the same priority are ordered by the classname. > > > Modified: platform/core/trunk/xwiki-rendering/src/main/java/org/ > xwiki/rendering/macro/AbstractMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/macro/AbstractMacro.java 2008-08-26 23:57:19 UTC (rev 12078) > +++ platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/macro/AbstractMacro.java 2008-08-26 23:59:21 UTC (rev 12079) > @@ -78,6 +78,9 @@ > */ > public int compareTo(Macro< ? > macro) > { > - return getPriority() - macro.getPriority(); > + if (getPriority() != macro.getPriority()) { > + return getPriority() - macro.getPriority(); > + } > + return > this > .getClass > ().getSimpleName().compareTo(macro.getClass().getSimpleName()); > } > } > > Modified: platform/core/trunk/xwiki-rendering/src/main/java/org/ > xwiki/rendering/transformation/AbstractTransformation.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/transformation/AbstractTransformation.java 2008-08-26 > 23:57:19 UTC (rev 12078) > +++ platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/ > rendering/transformation/AbstractTransformation.java 2008-08-26 > 23:59:21 UTC (rev 12079) > @@ -52,6 +52,9 @@ > */ > public int compareTo(Transformation transformation) > { > - return getPriority() - transformation.getPriority(); > + if (getPriority() != transformation.getPriority()) { > + return getPriority() - transformation.getPriority(); > + } > + return > this > .getClass > ().getSimpleName > ().compareTo(transformation.getClass().getSimpleName()); > } > }

15 years, 11 months

2
4
0 0

[xwiki-devs] Problems with producing inline content from wiki macros

by Asiri Rathnayake

Hello Devs, As I understand, If a wiki macro supports inline mode and is executed as an inline macro, it must be true that the output generated by the macro does not contain block elements (otherwise the result will not be inline). From the wiki macro bridge code we have the following check: <code> List<Block> result = xdom.getChildren(); // If in inline mode remove any top level paragraph. if (context.isInline()) { this.parserUtils.removeTopLevelParagraph(result); } </code> This only removes the top-level paragraph block. It's possible that inside the content there are more block level elements, I think this is where we need the inline parser. Another problem i discovered is if i have a wiki macro with macro code: <code> {{velocity}} ..... {{/velocity}} </code> This makes the {{velocity}} macro behave in a non-inline fashion regardless of the wiki macro's intentions. Further more, the paragraph block generated by the {{velocity}} macro is not stripped by the check I mentioned above. This is because the paragraph block resides inside a MacroMarkerBlock (so it is not a top-level paragraph). A workaround I found for this problem is to have something like: <code> {{html}}{{/html}}{{velocity}} ..... {{/velocity}} </code> This is only a hack to force the {{velocity}} macro ro behave in an inline fashion. Now I'm wondering if we should wait for the inline parser to be available to fix this or do some custom hacking to get rid of the block elements generated while executing in inline mode. wdyt? Thanks. - Asiri

15 years, 11 months

3
2
0 0

[xwiki-devs] XWiki on Nemo(Sonar)

by Vincent Massol

Hi, The XWiki project is now fully set up on Nemo here: http://nemo.sonarsource.org/components/index/XWIKI Comments: * Since our junit test no longer fail with memory issue they've added back test coverage stats. Link to platform: http://nemo.sonarsource.org/project/index/178319 * They've just added the "Commented LOC" stat feature which shows the number of lines of commented code. We shouldn't have any commented out code so we'll need to gradually reduce this too. * The test coverage don't count integration and functional tests, i.e. if a unit tests tests code from another module the coverage is not taken into account. Thus all our rendering tests in xwiki-rendering- tests are not taken into account (they cover 90% of the rendering api code...). * Since they've added the unit tests the tech debt has gone down a lot. I'll ask them why. Thanks -Vincent

15 years, 11 months

3
4
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs