Re: [xwiki-devs] [xwiki-notifications] r34329 - in platform/core/trunk: xwiki-annotations/xwiki-annotation-core/src/main/java/org/xwiki/annotation/renderer xwiki-annotations/xwiki-annotation-core/src/test/java/org/xwiki/annotation/renderer xwiki-rendering/xwiki-r
Hi Vincent, Something I don't understand in your commit : why the SOURCE meta data is a private field of the meta data object ? Are there two types of meta data ? One "first level citizen" that gets to have its private field in the metadata object, and the other ones that goes in the meta data map ? How do you arbitrate ? Does that make sense ? Jerome. On Tue, Feb 1, 2011 at 8:17 PM, vmassol <[email protected]> wrote:
Author: vmassol Date: 2011-02-01 20:17:00 +0100 (Tue, 01 Feb 2011) New Revision: 34329
Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/MetaDataBlock.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/MetaData.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/MetaDataStateChainingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/internal/renderer/xhtml/ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLRendererTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/chaining/MetaDataStateChainingListenerTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/reference/ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/reference/ResourceReferenceTest.java Removed: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/java/org/xwiki/rendering/internal/macro/context/DefaultXDOMResourceReferenceResolver.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/java/org/xwiki/rendering/internal/macro/context/XDOMResourceReferenceResolver.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/test/java/org/xwiki/rendering/internal/macro/context/DefaultXDOMResourceReferenceResolverTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-include/src/test/resources/ Modified: platform/core/trunk/xwiki-annotations/xwiki-annotation-core/src/main/java/org/xwiki/annotation/renderer/AbstractAnnotationRenderer.java platform/core/trunk/xwiki-annotations/xwiki-annotation-core/src/test/java/org/xwiki/annotation/renderer/AnnotationXHTMLRendererTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/XDOM.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/parser/XDOMGeneratorListener.java 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/xhtml/AnnotatedXHTMLRenderer.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/xhtml/XHTMLRenderer.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/CompositeListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/QueueListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/WrappingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/AbstractChainingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EventType.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/LookaheadChainingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/reference/ResourceReference.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/java/org/xwiki/rendering/internal/macro/context/ContextMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/resources/META-INF/components.txt platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/test/java/org/xwiki/rendering/internal/macro/context/ContextMacroTest.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-include/src/main/java/org/xwiki/rendering/internal/macro/include/IncludeMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-include/src/test/java/org/xwiki/rendering/internal/macro/IncludeMacroTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/DoxiaGeneratorListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/renderer/wikimodel/WikiModelGeneratorListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/wiki/XWikiWikiModel.java platform/core/trunk/xwiki-rendering/xwiki-rendering-xwiki/src/test/java/org/xwiki/rendering/internal/wiki/XWikiWikiModelTest.java Log: XWIKI-4802: Add MetaData Block/Events to allow specifying meta data to XDOM/Listeners XWIKI-5902: Add support for relative links/images in included documents when they are generated by macros
Hi Jerome, On Feb 2, 2011, at 2:42 PM, Jerome Velociter wrote:
Hi Vincent,
Something I don't understand in your commit : why the SOURCE meta data is a private field of the meta data object ?
It's public: public static final String SOURCE = "source";
Are there two types of meta data ? One "first level citizen" that gets to have its private field in the metadata object, and the other ones that goes in the meta data map ? How do you arbitrate ?
Does that make sense ?
The reason I have defined the SOURCE key in MetaData is because I needed a place where to put "well-known" metadata keys. Thanks -Vincent
Jerome.
On Tue, Feb 1, 2011 at 8:17 PM, vmassol <[email protected]> wrote:
Author: vmassol Date: 2011-02-01 20:17:00 +0100 (Tue, 01 Feb 2011) New Revision: 34329
Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/MetaDataBlock.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/MetaData.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/MetaDataStateChainingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/internal/renderer/xhtml/ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLRendererTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/chaining/MetaDataStateChainingListenerTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/reference/ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/listener/reference/ResourceReferenceTest.java Removed: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/java/org/xwiki/rendering/internal/macro/context/DefaultXDOMResourceReferenceResolver.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/java/org/xwiki/rendering/internal/macro/context/XDOMResourceReferenceResolver.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/test/java/org/xwiki/rendering/internal/macro/context/DefaultXDOMResourceReferenceResolverTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-include/src/test/resources/ Modified: platform/core/trunk/xwiki-annotations/xwiki-annotation-core/src/main/java/org/xwiki/annotation/renderer/AbstractAnnotationRenderer.java platform/core/trunk/xwiki-annotations/xwiki-annotation-core/src/test/java/org/xwiki/annotation/renderer/AnnotationXHTMLRendererTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/XDOM.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/parser/XDOMGeneratorListener.java 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/xhtml/AnnotatedXHTMLRenderer.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/xhtml/XHTMLRenderer.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/CompositeListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/QueueListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/WrappingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/AbstractChainingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EventType.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/LookaheadChainingListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/reference/ResourceReference.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/java/org/xwiki/rendering/internal/macro/context/ContextMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/main/resources/META-INF/components.txt platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-context/src/test/java/org/xwiki/rendering/internal/macro/context/ContextMacroTest.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-include/src/main/java/org/xwiki/rendering/internal/macro/include/IncludeMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-include/src/test/java/org/xwiki/rendering/internal/macro/IncludeMacroTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/DoxiaGeneratorListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/renderer/wikimodel/WikiModelGeneratorListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/wiki/XWikiWikiModel.java platform/core/trunk/xwiki-rendering/xwiki-rendering-xwiki/src/test/java/org/xwiki/rendering/internal/wiki/XWikiWikiModelTest.java Log: XWIKI-4802: Add MetaData Block/Events to allow specifying meta data to XDOM/Listeners XWIKI-5902: Add support for relative links/images in included documents when they are generated by macros
participants (2)
-
Jerome Velociter -
Vincent Massol