Re: [xwiki-devs] [xwiki-notifications] r21967 - enterprise/trunk enterprise/trunk/wiki platform/core/trunk platform/core/trunk/xwiki-core platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/interna

Here is a first review try (pretty difficult to review all that). My first replies was rejected by the mailing list because it was too long... [snip] .java 2009-07-15 17:48:48 UTC (rev 21966) 2009-07-15 18:57:45 UTC (rev 21967) ; es, " ,")); You should add a more consistent TODO here since it's a temporary hack entManager().lookup(WikiMacroInitializer.class); /DefaultWikiMacroBuilder.java faultWikiMacroBuilder.java (rev 0) faultWikiMacroBuilder.java 2009-07-15 18:57:45 UTC (rev 21967) Looks like your svn client is not properly configured. s WikiMacroBuilder ikicontext"); derException ontext()); nt", documentName), ex); ntains a macro definition. n. cro definition found. erException efinition found in document : [%s]", doc OPERTY); DESCRIPTION_PROPERTY); ENT_PROPERTY); ", doc.getFullName())); description is empty", doc.getFullName())); pty", doc.getFullName())); rrayList<WikiMacroParameterDescriptor>(); PARAMETER_CLASS); RAMETER_NAME_PROPERTY); alue(PARAMETER_DESCRIPTION_PROPERTY); RTY) =3D=3D 0) ? false : true; eter name is empty", doc.getFullName())); in [%s], macro parameter description is empty"; ullName())); (parameterName, parameterDescription, Description, parameterDescriptors); c.getSyntaxId(), componentManager); /DefaultWikiMacroInitializer.java faultWikiMacroInitializer.java (rev 0) faultWikiMacroInitializer.java 2009-07-15 18:57:45 UTC (rev 21967) ments WikiMacroInitializer ikicontext"); here doc.fullName=3Dobj.name and obj.className=3D?"; List("XWiki.WikiMacroClass"), xcontext); , ex); ro>(); Doc); Name, wikiMacros.get(documentName)); [snip] /java/org/xwiki/rendering/block/AbstractBlock.java org/xwiki/rendering/block/AbstractBlock.java 2009-07-15 17:48:48 UTC (rev = 21966) org/xwiki/rendering/block/AbstractBlock.java 2009-07-15 18:57:45 UTC (rev = 21967) data associated with a block. It can be used derers/listeners. For example you can pass t example the name would be <code>style</code> nt block should be displayed in red. s and you'll need to check what the different >- * renderers/listeners support to know what to use. >- * </p> >- * >- * @param name the parameter's name >- * @param value the parameter's value >- */ >- public void setParameter(String name, Object value) >- { >- setParameter(name, ConvertUtils.convert(value)); >- } >- >- /** > * Set several parameters at once. > * > * @param parameters the parameters to set > /java/org/xwiki/rendering/internal/macro/DefaultMacroManager.java org/xwiki/rendering/internal/macro/DefaultMacroManager.java 2009-07-15 17= :48:48 UTC (rev 21966) org/xwiki/rendering/internal/macro/DefaultMacroManager.java 2009-07-15 18= :57:45 UTC (rev 21967) croManager, Initializable croManager d value is a Map with an index being the macro he syntax and value is a Map with an index } object. Injected by the component manager ered as components. ro< ? >>>(); eption e); ax and those registered for all syntaxes. work with the given syntax. ]; g(syntaxAsString); String(syntaxAsString); ze Macro [" + macroName Macro [" + macroName + "]", e); )); )); ng. tem."); the macro is registered for all syntaxes. , Macro< ? > macro) cros.get(syntax); to the desired syntax wins. ; roLookupException cros.get(syntax); oName)) { med [%s] is available for syntax [%s].", on [%s] can be found.", macroName)); ound"); null; [snip] /java/org/xwiki/rendering/macro/AbstractMacro.java org/xwiki/rendering/macro/AbstractMacro.java 2009-07-15 17:48:48 UTC (rev = 21966) org/xwiki/rendering/macro/AbstractMacro.java 2009-07-15 18:57:45 UTC (rev = 21967) nts Macro<P> nts Macro<P>, Initializable criptor) cro. ass) ers bean. es not support generic types. the content of this macro. z) criptor, Class< ? > parametersBeanClass) riptor, beanManager ore others) ore others) getSimpleName()); macro descriptor with their own. >- * @param descriptor the overriding descriptor to set >+ * >+ * @param descriptor the overriding descriptor to set > */ > protected void setDescriptor(MacroDescriptor descriptor) > { > /java/org/xwiki/rendering/macro/AbstractNoParameterMacro.java org/xwiki/rendering/macro/AbstractNoParameterMacro.java 2009-07-15 17= :48:48 UTC (rev 21966) org/xwiki/rendering/macro/AbstractNoParameterMacro.java 2009-07-15 18= :57:45 UTC (rev 21967) >@@ -19,7 +19,6 @@ > */ > package org.xwiki.rendering.macro; > >-import org.xwiki.rendering.macro.descriptor.DefaultMacroDescriptor; > > /** > * Base class for a macro which does not support any parameter. >@@ -36,6 +35,6 @@ > */ > public AbstractNoParameterMacro(String description) > { >- super(new DefaultMacroDescriptor(description)); >+ super(description); > } > } > /java/org/xwiki/rendering/macro/descriptor/AbstractMacroDescriptor.java org/xwiki/rendering/macro/descriptor/AbstractMacroDescriptor.java 2009-= 07-15 17:48:48 UTC (rev 21966) org/xwiki/rendering/macro/descriptor/AbstractMacroDescriptor.java 2009-= 07-15 18:57:45 UTC (rev 21967) on; ; s supported for this macro. indicate macro does not support content. acro parameters. bean or null if there are no parameters for ontentDescriptor, and insert it in tor} and insert it in sBeanClass); ertyDescriptors(); riptors) { tParametersBeanClass().newInstance()); ptor.getProperties()) { iptor(propertyDescriptor); desc); parameterDescriptorMap}. Descriptor, Object defaultInstance) r(); eterHidden.class); arameterDescription.class); meterDescription.value() : propertyDescriptor arameterMandatory.class); e)); e(), desc); getter if no annotation has been found. perty value. rty value. ation type. e if present on this element, else null. writeMethod, Method readMethod, ass); lass); tDescriptor() Descriptor.getBeanClass() : Object.class; iableMap(this.parameterDescriptorMap) >+ : Collections.<String, ParameterDescriptor> emptyMap(); > } > } > /java/org/xwiki/rendering/macro/descriptor/DefaultMacroDescriptor.java org/xwiki/rendering/macro/descriptor/DefaultMacroDescriptor.java 2009-= 07-15 17:48:48 UTC (rev 21966) org/xwiki/rendering/macro/descriptor/DefaultMacroDescriptor.java 2009-= 07-15 18:57:45 UTC (rev 21967) >@@ -19,6 +19,8 @@ > */ > package org.xwiki.rendering.macro.descriptor; > >+import org.xwiki.properties.BeanDescriptor; >+ > /** > * Describe a macro with no parameters. > * >@@ -32,41 +34,28 @@ > */ > public DefaultMacroDescriptor(String description) > { >- super(description, new DefaultContentDescriptor(), Object.class); >+ super(description, new DefaultContentDescriptor(), null); > } >- >+ > /** > * @param description the description of the macro. acro parameters. rsBeanClass) Class); l indicate macro does not support content. ntentDescriptor) indicate macro does not support content. acro parameters. bean. ntentDescriptor, >- Class< ? > parametersBeanClass) >+ BeanDescriptor parametersBeanDescriptor) > { >- super(description, contentDescriptor, parametersBeanClass); >- >+ super(description, contentDescriptor, parametersBeanDescriptor); >+ > extractParameterDescriptorMap(); >- } >+ } > } > /java/org/xwiki/rendering/macro/descriptor/DefaultParameterDescriptor.java org/xwiki/rendering/macro/descriptor/DefaultParameterDescriptor.java 2009-= 07-15 17:48:48 UTC (rev 21966) org/xwiki/rendering/macro/descriptor/DefaultParameterDescriptor.java 2009-= 07-15 18:57:45 UTC (rev 21967) e given {@link PropertyDescriptor}. or) scription() pe() faultValue() datory() [snip] ndering-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/w= ikibridge/DefaultWikiMacroManager.java ring-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wiki= bridge/DefaultWikiMacroManager.java (rev 0) ring-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wiki= bridge/DefaultWikiMacroManager.java 2009-07-15 18:57:45 UTC (rev 219= 67) s WikiMacroManager ster wiki macros when corresponding documents ); o) nentDescriptor<Macro>(); ", wikiMacro.getName(), documentName)); kiMacro.getName(), documentName), ex); ocumentName); acroDescriptor.getRoleHint()); red", macroDescriptor.getRoleHint(), >+ documentName)); >+ } ndering-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/w= ikibridge/WikiMacroEventListener.java ring-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wiki= bridge/WikiMacroEventListener.java (rev 0) ring-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wiki= bridge/WikiMacroEventListener.java 2009-07-15 18:57:45 UTC (rev 21967) egistering / updating xwiki rendering macros EventListener oesn't look right. But we cannot use ust be fixed. XWikiDocument implements DocumentModelBridge which mean source is also a DocumentModelBridge, so yes you can access everything in DocumentModelBridge api (which among other things mean the document name) entFilter().getFilter(); ikis are not allowed"); cumentUpdateEvent) { cument. ned in it. oBuilder.WIKI_MACRO_CLASS, 0, e); ntinuing further. [%s] due to insufficient privileges"; iMacro.getName())); Macro); anager.hasWikiMacro(documentName)) { >+ wikiMacroManager.unregisterWikiMacro(documentName); >+ } ndering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge= /WikiMacro.java ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacro.java (rev 0) ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacro.java 2009-07-15 18:57:45 UTC (rev 21967) ent to be parsed is injected and the content registered dynamically against the component rieved from the Wiki for example). ntext for scripts. ext. o context. inside macro context. o. look up for other components. macroContent, String syntaxId, TransformationContext) roContent, MacroTransformationContext context) riptor().getParameterDescriptorMap(); ors.get(parameterName); ers.get(parameterName))) { r [%s] is mandatory", parameterName)); ose defined by the macro. parameter : [%s]", parameterName)); xId); r macro content", ex); content", ex); ); ss); ("xwikicontext"); o parameters", ex); xFactory.class); p(Transformation.class, MACRO_HINT); xFromIdString(syntaxId)); ernal macro transformations", ex); Did you take care of make sure the macro is executed with programming rights ? As far as i can see in your code the document from where the macro is called need to be be saved with programming right for the macro to be executed with programming right so this will not work for a normal user. Note: programming right is working this way: first the author of context document is tested for programming right, if there is no context document then the context user is tested for programming right. In your case i would say the best is to put the macro's document as context document when before executing it so you have to remember the document or at least its name in WikiMacro (which btw even without this need would be logical). .getSimpleName()); >+ } >+ >+ /** >+ * {@inheritDoc} >+ */ >+ public boolean supportsInlineMode() >+ { >+ return true; >+ } ndering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge= /WikiMacroBuilder.java ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroBuilder.java (rev 0) ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroBuilder.java 2009-07-15 18:57:45 UTC (rev 21967) s. ; All this has nothing to do here, the fact that it's stored in a document object is an implementation detail. WikiMacroBuilder user should not know that. to build a {@link WikiMacro} if a definition is . found. or if an error is encountered while building ption; [snip] > ndering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge= /WikiMacroDescriptor.java ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroDescriptor.java (rev 0) ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroDescriptor.java 2009-07-15 18:57:45 UTC (rev 21967) rDescriptor> parameterDescriptors) ng, ParameterDescriptor>(); rs) { >+ descriptors.put(descriptor.getName(), descriptor); >+ } >+ >+ return descriptors; >+ } ndering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge= /WikiMacroInitializer.java ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroInitializer.java (rev 0) ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroInitializer.java 2009-07-15 18:57:45 UTC (rev 21967) t XE startup. rs them against the ComponentManager. >+ */ >+ void init(); ndering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge= /WikiMacroManager.java ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroManager.java (rev 0) ring-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/Wi= kiMacroManager.java 2009-07-15 18:57:45 UTC (rev 21967) keeps a reference to it for future reference. acro. s one). acro. re is a {@link WikiMacro} already registered >+ * for the given document. acro. nd document name. >+ */ >+ boolean hasWikiMacro(String documentName); [snip]