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

[xwiki-devs] Calling Email from user
by Sales, G. (Grant) 17 Jun '10

17 Jun '10

$xwiki.user.eamil = current user's email address $xwiki.getLocalUserName($doc.author) = Author's First and Last name $xwiki.getLocalUserName($doc.creator) = Creator's First and Last name How would I get the email address for a document author and or the last person that modified the document? Grant Sales Security Operations Analyst ING 20 Washington Ave South Minneapolis, MN 55401 Tel: 612.342.7889 Fax: 612.342.3428 Cell: 320.761.0966 Email: grant.sales(a)us.ing.com www.ing-usa.com ING. Your future. Made easier. (r) --------------------------------------------------------- NOTICE: The information contained in this electronic mail message is confidential and intended only for certain recipients. If you are not an intended recipient, you are hereby notified that any disclosure, reproduction, distribution or other use of this communication and any attachments is strictly prohibited. If you have received this communication in error, please notify the sender by reply transmission and delete the message without copying or disclosing it. ============================================================================================

3 17

[xwiki-devs] [VOTE] Add apis to set current user and current wiki
by Thomas Mortagne 17 Jun '10

17 Jun '10

Hi devs, To fix http://jira.xwiki.org/jira/browse/XWIKI-5282 I can't find other way that adding the following apis: * DocumentAccessBridge#setCurrentUser (we already have DocumentAccessBridge#getCurrentUser) * ModelContext#setCurrentEntityReference (we will have to add it at some point anyway) Here is my +1 Also this imply that to fix the bug in 2.3 we need to add theses new apis in 2.3 too. I'm +1 for it too. It can't break anything. WDYT ? -- Thomas Mortagne

3 3

[xwiki-devs] [Vote] Move the 'paste office content' feature from the import menu to the tool bar?
by Marius Dumitru Florea 17 Jun '10

17 Jun '10

Hi, Currently the Import menu of the WYSIWYG editor has two entries: * 'Office Document' for importing office files * 'Office Content (Copy / Paste)' for pasting rich text (copied usually from office documents) We had a few complains from uses that were pasting the rich text directly in the edited document causing the editor to misbehave or getting unexpected content after save. When they were told to use the 'Office Content (Copy / Paste)' entry from the Import menu they seemed surprised Ideally the editor should catch the paste event and clean the pasted rich text on the fly before it is inserted in the edited document but currently there's no clean way to do this: access to the clipboard is restricted for security reasons and the paste event is not well supported in all major browsers. I recently committed a change to the WYSIWYG editor to allow putting any of the Import menu entries on the tool bar. (1) Should we enable the 'Office Content (Copy / Paste)' button on the tool bar by default in the standard XE distribution? (2) Should we remove the 'Office Content (Copy / Paste)' entry from the Import menu? I'm +1 for (1) and -0 for (2) because the Import menu would look awkward with just one entry. Note that it's not unusual to have a feature both in the menu and in the tool bar. Thanks, Marius

6 6

Re: [xwiki-devs] XWiki Rendering Macro not working
by Luiz Marcelo Serique 16 Jun '10

16 Jun '10

On Wed, Jun 16, 2010 at 4:56 PM, Ludovic Dubost <ludovic(a)xwiki.org> wrote: > > Hi, > > We you talking about wiki macros ? Yes, wiki macros. > Are you putting them in the same page or using the same name ? Different names but in same page. > > There is indeed only one macro per page otherwise the system would not know which macros the parameters definitions would belong to. Ok, so if i want more than one global macro, i need to create a page for each one? In any space? > > Ludovic > > Le 16/06/10 21:51, Luiz Marcelo Serique a écrit : >> >> Hi, >> >> I am writing some macros but this issue happened: >> >> The first macro written works perfectly, the second macro does not. If i >> delete the first macro the second (now the only one on list) works. >> >> Can i have just one macro per page? >> >> thks >> -- >> L. Marcelo >> _______________________________________________ >> devs mailing list >> devs(a)xwiki.org >> http://lists.xwiki.org/mailman/listinfo/devs >> >> > > > -- > Ludovic Dubost > Blog: http://blog.ludovic.org/ > XWiki: http://www.xwiki.com > Skype: ldubost GTalk: ldubost >

2 1

[xwiki-devs] XWiki Rendering Macro not working
by Luiz Marcelo Serique 16 Jun '10

16 Jun '10

Hi, I am writing some macros but this issue happened: The first macro written works perfectly, the second macro does not. If i delete the first macro the second (now the only one on list) works. Can i have just one macro per page? thks -- L. Marcelo

2 1

[xwiki-devs] URL's computed inside JavaScript code
by Marius Dumitru Florea 16 Jun '10

16 Jun '10

Hi, We have many places in our JavaScript code where URLs are computed from different fragments. The most common use case is appending query string parameters to an existing URL: window.docgeturl + '?xpage=xpart&vm=' + extraTemplate This code works well in servlet mode but it's almost impossible to integrate in portlet mode because portlet URLs are special http://dev.xwiki.org/xwiki/bin/view/Drafts/PortletIntegration#HPortletURLs . You can't add parameters to a portlet URL by simply appending them to the query string. There are two scenarios (for portlet mode): (1) Either window.docgeturl is a portlet URL written on the server when the page was rendered and in this case parameters appended to the query string will be ignored (2) or window.docgeturl is a servlet URL, but we have to rewrite on the server the computed URL into a portlet URL -- impossible What if we avoid computing URLs in JavaScript code and instead get the URLs from HTML elements (e.g. anchors or forms)? <a id="commentsResourceId" href="$doc.getURL('get', '?xpage=xpart&vm=commentsinline.vm')" class="hidden">Comments</a> ... $(commentsResourceId).href I'm interested to know if this would help others too. Thanks, Marius

1 0

Re: [xwiki-devs] [xwiki-notifications] r29494 - in platform/core/trunk/xwiki-rendering/xwiki-rendering-macros: xwiki-rendering-macro-html/src/main/java/org/xwiki/rendering/internal/macro/html xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script xwiki-rendering-macro-script/src/main/resources/META-INF xwiki-rendering-macro-script/src/test/java/org/xwiki/rendering/macro/script xwiki-rendering-macro-scri
by Vincent Massol 16 Jun '10

16 Jun '10

Hi Caleb, Some reviews below. On Jun 16, 2010, at 12:03 PM, cjdelisle (SVN) wrote: > Author: cjdelisle > Date: 2010-06-16 12:03:02 +0200 (Wed, 16 Jun 2010) > New Revision: 29494 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/DefaultScriptMacroConfiguration.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/DefaultScriptMacroUtils.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/ScriptMacroUtils.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacroConfiguration.java > Removed: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript3.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript5.test > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-html/src/main/java/org/xwiki/rendering/internal/macro/html/HTMLMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/AbstractScriptMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/resources/META-INF/components.txt > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/java/org/xwiki/rendering/macro/script/RenderingTests.java > Log: > XWIKI-5275: Prevent nested script macros. > When script runs, looks up the dom tree to see if it's inside of the output from another script and stops. > Thanks Alex Busenius for the patch. > Reviewed and applied with some revisions. [snip] > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/DefaultScriptMacroUtils.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/DefaultScriptMacroUtils.java (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/DefaultScriptMacroUtils.java 2010-06-16 10:03:02 UTC (rev 29494) > @@ -0,0 +1,76 @@ > +/* > + * 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 org.xwiki.rendering.internal.macro.script; > + > +import org.xwiki.component.annotation.Component; > +import org.xwiki.component.annotation.Requirement; > +import org.xwiki.rendering.block.MacroBlock; > +import org.xwiki.rendering.block.MacroMarkerBlock; > +import org.xwiki.rendering.macro.MacroId; > +import org.xwiki.rendering.macro.MacroLookupException; > +import org.xwiki.rendering.macro.MacroManager; > +import org.xwiki.rendering.macro.script.ScriptMacro; > +import org.xwiki.rendering.macro.script.ScriptMacroConfiguration; > + > +/** > + * A collection of utility methods for script macros. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +@Component > +public class DefaultScriptMacroUtils implements ScriptMacroUtils I really don' t like having a component with such a bad name. Utils are the opposite to good OO design IMO. And the fact that isScriptNested will return false even if the script is nested is even worse (when the config param is set to true)... > +{ > + /** Used to get a macro by id. */ > + @Requirement > + private MacroManager macroManager; > + > + /** Script macro configuration. */ > + @Requirement > + private ScriptMacroConfiguration configuration; > + > + /** > + * {@inheritDoc} > + * @see org.xwiki.rendering.internal.macro.script.ScriptMacroUtils#isScriptNested(org.xwiki.rendering.block.MacroBlock) > + */ > + public boolean isScriptNested(MacroBlock currentBlock) > + { > + if (configuration.isNestedScriptsEnabled()) { > + return false; > + } > + // traverse the XDOM tree up to the root > + MacroMarkerBlock parent = currentBlock.getParentBlockByType(MacroMarkerBlock.class); > + while (parent != null) { > + String parentId = parent.getId(); > + try { > + if (macroManager.getMacro(new MacroId(parentId)) instanceof ScriptMacro) { > + return true; > + } else if ("include".equals(parentId)) { > + // included documents intercept the chain of nested script macros with XWiki syntax > + return false; > + } > + } catch (MacroLookupException exception) { > + // shouldn't happen, the parent macro was already successfully executed earlier > + } > + parent = parent.getParentBlockByType(MacroMarkerBlock.class); > + } > + return false; > + } > +} > > > Property changes on: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/DefaultScriptMacroUtils.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/ScriptMacroUtils.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/ScriptMacroUtils.java (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/ScriptMacroUtils.java 2010-06-16 10:03:02 UTC (rev 29494) > @@ -0,0 +1,41 @@ > +/* > + * 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 org.xwiki.rendering.internal.macro.script; > + > +import org.xwiki.component.annotation.ComponentRole; > +import org.xwiki.rendering.block.MacroBlock; > + > +/** > + * An internal component for accessing script macro-related utility methods. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +@ComponentRole > +public interface ScriptMacroUtils > +{ > + /** > + * Check if the given macro block is nested inside a script macro. > + * > + * @param currentBlock the block to check > + * @return true if the block is a ancestor of a script macro block The implementation doesn't do what the javadoc says since it will return false independently of the passed blocks if the config is set to true. > + */ > + boolean isScriptNested(MacroBlock currentBlock); > +} > > > Property changes on: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/internal/macro/script/ScriptMacroUtils.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/AbstractScriptMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/AbstractScriptMacro.java 2010-06-16 09:35:24 UTC (rev 29493) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/AbstractScriptMacro.java 2010-06-16 10:03:02 UTC (rev 29494) > @@ -20,7 +20,6 @@ > package org.xwiki.rendering.macro.script; > > import java.io.StringReader; > -import java.net.URLClassLoader; > import java.util.Collections; > import java.util.List; > > @@ -35,6 +34,7 @@ > import org.xwiki.rendering.block.MacroBlock; > import org.xwiki.rendering.block.XDOM; > import org.xwiki.rendering.internal.macro.script.AttachmentClassLoaderFactory; > +import org.xwiki.rendering.internal.macro.script.ScriptMacroUtils; > import org.xwiki.rendering.macro.AbstractMacro; > import org.xwiki.rendering.macro.MacroExecutionException; > import org.xwiki.rendering.macro.descriptor.ContentDescriptor; > @@ -49,8 +49,10 @@ > * @param <P> the type of macro parameters bean. > * @version $Id$ > * @since 1.7M3 > + * @todo This class is on the edge of a fanout violation and needs to be refactored and split up. > */ > public abstract class AbstractScriptMacro<P extends ScriptMacroParameters> extends AbstractMacro<P> > + implements ScriptMacro > { > /** > * The default description of the script macro content. > @@ -106,6 +108,12 @@ > private ParserUtils parserUtils = new ParserUtils(); > > /** > + * Used to check for nested scripts. > + */ > + @Requirement > + private ScriptMacroUtils scriptUtils; This looks very artificial and I have the feeling it was introduced artifically because of a fanout violation. As I 've said on irc it's much better for example to introduce a generic notion of filter and implement a filter based on the logic found in DefaultScriptMacroUtils. > + > + /** > * @param macroName the name of the macro (eg "groovy") > */ > public AbstractScriptMacro(String macroName) > @@ -196,6 +204,11 @@ > try { > Thread.currentThread().setContextClassLoader(newClassLoader); > > + // 0) Abort execution if the script is nested > + if (scriptUtils.isScriptNested(context.getCurrentMacroBlock())) { > + throw new MacroExecutionException("Nested scripts are not allowed"); > + } This part can be replaced by ScriptValidator components: try { for (ScriptValidator validator : componentManager.lookupList(ScriptValidator.class)) { validator.validate(context); <-- will throw ScriptValidationException } } catch (ScriptValidationException e) { throw new MacroExecutionException("Script failed to pass validations. Reason = [" + e.getMessage() + "]", e); } > + > // 1) Run script engine on macro block content > String scriptResult = evaluate(parameters, content, context); > > @@ -238,7 +251,7 @@ > * @return the class loader to use for executing the script > * @throws Exception in case of an error in building the class loader > */ > - private URLClassLoader findClassLoader(String jarsParameterValue, ClassLoader parent) throws Exception > + private ClassLoader findClassLoader(String jarsParameterValue, ClassLoader parent) throws Exception > { > // We cache the Class Loader for improved performances and we check if the saved class loader had the same > // jar parameters value as the current execution. If not, we compute a new class loader. > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacro.java (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacro.java 2010-06-16 10:03:02 UTC (rev 29494) > @@ -0,0 +1,34 @@ > +/* > + * 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 org.xwiki.rendering.macro.script; > + > + > +/** > + * An interface used to distinguish script macros from the rest. The most important difference > + * is that script macros cannot be nested. That's not true. It depends on the configuration param. > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +public interface ScriptMacro > +{ > + > +} > + > > > Property changes on: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacro.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacroConfiguration.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacroConfiguration.java (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacroConfiguration.java 2010-06-16 10:03:02 UTC (rev 29494) > @@ -0,0 +1,46 @@ > +/* > + * 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 org.xwiki.rendering.macro.script; > + > +import org.xwiki.component.annotation.ComponentRole; > + > +/** > + * Configuration properties for the Script macro. > + * > + * You can override the default values for each of the configuration properties below by defining them in XWiki's global > + * configuration file using a prefix of "rendering.macro.script" followed by the property name. For example: > + * <code>rendering.macro.script.nestedscripts.enabled = 1</code> > + * > + * @version $Id$ > + * @since 2.4M2 > + */ > +@ComponentRole > +public interface ScriptMacroConfiguration > +{ > + /** > + * Allowing nested scripting macros, for example {{velocity}}{{groovy}}...{{/groovy}}{{/velocity}} is potentially > + * insecure, because an insufficiently escaped user data might allow script injection attacks. > + * > + * Default: 0 (disabled) What does "Default: 0 (disabled)" means? > + * > + * @return true if nested scripts are allowed > + */ > + boolean isNestedScriptsEnabled(); > +} > > > Property changes on: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/java/org/xwiki/rendering/macro/script/ScriptMacroConfiguration.java > ___________________________________________________________________ > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/resources/META-INF/components.txt > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/resources/META-INF/components.txt 2010-06-16 09:35:24 UTC (rev 29493) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/main/resources/META-INF/components.txt 2010-06-16 10:03:02 UTC (rev 29494) > @@ -1,2 +1,4 @@ > org.xwiki.rendering.internal.macro.script.DefaultScriptMacro > -org.xwiki.rendering.internal.macro.script.DefaultAttachmentClassLoaderFactory > \ No newline at end of file > +org.xwiki.rendering.internal.macro.script.DefaultAttachmentClassLoaderFactory > +org.xwiki.rendering.internal.macro.script.DefaultScriptMacroUtils > +org.xwiki.rendering.internal.macro.script.DefaultScriptMacroConfiguration > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/java/org/xwiki/rendering/macro/script/RenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/java/org/xwiki/rendering/macro/script/RenderingTests.java 2010-06-16 09:35:24 UTC (rev 29493) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/java/org/xwiki/rendering/macro/script/RenderingTests.java 2010-06-16 10:03:02 UTC (rev 29494) > @@ -39,9 +39,7 @@ > > suite.addTestsFromResource("macroscript1", true); > suite.addTestsFromResource("macroscript2", true); > - suite.addTestsFromResource("macroscript3", true); > suite.addTestsFromResource("macroscript4", true); > - suite.addTestsFromResource("macroscript5", true); There's a whole now. Other tests should be renamed or a new test added? Why don't we test the code btw? I didn't see any tests, have I missed something? We should never commit without tests especially not in the rendering module that is well tested! :) Thanks -Vincent > > ComponentManagerTestSetup testSetup = new ComponentManagerTestSetup(suite); > new ScriptMockSetup(testSetup.getComponentManager()); > > Deleted: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript3.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript3.test 2010-06-16 09:35:24 UTC (rev 29493) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript3.test 2010-06-16 10:03:02 UTC (rev 29494) > @@ -1,27 +0,0 @@ > -.#----------------------------------------------------- > -.input|xwiki/2.0 > -.# Validate that inner macro is transformed also > -.#----------------------------------------------------- > -{{script}} > -{{script}} > -script here > -{{/script}} > -{{/script}} > -.#----------------------------------------------------- > -.expect|event/1.0 > -.#----------------------------------------------------- > -beginDocument > -beginMacroMarkerStandalone [script] [] [{{script}} > -script here > -{{/script}}] > -beginMacroMarkerStandalone [script] [] [script here] > -beginParagraph > -onWord [script] > -onSpace > -onWord [here] > -endParagraph > -endMacroMarkerStandalone [script] [] [script here] > -endMacroMarkerStandalone [script] [] [{{script}} > -script here > -{{/script}}] > -endDocument > \ No newline at end of file > > Deleted: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript5.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript5.test 2010-06-16 09:35:24 UTC (rev 29493) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-script/src/test/resources/macroscript5.test 2010-06-16 10:03:02 UTC (rev 29494) > @@ -1,23 +0,0 @@ > -.#----------------------------------------------------- > -.input|xwiki/2.0 > -.# Validate that inner macro is inline too > -.#----------------------------------------------------- > -text {{script}}{{script}}script here{{/script}}{{/script}} text > -.#----------------------------------------------------- > -.expect|event/1.0 > -.#----------------------------------------------------- > -beginDocument > -beginParagraph > -onWord [text] > -onSpace > -beginMacroMarkerInline [script] [] [{{script}}script here{{/script}}] > -beginMacroMarkerInline [script] [] [script here] > -onWord [script] > -onSpace > -onWord [here] > -endMacroMarkerInline [script] [] [script here] > -endMacroMarkerInline [script] [] [{{script}}script here{{/script}}] > -onSpace > -onWord [text] > -endParagraph > -endDocument Thanks -Vincent

2 2

[xwiki-devs] [Feedback][UX] Action Menus
by Ecaterina Valica 16 Jun '10

16 Jun '10

Hi, More than 6 months have passed since we introduced the new action menus <http://platform.xwiki.org/xwiki/bin/view/Features/ActionBars>(in XE 2.1). If you want to make a comparison you can look at the old menus Toucan <http://code.xwiki.org/xwiki/bin/view/Skins/ToucanSkin>skin has. It would be great to have some feedback on the way the new menus improved/messed the productivity/flow. There are lots of aspects we need to take into considerations because XWiki is used worldwide both by developers and by less experienced users. Suggestions on how we can still improve the menus are very welcomed. Thanks for participating in improving the User Experience for Open-Source projects, Caty

3 2

Re: [xwiki-devs] [xwiki-notifications] r29480 - platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources
by Vincent Massol 15 Jun '10

15 Jun '10

Hi Caleb, On Jun 15, 2010, at 3:27 PM, cjdelisle (SVN) wrote: > Author: cjdelisle > Date: 2010-06-15 15:27:18 +0200 (Tue, 15 Jun 2010) > New Revision: 29480 > > Modified: > platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm > Log: > XWIKI-5273: In syntax 1.0 allow changing order of renderers, set default in configuration file to execute groovy before velocity. > Make groovy be rendered before velocity by default. > > Modified: platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm > =================================================================== > --- platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm 2010-06-15 13:24:58 UTC (rev 29479) > +++ platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm 2010-06-15 13:27:18 UTC (rev 29480) > @@ -307,6 +307,11 @@ > #-# Simple wiki syntax rendering > # xwiki.render.wikiwiki=0 > > +#-# Rendering order: content will be rendered by the first renderer on the list, output rendered by the second, etc. > +#-# Default: macromapping, velocity, groovy, plugin, wiki, wikiwiki > +#-# To protect against velocity content becoming groovy code, it is recommended to leave the following line active. > +xwiki.render.renderingorder=macromapping, groovy, velocity, plugin, wiki, wikiwiki I think this line should be commented out since it's the default and thus shouldn't be needed (xwiki must work without the config file as much as possible). Thanks -Vincent > + > #-# Maximum number of documents to keep in the rendered cache > # xwiki.render.cache.capacity=100

2 2

Re: [xwiki-devs] [xwiki-notifications] r29480 - platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources
by Thomas Mortagne 15 Jun '10

15 Jun '10

On Tue, Jun 15, 2010 at 15:27, cjdelisle <platform-notifications(a)xwiki.org> wrote: > Author: cjdelisle > Date: 2010-06-15 15:27:18 +0200 (Tue, 15 Jun 2010) > New Revision: 29480 > > Modified: > platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm > Log: > XWIKI-5273: In syntax 1.0 allow changing order of renderers, set default in configuration file to execute groovy before velocity. > Make groovy be rendered before velocity by default. > > Modified: platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm > =================================================================== > --- platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm 2010-06-15 13:24:58 UTC (rev 29479) > +++ platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm 2010-06-15 13:27:18 UTC (rev 29480) > @@ -307,6 +307,11 @@ > #-# Simple wiki syntax rendering > # xwiki.render.wikiwiki=0 > > +#-# Rendering order: content will be rendered by the first renderer on the list, output rendered by the second, etc. > +#-# Default: macromapping, velocity, groovy, plugin, wiki, wikiwiki > +#-# To protect against velocity content becoming groovy code, it is recommended to leave the following line active. > +xwiki.render.renderingorder=macromapping, groovy, velocity, plugin, wiki, wikiwiki The parameter name (and the comment) should probably reflect more the fact that this is only about xwiki/1.0 rendering. > + > #-# Maximum number of documents to keep in the rendered cache > # xwiki.render.cache.capacity=100 > > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications > -- Thomas Mortagne

1 0