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

[xwiki-devs] [Proposal] Putting the Component Manager in the Script Context for script engines having programming rights
by Vincent Massol 09 Aug '09

09 Aug '09

The idea is that if you have programming rights you should probably be allowed to access components and possibly even register new components. WDYT? Thanks -Vincent

1 0

[xwiki-devs] [VOTE] Rule for naming configuration properties
by Vincent Massol 09 Aug '09

09 Aug '09

Hi, After discussing with thomas here's what we propose: * remove the org.xwiki or com.xpn.xwiki part before the module name * use <module>.<propertyName>. Ex: rendering.linkLabelFormat * for submodules use <module>.<sunmodule>.<propertyName>. Ex: rendering.macro.velocity.filter. ** Note1: the current property for the macro velocity filter is wrongly named: macro.velocity.filter. That would need to be fixed at some point. ** Note2: the configs in xwiki-rendering-xwiki module should be named rendering.xwiki.linkLabelFormat. We'll need to fix this at some point or rename that module to some other name. Or find a sub rule to handle this case. * use camelcase for the property name itself. ex: linkLabelFormat Here's my +1 Thanks -Vincent

3 2

[xwiki-devs] [Proposal] Configuration keys for Macro Categories
by Vincent Massol 09 Aug '09

09 Aug '09

Hi, After a discussion with Thomas we'd like to propose the following format for defining macro categories in xwiki.properties: rendering.macroCategories = <macro id>=<cateogory name> Ex: rendering.macroCategories = toc:presentation rendering.macroCategories = velocity=code Internally the config will be available from RenderingConfiguration: public interface RenderingConfiguration { /** * A link label format is the format used to decide how to display links that have no label. * By default the page name is displayed. However it's possible to customize it using the * following tokens: * <ul> * <li>%w: wiki name</li> * <li>%s: space name</li> * <li>%p: page name</li> * <li>%P: page name with spaces between camel case words, i.e. "My Page" * if the page name is "MyPage"</li> * <li>%t: page title</li> * </ul> * Note that if the page title is empty or not defined then it defaults to %p. This is also the case * if the title cannot be retrieved for the document. * * The default is "%p". Some examples: "%s.%p", "%w:%s.%p". * * @return the format to use to display link labels when the user hasn't specified a label */ String getLinkLabelFormat(); /** * @return the category names to use for the macros. These are the categories under which they'll be listed * in UIs for example. If a category for a macro is null then the category defined in the macro * descriptor (ie defined by the macro author) will be used */ Properties getMacroCategories(); WDYT? If no negative comments are given I'd like to implement this ASAP. Thanks -Vincent

3 2

[xwiki-devs] [Fwd: [people] CFP: ISWC 2009 Workshop on Collaborative Construction, Management and Linking of Structured Knowledge]
by [Ricardo Rodriguez] Your EPEC Network ICT Team 08 Aug '09

08 Aug '09

Sorry for being late with this message! The deadline for paper submission is 10 August 2009, but only now I've regained access to the nepomuk-kde list. Greetings, Ricardo -- Ricardo Rodríguez Your EPEC Network ICT Team

1 0

Re: [xwiki-devs] [xwiki-notifications] r22431 - in sandbox/gsoc/importexport/xwiki-core-importer/src: main/java/org/xwiki/platform main/java/org/xwiki/platform/internal test/java/org/xwiki/platform/mediawiki
by Vincent Massol 08 Aug '09

08 Aug '09

Hi Arun, On Aug 8, 2009, at 10:29 PM, arun (SVN) wrote: > Author: arun > Date: 2009-08-08 22:29:54 +0200 (Sat, 08 Aug 2009) > New Revision: 22431 > > Modified: > sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/WikiImporter.java > sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/internal/ConfluenceWikiImporter.java > sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/internal/MediaWikiImporter.java > sandbox/gsoc/importexport/xwiki-core-importer/src/test/java/org/ > xwiki/platform/mediawiki/MediaWikiTest.java > Log: > [Changes] > New Rendering Module Syntax Converter component is used to conver > Wiki Syntax. > > > Modified: sandbox/gsoc/importexport/xwiki-core-importer/src/main/ > java/org/xwiki/platform/WikiImporter.java > =================================================================== > --- sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/WikiImporter.java 2009-08-08 19:44:33 UTC (rev 22430) > +++ sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/WikiImporter.java 2009-08-08 20:29:54 UTC (rev 22431) > @@ -44,9 +44,9 @@ > T parse(byte[] bytes) throws Exception; > > /** > - * Creates XWiki Pages based on the given Wiki Instance and > Wiki Type > + * Import Wiki content based on the given Wiki Instance and > Wiki Type > * > - * @param wiki Wiki object returned by {@link > #processInputDump(byte[], String)} > + * @param wiki Wiki object returned after parsing the input. > * @return Summary of import process as a list. > * @throws Exception > */ > > Modified: sandbox/gsoc/importexport/xwiki-core-importer/src/main/ > java/org/xwiki/platform/internal/ConfluenceWikiImporter.java > =================================================================== > --- sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/internal/ConfluenceWikiImporter.java 2009-08-08 > 19:44:33 UTC (rev 22430) > +++ sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/internal/ConfluenceWikiImporter.java 2009-08-08 > 20:29:54 UTC (rev 22431) > @@ -20,6 +20,7 @@ > package org.xwiki.platform.internal; > > import java.io.ByteArrayInputStream; > +import java.io.StringReader; > import java.util.ArrayList; > import java.util.Iterator; > import java.util.List; > @@ -38,11 +39,11 @@ > import org.xwiki.platform.internal.confluence.ConfluenceSpace; > import org.xwiki.platform.internal.confluence.ConfluenceWiki; > import org.xwiki.platform.internal.confluence.ProcessConfluenceXml; > -import org.xwiki.platform.parser.ImportWikiParser; > -import org.xwiki.platform.renderer.ImportWikiRenderer; > import org.xwiki.platform.wiki.Summary; > +import org.xwiki.rendering.converter.Converter; > import org.xwiki.rendering.parser.Syntax; > -import org.xwiki.rendering.parser.SyntaxType; > +import org.xwiki.rendering.renderer.printer.DefaultWikiPrinter; > +import org.xwiki.rendering.renderer.printer.WikiPrinter; > > /** > * Confluence Wiki Importer processes the Input data and creates > wiki pages. > @@ -66,11 +67,8 @@ > private DocumentAccessBridge docAccessBridge; > > @Requirement > - private ImportWikiParser parser; > + private Converter converter; > > - @Requirement > - private ImportWikiRenderer renderer; > - > /** > * Process Input data and returns Wiki object of Confluence Wiki > Type. > * > @@ -153,7 +151,6 @@ > { > Map<String, ConfluenceRevision> revisions = > page.getConfluenceRevisions(); > Iterator<String> iterator = revisions.keySet().iterator(); > - Syntax syntax = new Syntax(SyntaxType.CONFLUENCE, "1.0"); > String title = ""; > > // Title > @@ -169,7 +166,9 @@ > // Revisions. > while (iterator.hasNext()) { > ConfluenceRevision rev = revisions.get(iterator.next()); > - String text = > this > .renderer.renderFromWikiXdom(this.parser.getWikiXdom(rev.getText(), > syntax)); > + WikiPrinter printer = new DefaultWikiPrinter(); > + converter.convert(new StringReader(rev.getText()), > Syntax.CONFLUENCE_1_0, Syntax.XWIKI_2_0, printer); > + String text = printer.toString(); > this.docAccessBridge.setDocumentContent(title, text, > rev.getComment(), rev.getMinorEdit()); > > } > > Modified: sandbox/gsoc/importexport/xwiki-core-importer/src/main/ > java/org/xwiki/platform/internal/MediaWikiImporter.java > =================================================================== > --- sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/internal/MediaWikiImporter.java 2009-08-08 19:44:33 > UTC (rev 22430) > +++ sandbox/gsoc/importexport/xwiki-core-importer/src/main/java/org/ > xwiki/platform/internal/MediaWikiImporter.java 2009-08-08 20:29:54 > UTC (rev 22431) > @@ -20,6 +20,7 @@ > package org.xwiki.platform.internal; > > import java.io.ByteArrayInputStream; > +import java.io.StringReader; > import java.util.ArrayList; > import java.util.List; > > @@ -34,11 +35,11 @@ > import org.xwiki.platform.internal.mediawiki.MediaWikiPage; > import org.xwiki.platform.internal.mediawiki.MediaWikiRevision; > import org.xwiki.platform.internal.mediawiki.ProcessMediaWikiXml; > -import org.xwiki.platform.parser.ImportWikiParser; > -import org.xwiki.platform.renderer.ImportWikiRenderer; > import org.xwiki.platform.wiki.Summary; > +import org.xwiki.rendering.converter.Converter; > import org.xwiki.rendering.parser.Syntax; > -import org.xwiki.rendering.parser.SyntaxType; > +import org.xwiki.rendering.renderer.printer.DefaultWikiPrinter; > +import org.xwiki.rendering.renderer.printer.WikiPrinter; > > /** > * Default Wiki Importer - Imports other Wiki types into XWiki. > @@ -62,11 +63,8 @@ > private DocumentAccessBridge docAccessBridge; > > @Requirement > - private ImportWikiParser parser; > + private Converter converter; > > - @Requirement > - private ImportWikiRenderer renderer; > - > public void initialize() throws InitializationException > { > getLogger().debug("MediaWiki Importer Intialized"); > @@ -113,16 +111,18 @@ > private List<Summary> importMediaWiki(MediaWiki mediawiki) > throws Exception > { > List<Summary> wikiSummary = new ArrayList<Summary>(); > - Syntax syntax = new Syntax(SyntaxType.MEDIAWIKI, "1.0"); > > // For every mediawiki page > for (MediaWikiPage mediaWikiPage : mediawiki.getWikiPages()) { > // Fore every mediawiki revision of a page > for (MediaWikiRevision mediaWikiRevision : > mediaWikiPage.getRevisions()) { > > - // Read the body content parse it to xdom and > render it into XWiki Syntax. > - String text = > - > this > .renderer > .renderFromWikiXdom > (this.parser.getWikiXdom(mediaWikiRevision.getText(), syntax)); > + // Read the body content convert it into XWiki > Syntax. > + WikiPrinter printer = new DefaultWikiPrinter(); > + converter.convert(new > StringReader(mediaWikiRevision.getText()), Syntax.MEDIAWIKI_1_0, > + Syntax.XWIKI_2_0, printer); > + String text = printer.toString(); > + > // Create the page using document access bridge > > this.docAccessBridge.setDocumentContent(mediaWikiPage.getPageName(), > text, mediaWikiRevision > .getComment(), mediaWikiRevision.getMinorEdit()); > > Modified: sandbox/gsoc/importexport/xwiki-core-importer/src/test/ > java/org/xwiki/platform/mediawiki/MediaWikiTest.java > =================================================================== > --- sandbox/gsoc/importexport/xwiki-core-importer/src/test/java/org/ > xwiki/platform/mediawiki/MediaWikiTest.java 2009-08-08 19:44:33 UTC > (rev 22430) > +++ sandbox/gsoc/importexport/xwiki-core-importer/src/test/java/org/ > xwiki/platform/mediawiki/MediaWikiTest.java 2009-08-08 20:29:54 UTC > (rev 22431) > @@ -19,15 +19,21 @@ > */ > package org.xwiki.platform.mediawiki; > > +import java.io.StringReader; > import java.util.List; > import java.util.Map; > import java.util.TreeMap; > > import junit.framework.TestCase; > > +import org.xwiki.component.embed.EmbeddableComponentManager; > import org.xwiki.platform.internal.mediawiki.MediaWiki; > import org.xwiki.platform.internal.mediawiki.MediaWikiPage; > import org.xwiki.platform.internal.mediawiki.ProcessMediaWikiXml; > +import org.xwiki.rendering.converter.Converter; > +import org.xwiki.rendering.parser.Syntax; > +import org.xwiki.rendering.renderer.printer.DefaultWikiPrinter; > +import org.xwiki.rendering.renderer.printer.WikiPrinter; > > /** > * @version $Id$ > @@ -66,5 +72,21 @@ > > } > > + public void renderXWiki20SyntaxAsXHTML() throws Exception > + { > + // Initialize Rendering components and allow getting > instances > + EmbeddableComponentManager ecm = new > EmbeddableComponentManager(); > + ecm.initialize(this.getClass().getClassLoader()); This should be getComponentManager() instead from AbstractComponentTestCase Thanks -Vincent > + > + // Use a the Converter component to convert between one > syntax to another. > + Converter converter = ecm.lookup(Converter.class); > > + // Convert input in XWiki Syntax 2.0 into XHTML. The result > is stored in the printer. > + WikiPrinter printer = new DefaultWikiPrinter(); > + converter.convert(new StringReader("This is **bold**"), > Syntax.XWIKI_2_0, Syntax.XHTML_1_0, printer); > + > + assertEquals("This is bold", > printer.toString()); > + } > +

1 0

[xwiki-devs] [DISCUSSION] Implementing an XWiki component in groovy
by Asiri Rathnayake 08 Aug '09

08 Aug '09

Hi All, When working on officeimporter document splitting feature we wanted to make it possible to provide hooks so that the whole import process can be customized external to the officeimporter module via a groovy class (on a wiki page). Since we were in a little hurry, the solution we devised might be called "hackish"; we provided the following interface which can be implemented in groovy: <code> public interface OfficeImporterFilter { void filter(String documentName, Document document); void filter(String documentName, XDOM xdom, boolean isSplit); String filter(String documentName, String content, boolean isSplit); void setDocBridge(DocumentAccessBridge docBridge); } </code> Now, Officeimporter application would pass a parameter into DefaultOfficeImporter indicating the wiki page which contains the groovy filter implementation. Then we do something like: <code> String groovyFilterParam = params.get("groovyFilter"); String groovyScript = docBridge.getDocumentContent(groovyFilterParam); GroovyClassLoader gcl = new GroovyClassLoader(); OfficeImporterFilter importerFilter = (OfficeImporterFilter) gcl.parseClass(groovyScript).newInstance(); importerFilter.setDocBridge(docBridge); return importerFilter; } </code> The purpose of setDocBridge() method is to inject the DAB into the filter so that it can access wiki documents. Now I question myself why it is not possible for a groovy class to access wiki documents without the DAB. This also proves that this solution was not well planned or discussed with the community. Another problem with the filter interface is that it does several things. It would have been better to have three filters instead. Now to the topic of this email; if we can allow groovy code to implement XWiki components (if it is possible), we can make this whole thing very simple. For an example, officeimporter application would pass the role-hint of the component implementing a particular filter (which is a groovy implementation) and DefaultOfficeImporter will simply lookup this component and use it. As for implementing this kind of a mechanism, we can follow something similar to what we did with wiki macros. A special class XWiki.XWikiComponent would contain fields like componentRole (String), roleHint (String) & groovyClass(TextArea) and when a document with an object of XWiki.WikiComponent is saved, we can register a new component against the CM. This idea was suggested to me by vincent & I thought it's time to start a discussion about this to see what others think. Although I have few unclear points (like how dependency injection would work), I think it would be a handy tool to have. Thanks in advance for your comments & suggestions :) - Asiri PS: OfficeImporter code has been polluted a lot because I have stuffed a lot of features into it without properly designing them. I will be refactoring officeimporter a little by little in coming days (as time permits).

2 2

[xwiki-devs] [VOTE] Remove TransformationManager in Rendering module
by Vincent Massol 08 Aug '09

08 Aug '09

Hi, I'm proposing to remove the TxManager. Reason: * We need to offer a way for users of the rendering to control which transformations are executed. * It'll become clear to users of the rendering api how their XDOM will be transformed. Right now they didn't even know they were running macro transformation when they used the TxManager. Here's my +1 Thanks -Vincent

1 1

Re: [xwiki-devs] [xwiki-notifications] r22420 - in platform/core/trunk/xwiki-containers: xwiki-container-api/src/main/java/org/xwiki/container xwiki-container-portlet/src/main/java/org/xwiki/container/portlet xwiki-container-servlet/src/main/java/org/xwiki/container/servlet
by Vincent Massol 08 Aug '09

08 Aug '09

On Aug 8, 2009, at 12:42 PM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2009-08-08 12:42:34 +0200 (Sat, 08 Aug 2009) > New Revision: 22420 > > Modified: > platform/core/trunk/xwiki-containers/xwiki-container-api/src/main/ > java/org/xwiki/container/Response.java > platform/core/trunk/xwiki-containers/xwiki-container-portlet/src/ > main/java/org/xwiki/container/portlet/PortletResponse.java > platform/core/trunk/xwiki-containers/xwiki-container-servlet/src/ > main/java/org/xwiki/container/servlet/ServletResponse.java > Log: > XWIKI-4134: Add methods for writing content to the Response component > Done. > > Modified: platform/core/trunk/xwiki-containers/xwiki-container-api/ > src/main/java/org/xwiki/container/Response.java > =================================================================== > --- platform/core/trunk/xwiki-containers/xwiki-container-api/src/ > main/java/org/xwiki/container/Response.java 2009-08-08 00:04:58 UTC > (rev 22419) > +++ platform/core/trunk/xwiki-containers/xwiki-container-api/src/ > main/java/org/xwiki/container/Response.java 2009-08-08 10:42:34 UTC > (rev 22420) > @@ -20,6 +20,32 @@ > */ > package org.xwiki.container; > > +import java.io.IOException; > +import java.io.OutputStream; > + > public interface Response > { > + /** > + * Returns an OutputStream suitable for writing binary data in > the response. > + * > + * @return the binary OutputStream for the response, or {@code > null} if the response does not allow writing data > + * @throws IOException if an output exception occurred > + */ > + OutputStream getOutputStream() throws IOException; > + > + /** > + * Sets the length of the content body in the response. If this > length is not relevant to the type of connection, it > + * will simply be ignored. > + * > + * @param length an integer specifying the length of the > content being returned to the client > + */ > + void setContentLength(int length); > + > + /** > + * Sets the content type of the response being sent to the > client, as a MIME type string. For example, {@code > + * text/html}. If the MIME type is not relevant to the type of > connection, it will simply be ignored. > + * > + * @param mimeType the MIME type for this response, according > to the RFC 2045. > + */ > + void setContentType(String mimeType); > } > > Modified: platform/core/trunk/xwiki-containers/xwiki-container- > portlet/src/main/java/org/xwiki/container/portlet/PortletResponse.java > =================================================================== > --- platform/core/trunk/xwiki-containers/xwiki-container-portlet/src/ > main/java/org/xwiki/container/portlet/PortletResponse.java > 2009-08-08 00:04:58 UTC (rev 22419) > +++ platform/core/trunk/xwiki-containers/xwiki-container-portlet/src/ > main/java/org/xwiki/container/portlet/PortletResponse.java > 2009-08-08 10:42:34 UTC (rev 22420) > @@ -20,6 +20,11 @@ > */ > package org.xwiki.container.portlet; > > +import java.io.IOException; > +import java.io.OutputStream; > + > +import javax.portlet.RenderResponse; > + > import org.xwiki.container.Response; > > public class PortletResponse implements Response > @@ -35,4 +40,33 @@ > { > return this.portletResponse; > } > + > + /** > + * {@inheritDoc} > + */ > + public OutputStream getOutputStream() throws IOException > + { > + if (this.portletResponse instanceof RenderResponse) { > + return ((RenderResponse) > this.portletResponse).getPortletOutputStream(); > + } > + return null; > + } > + > + /** > + * {@inheritDoc} > + */ > + public void setContentLength(int length) > + { > + // No content length for portlets, do nothing > + } > + > + /** > + * {@inheritDoc} > + */ > + public void setContentType(String mimeType) > + { > + if (this.portletResponse instanceof RenderResponse) { > + ((RenderResponse) > this.portletResponse).setContentType(mimeType); > + } > + } > } > > Modified: platform/core/trunk/xwiki-containers/xwiki-container- > servlet/src/main/java/org/xwiki/container/servlet/ServletResponse.java > =================================================================== > --- platform/core/trunk/xwiki-containers/xwiki-container-servlet/src/ > main/java/org/xwiki/container/servlet/ServletResponse.java > 2009-08-08 00:04:58 UTC (rev 22419) > +++ platform/core/trunk/xwiki-containers/xwiki-container-servlet/src/ > main/java/org/xwiki/container/servlet/ServletResponse.java > 2009-08-08 10:42:34 UTC (rev 22420) > @@ -20,10 +20,13 @@ > */ > package org.xwiki.container.servlet; > > -import org.xwiki.container.Response; > +import java.io.IOException; > +import java.io.OutputStream; > > import javax.servlet.http.HttpServletResponse; > > +import org.xwiki.container.Response; > + > public class ServletResponse implements Response > { > private HttpServletResponse httpServletResponse; > @@ -37,4 +40,32 @@ > { > return this.httpServletResponse; > } > + > + /** > + * {@inheritDoc} > + */ > + public OutputStream getOutputStream() throws IOException > + { > + try { > + return this.httpServletResponse.getOutputStream(); > + } catch (IllegalStateException ex) { > + return null; Why don"'t you throw an IOException instead of returning null? Thanks -Vincent > + } > + } > + > + /** > + * {@inheritDoc} > + */ > + public void setContentLength(int length) > + { > + this.httpServletResponse.setContentLength(length); > + } > + > + /** > + * {@inheritDoc} > + */ > + public void setContentType(String mimeType) > + { > + this.httpServletResponse.setContentType(mimeType); > + } > }

1 0

Re: [xwiki-devs] [xwiki-notifications] r22419 - in platform: core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/doc core/trunk/xwiki-rendering/xwiki-rendering-api core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/parser core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer core/trunk/xwiki-rendering/xwiki-rendering-api
by Jerome Velociter 08 Aug '09

08 Aug '09

vmassol (SVN) wrote: > Author: vmassol > Date: 2009-08-08 02:04:58 +0200 (Sat, 08 Aug 2009) > New Revision: 22419 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/plain/PlainTextChainingRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/AnnotatedXHTMLBlockRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/AnnotatedXHTMLChainingRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/AnnotatedXHTMLImageRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/AnnotatedXHTMLLinkRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/AnnotatedXHTMLRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/AnnotatedXHTMLRendererFactory.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLChainingRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xwiki/XWikiSyntaxChainingRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EmptyBlockChainingListener.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/chaining/EmptyBlockChainingListenerTest.java > Removed: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/chaining/ > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/printer/MonitoringWikiPrinter.java > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/XWiki.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java > platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/doc/XWikiDocumentRenderingTest.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/parser/DefaultSyntaxFactory.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AbstractBlockRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/AbstractPrintRendererFactory.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/event/EventRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/plain/PlainTextRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/DefaultXHTMLImageRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/DefaultXHTMLLinkRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLBlockRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLMacroRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xwiki/XWikiSyntaxRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/parser/Syntax.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/parser/SyntaxType.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/printer/XHTMLWikiPrinter.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/xhtml/XHTMLImageRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/xhtml/XHTMLLinkRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/resources/META-INF/components.txt > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/chaining/LookaheadChainingListenerTest.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/parser/SyntaxTest.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-box/src/test/resources/macrobox5.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-box/src/test/resources/macrobox6.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-chart/src/test/resources/macrochart1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-chart/src/test/resources/macrochart2.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-chart/src/test/resources/macrochart3.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-chart/src/test/resources/macrochart4.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/main/java/org/xwiki/rendering/internal/parser/pygments/PygmentsParser.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/test/resources/macrocode7.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/main/java/org/xwiki/rendering/internal/macro/html/HTMLMacroXHTMLChainingRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/main/java/org/xwiki/rendering/internal/macro/html/HTMLMacroXHTMLRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/main/java/org/xwiki/rendering/internal/macro/html/HTMLMacroXHTMLRendererFactory.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml10.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml11.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml13.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml14.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml15.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml16.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml2.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml8.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/test/resources/macrohtml9.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-id/src/test/resources/macroid1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-id/src/test/resources/macroid2.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-rss/src/test/resources/macrorss1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-rss/src/test/resources/macrorss2.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/resources/macrotoc8.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/resources/macrotoc9.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/test/resources/macrovelocity1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/test/resources/macrovelocity4.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/test/resources/macrovelocity5.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/test/resources/macrovelocity6.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/test/resources/macrovelocity7.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/test/resources/macrovelocity8.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/internal/parser/DefaultSyntaxFactoryTest.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape/escape10.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape/escape15.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape/escape16.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape/escape17.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/escape/escape7.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/image/image1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/image/image2.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/image/image3.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/image/image4.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links10.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links12.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links13.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links14.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links15.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links16.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links17.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links18.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links2.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links20.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links21.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links3.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links4.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links5.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links6.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links7.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links8.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/link/links9.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro1.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro10.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro11.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro12.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro13.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro14.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro5.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro6.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro7.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro8.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/macros/macro9.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/paragraph/paragraph4.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/resources/section/section10.test > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js > platform/web/trunk/standard/src/main/webapp/templates/wysiwyginput.vm > 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/converter/internal/DefaultHTMLConverter.java > Log: > XWIKI-4028: Use a XHTML renderer that doesn't add round-trip comments when viewing a wiki page in view mode in ordre to improve performances > > + various refactorings (SyntaxType improvement and others) > > [snip] > > Modified: platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js 2009-08-07 19:35:57 UTC (rev 22418) > +++ platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js 2009-08-08 00:04:58 UTC (rev 22419) > @@ -363,39 +363,23 @@ > > // Section count starts at one, not zero. > var sectioncount = 1; > - // We can't use element.select() since it does not allow to retrieve comment nodes. > - var nodes = $("xwikicontent").childNodes; > - // We don't have to use a macro depth variable since multiple macro levels will generate only one comment. > - var withinmacro = false; > - > - for (var i = 0; i < nodes.length; i++) { > - var node = $(nodes[i]); > + > + // For all non-generated headers, add a SPAN and A element in order to be able to edit the section. > + $('xwikicontent').select('h1:not([class~=wikigeneratedheader])', > + 'h2:not([class~=wikigeneratedheader])').each(function(header) { Moving the dom injection in a named method + using "invoke" (http://www.prototypejs.org/api/enumerable/invoke) instead of "each" might perform better on documents with a lot of non-generated headers. See http://www.prototypejs.org/api/enumerable/each > > - // Deactivate "edit section" links insertion when we are in content generated by a macro. > - // Examples: include macro, velocity macro. > - if (node.nodeName == "#comment") { > - if (node.data.match(/^startmacro/) != null) { > - withinmacro = true; > - } else if (node.data == "stopmacro") { > - withinmacro = false; > - } > - } > + var editspan = document.createElement("SPAN"); > + var editlink = document.createElement("A"); > > - // Insert "edit section" links after level 1 and level 2 headings. > - if (withinmacro == 0 && (node.nodeName == "H1" || node.nodeName == "H2")) { > - var editspan = document.createElement("SPAN"); > - var editlink = document.createElement("A"); > - > - editlink.href = window.docediturl + "?section=" + sectioncount; > - editlink.style.textDecoration = "none"; > - editlink.innerHTML = "$msg.get('edit')"; > - editspan.className = "edit_section"; > + editlink.href = window.docediturl + "?section=" + sectioncount; > + editlink.style.textDecoration = "none"; > + editlink.innerHTML = "$msg.get('edit')"; > + editspan.className = "edit_section"; There is an easier way of doing this, using prototype : var editlink = new Element("link", { "href": window.docediturl + "?section=" + sectioncount, "style" : "text-decoration:none", "class" : "edit_section" } ).update("$msg.get('edit')"); > > - editspan.appendChild(editlink); > - node.insert( { 'after': editspan } ); > - sectioncount++; > - } > - } > + editspan.appendChild(editlink); > + header.insert( { 'after': editspan } ); > + sectioncount++; > + }); > } > }, > > > [snip] > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

1 0

[xwiki-devs] [VOTE] Special event matching all events
by Thomas Mortagne 07 Aug '09

07 Aug '09

Hi, For network event distribution I need to be able to receive all events (because it's not done by ObservationManager itself but by an external module). Currently ObservationManager only match events with the exact same class so it's impossible to match all events or event several events of same subject like documents event for example. I don't have time to design a generic multievent matcher and a redesign of the OM is already started for activity stream so for now I propose to introduce a special AllEvent event ObservationManager will trait as a particular case when returned by a listener (with lots of comments of course). WDYT ? here is my +1 -- Thomas Mortagne

2 2