July 2009 - xwiki-devs@xwiki.org

Re: [xwiki-devs] [Proposal][UX] Standardization of icon usage onactions
by PERINAUD Christophe 27 Jul '09

27 Jul '09

Hi I agree with Guillaume. In my company most screens are set to 1024x768 (and can't be changed) and i guess that adding a text to an icon could result in scrollbars on some screens. I would prefer a tooltip. -----Message d'origine----- De : devs-bounces(a)xwiki.org [mailto:[email protected]] De la part de Guillaume Lerouge Envoyé : lundi 27 juillet 2009 12:20 À : XWiki Developers Objet : Re: [xwiki-devs] [Proposal][UX] Standardization of icon usage onactions Hi, On Mon, Jul 27, 2009 at 11:58 AM, Thomas Mortagne <thomas.mortagne(a)xwiki.com > wrote: > On Mon, Jul 27, 2009 at 11:45, Ecaterina Valica<valicac(a)gmail.com> wrote: > > Hi Devs, > > > > There are two different standards on the action icon usage in the > LiveTable: > > > > - with icon + text > > - only with icon > > > > The main problem is the lack of consistency. > > > > Please vote on three versions: > > Var 1 : Icon + Text > > <http://incubator.myxwiki.org/xwiki/bin/view/Standards/ActionIcons#var1> > > Var 2 : Just Icon< > http://incubator.myxwiki.org/xwiki/bin/view/Standards/ActionIcons#var2> > > Var 3 : Icon + Legend< > http://incubator.myxwiki.org/xwiki/bin/view/Standards/ActionIcons#var3> > > > > +1 for Var 1 : Icon + Text (at first i taught i would take too many > place but it seems ok with several icon in > > http://incubator.myxwiki.org/xwiki/bin/view/Standards/ActionIcons#HOtherUsa… > ) Well, when using a small screen (1024*768), the document index becomes too wide. Thus I'd rather be +1 for Var 2 as it takes less space. Instead of having a caption at the bottom as on Var 3, we could put the action's legend in a tooltip displayed when hovering over the action icon. WDYT? Guillaume > > Thanks, > > Caty > > _______________________________________________ > > devs mailing list > > devs(a)xwiki.org > > http://lists.xwiki.org/mailman/listinfo/devs > > > > > > -- > Thomas Mortagne > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Guillaume Lerouge Product Manager - XWiki Skype: wikibc Twitter: glerouge http://guillaumelerouge.com/ _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs -------------------------------------------------------------------------------- This e-mail is intended only for the addressee named above. It does not bind the sender, except in the case of an existing written convention with the addressee. This e-mail may contain material that is confidential and privileged for the sole use of the intended recipient. Any review, reliance or distribution by others or forwarding without express permission is strictly prohibited and may be unlawful. If you are not the intended recipient, please contact the sender and delete all copies. While reasonable precautions have been taken to ensure that this e-mail and any attachments are free from any computer virus or similar defect, no liability will be accepted in that respect. Anyone accessing this e-mail must take their own precautions as to security and virus protection. KBL European Private Bankers S.A., 43 boulevard Royal L-2955 Luxembourg, R.C.S. Luxembourg B 6395, T (352) 47 97 1

1 0

[xwiki-devs] Fwd: [VOTE] What to do with RawBlock in plain text renderer ?
by Vincent Massol 26 Jul '09

26 Jul '09

(resending since I got a failure from xwiki's mail content filter ) ---------- Forwarded message ---------- From: Vincent Massol <vincent(a)massol.net> Date: Sun, Jul 26, 2009 at 12:08 PM Subject: Re: [xwiki-devs] [VOTE] What to do with RawBlock in plain text renderer ? To: XWiki Developers <devs(a)xwiki.org> On Jul 26, 2009, at 11:52 AM, Thomas Mortagne wrote: > Hi devs, > > We need to decide what to do with html macro content (or any other > RawBlock content) in plain text renderer. > > For me the rule of plain text renderer should be to print anything we > are able to print which mean printing any pure text content and skip > styles for which obviously we don't have syntax. RawBlock content is > pure text so we should print it. > > Note that first version of plain text renderer was printing html > content and it was lost when introducing RawBlock. > > Here is my +1 for printing RawBlock content in plain text renderer. -1 for now (I can be convinced to change it): RawBlock is very special and should only be interpreted by renderers which understand the raw syntax. The plain text renderer shouldn't understand any syntax IMO. I'd like to see a real use case before changing my -1 to a +1. Right now if a page has for example a form to create a new type of page and this page is output in plain text, I will not want to see the HTML printed as content. It doesn't make sense to me. Thanks -Vincent

2 1

[xwiki-devs] Fwd: adding a new jsr-223 scripting language to xwiki (clojure)
by Vincent Massol 26 Jul '09

26 Jul '09

(resending since I got a failure from xwiki's mail content filter ) ---------- Forwarded message ---------- From: Vincent Massol <vincent(a)massol.net> Date: Sun, Jul 26, 2009 at 10:21 AM Subject: Re: [xwiki-devs] adding a new jsr-223 scripting language to xwiki (clojure) To: XWiki Developers <devs(a)xwiki.org> Hi Niels, On Jul 26, 2009, at 10:13 AM, Niels Mayer wrote: > In > http://code.xwiki.org/xwiki/bin/view/Snippets/DisplayFormatedCodeAttachment… > >> VincentMassol | 2009/05/05 20:03 >> >>> Niels, no there's no plan but we can now support any language using macros >> >> so feel free to provide a clojure macro if you're interested. Shouldn't be >> too hard to do, especially if there's a JSR-223 implementation (in which >> case simply dropping the jar in WEB-INF/lib should be enough - you'd then >> use it using the script macro). > > > Clojure <http://groups.google.com/group/clojure> has aJSR-223 implementation > according to: > http://github.com/pmf/clojure-jsr223/tree/master > http://groovy.codehaus.org/JSR-223+access+to+other+JVM+languages > http://sayspy.blogspot.com/2009/03/interacting-between-jvm-lang-here-and.ht… > > Are there any examples, documentation, or suggestions of writing a "script > macro" to call a new jar in WEB-INF/lib ? Well all you need is drop the JSR223 jar in WEB-INF/lib and then you can use the new language using the script macro: http://code.xwiki.org/xwiki/bin/view/Macros/ScriptMacro Then if you want you can write a wrapping macro such as we've done for groovy and jruby so that it can be called with {{clojure}} instead of {{script language="clojure"}}. > Any other special magic I should know? Does anything from the above suggest > that Clojure couldn't be used as an Xwiki scripting language, replacing > cases where Groovy scripting might normally be employed? > > Niels > http://nielsmayer.com > > PS: Here's examples of easy "scripted java" programming you can do in > Clojure (note the helpful parallelism constructs): > http://travis-whitton.blogspot.com/2009/07/network-sweeping-with-clojure.ht… > http://travis-whitton.blogspot.com/2009/06/clojures-agents-scientists-monke… > > It could be very useful to employ massive parallelism via such Clojure > scripts, which could achieve a xwiki-based web portal performance akin to > Yahoo's, Google's, etc. For example, the following describes how Yahoo works > -- and would be quite easy to implement this kind of processing "for free" > in Clojure with very little code: > > http://research.yahoo.com/files/pnuts.pdf I'm definitely +1 to make it part of the XWiki platform (same as for jruby) if you develop it. Similar to jruby I don't think we should package it in the default WAR though but as an optional download to install (will be even easier with the app manager). Thanks -Vincent > > The component responsible for multi-record requests is called the >> >> scatter-gather engine, and is a component of the router. >> The scatter-gather engine receives a multi-record request, >> splits it into multiple individual requests for single records >> or single tablet scans, and initiates those requests in parallel. >> As the requests return success or failure, the scatter-gather >> engine assembles the results and then passes them to the >> client. In our implementation, the engine can begin streaming >> some results back to the client as soon as they appear. >> We chose a server-side approach instead of having the client >> initiate multiple parallel requests for several reasons. First, >> at the TCP/IP layer, it is preferable to have one connection >> per client to the PNUTS service; since there are many clients >> (and many concurrent processes per client machine) opening >> one connection to PNUTS for each record being requested >> in parallel overloads the network stack. Second, placing this >> functionality on the server side allows us to optimize, for >> example by grouping multiple requests to the same storage >> server in the same web service call. >> >> Range queries and table scans are also handled by the >> scatter gather engine. Typically there is only a single client >> process retrieving the results for a query. The scatter gather >> engine will scan only one tablet at a time and return results >> to the client; this is about as fast as a typical client can >> process results. In the case of a range scan, this mecha- >> nism simplifies the process of returning the top-K results >> (a frequently requested feature), since we only need to scan >> enough tablets to provide K results. After returning the >> first set of results, the scatter-gather engine constructs and >> returns a continuation object, which allows the client to re- >> trieve the next set of results. The continuation object con- >> tains a modified range query, which, when executed, restarts >> the range scan at the point the previous results left off. Con- >> tinuation objects allow us to have cursor state on the client >> side rather than the server. In a shared service such as >> PNUTS, it is essential to minimize the amount of server- >> side state we have to manage on behalf of clients.

1 0

[xwiki-devs] [VOTE] Release XE 1.9.2 on Monday 27th of July
by Vincent Massol 25 Jul '09

25 Jul '09

Hi, I'd like to propose to release XE 1.9.2 on 27th of July (next Monday). There are already a good number of fixes: http://jira.xwiki.org/jira/browse/XWIKI/fixforversion/11171 Other issues not done can be moved to 1.9.3 (which could be released in 2 weeks time). Here's my +1 Thanks -Vincent

8 7

[xwiki-devs] Blog 2.0 Upgrade: Final Steps
by Andreas Schaefer 24 Jul '09

24 Jul '09

Hi Soon I should have upgraded my own blog to Blog 2.0 syntax and so I am confident that it should work quite well. So I started to look into how to upgrade the Blog application. It is not a problem to upgrade the most of the application documents except for the Blog.BlogCode and Blog.CategoriesCode because they are used in the Panels which I think cannot be upgraded (at least not for 1.9.X). This means I can do either: 1) Replace everything except for BlogCode and CategoriesCode which must remain as is and us BlogCode2 and CategoriesCode2 instead. 2) Keep all the documents as attached (new documents have the suffix 2) and only overwrite WebHome with the new code because 2.0 Blog Entries will not display well in the old application. At least all the old entries will display with the new application the same way. Cheers Andreas Schaefer CEO of Madplanet.com Inc. EMail: andreas.schaefer(a)madplanet.com schaefera(a)me.com Twitter: andy_mpc AIM: schaefera(a)me.com

1 0

Re: [xwiki-devs] [xwiki-notifications] r22042 - in platform/core/trunk: xwiki-core xwiki-rendering/xwiki-rendering-macros xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-r
by Thomas Mortagne 24 Jul '09

24 Jul '09

On Thu, Jul 23, 2009 at 16:02, Asiri Rathnayake<asiri.rathnayake(a)gmail.com> wrote: > Hi, > > we might want to exclude ruby macro from default XE build because it's bit > heavy. (jruby.jar ~ 7MB) Yes I don't think it should be in XE since this is really optional and there is really few people which need it. > > Thanks. > > - Asiri > > On Thu, Jul 23, 2009 at 5:49 PM, asiri <platform-notifications(a)xwiki.org>wrote: > >> Author: asiri >> Date: 2009-07-23 14:19:58 +0200 (Thu, 23 Jul 2009) >> New Revision: 22042 >> >> Added: >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/ >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test >> >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test >> Modified: >> platform/core/trunk/xwiki-core/pom.xml >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml >> Log: >> XWIKI-2849: Create ruby macro for rendering 2.0 >> >> * Implemented. >> >> Modified: platform/core/trunk/xwiki-core/pom.xml >> =================================================================== >> --- platform/core/trunk/xwiki-core/pom.xml 2009-07-22 23:34:44 UTC >> (rev 22041) >> +++ platform/core/trunk/xwiki-core/pom.xml 2009-07-23 12:19:58 UTC >> (rev 22042) >> @@ -700,6 +700,13 @@ >> <groupId>org.xwiki.platform</groupId> >> <artifactId>xwiki-core-rendering-macro-wikibridge</artifactId> >> <version>${pom.version}</version> >> + </dependency> >> + <dependency> >> + <groupId>org.xwiki.platform</groupId> >> + <artifactId>xwiki-core-rendering-macro-ruby</artifactId> >> + <version>${pom.version}</version> >> +  >> + <scope>runtime</scope> >> </dependency> >> <dependency> >> <groupId>org.xwiki.platform</groupId> >> >> Modified: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml >> =================================================================== >> --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml >> 2009-07-22 23:34:44 UTC (rev 22041) >> +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -127,6 +127,7 @@ >> <module>xwiki-rendering-macro-chart</module> >> <module>xwiki-rendering-macro-footnotes</module> >> <module>xwiki-rendering-macro-wikibridge</module> >> + <module>xwiki-rendering-macro-ruby</module> >> </modules> >> </project> >> >> >> >> Property changes on: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby >> ___________________________________________________________________ >> Name: svn:ignore >> + target >> .settings >> .classpath >> .project >> >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml >> =================================================================== >> --- >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml >> (rev 0) >> +++ >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -0,0 +1,78 @@ >> +<?xml version="1.0" encoding="UTF-8"?> >> + >> + >> + >> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi=" >> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" >> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd >> "> >> + <modelVersion>4.0.0</modelVersion> >> + <parent> >> + <groupId>org.xwiki.platform</groupId> >> + <artifactId>xwiki-core-rendering-macros-parent</artifactId> >> + <version>2.0-SNAPSHOT</version> >> + </parent> >> + <artifactId>xwiki-core-rendering-macro-ruby</artifactId> >> + <name>XWiki Platform - Core - Rendering - Macro - Ruby</name> >> + <description>XWiki Platform - Core - Rendering - Macro - >> Ruby</description> >> + <dependencies> >> + <dependency> >> + <groupId>org.xwiki.platform</groupId> >> + <artifactId>xwiki-core-rendering-macro-script</artifactId> >> + <version>${pom.version}</version> >> + </dependency> >> + <dependency> >> + <groupId>org.jruby</groupId> >> + <artifactId>jruby</artifactId> >> + <version>1.3.0</version> >> + </dependency> >> + <dependency> >> + <groupId>com.sun.script</groupId> >> + <artifactId>jruby-engine</artifactId> >> + <version>1.3.0-xwiki</version> >> + </dependency> >> +  >> + <dependency> >> + <groupId>org.xwiki.platform</groupId> >> + <artifactId>xwiki-core-rendering-macro-script</artifactId> >> + <version>${pom.version}</version> >> + <type>test-jar</type> >> + <scope>test</scope> >> + </dependency> >> + </dependencies> >> + <build> >> + <plugins> >> + <plugin> >> + <groupId>org.apache.maven.plugins</groupId> >> + <artifactId>maven-surefire-plugin</artifactId> >> + <configuration> >> + <includes> >> + <include>**/RenderingTests.java</include> >> + </includes> >> + </configuration> >> + </plugin> >> + <plugin> >> +  >> + <groupId>org.apache.maven.plugins</groupId> >> + <artifactId>maven-checkstyle-plugin</artifactId> >> + </plugin> >> + </plugins> >> + </build> >> +</project> >> \ No newline at end of file >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java >> =================================================================== >> --- >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java >> (rev 0) >> +++ >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -0,0 +1,66 @@ >> +/* >> + * 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.ruby; >> + >> +import javax.script.ScriptContext; >> +import javax.script.ScriptEngine; >> +import javax.script.ScriptException; >> + >> +import org.xwiki.component.annotation.Component; >> +import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; >> +import org.xwiki.rendering.macro.script.AbstractJRSR223ScriptMacro; >> +import org.xwiki.rendering.macro.script.JSR223ScriptMacroParameters; >> + >> +/** >> + * A macro for executing ruby scripts. >> + * >> + * @version $Id:$ >> + * @since 2.0M2 >> + */ >> +@Component("ruby") >> +public class RubyMacro extends >> AbstractJRSR223ScriptMacro<JSR223ScriptMacroParameters> >> +{ >> + /** >> + * The description of the macro. >> + */ >> + private static final String DESCRIPTION = "Execute a ruby script."; >> + >> + /** >> + * The description of the macro content. >> + */ >> + private static final String CONTENT_DESCRIPTION = "The ruby script to >> execute"; >> + >> + /** >> + * Create and initialize the descriptor of the macro. >> + */ >> + public RubyMacro() >> + { >> + super(DESCRIPTION, new >> DefaultContentDescriptor(CONTENT_DESCRIPTION)); >> + } >> + >> + /** >> + * {@inheritDoc} >> + */ >> + @Override >> + protected Object eval(String content, ScriptEngine engine, >> ScriptContext scriptContext) throws ScriptException >> + { >> + return super.eval(content, engine, scriptContext); >> + } >> +} >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt >> =================================================================== >> --- >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt >> (rev 0) >> +++ >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -0,0 +1 @@ >> +org.xwiki.rendering.internal.macro.ruby.RubyMacro >> \ No newline at end of file >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java >> =================================================================== >> --- >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java >> (rev 0) >> +++ >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -0,0 +1,86 @@ >> +/* >> + * 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.ruby; >> + >> +import org.jmock.Expectations; >> +import org.jmock.Mockery; >> +import org.xwiki.bridge.DocumentAccessBridge; >> +import org.xwiki.component.descriptor.DefaultComponentDescriptor; >> +import org.xwiki.component.embed.EmbeddableComponentManager; >> +import org.xwiki.component.manager.ComponentManager; >> +import org.xwiki.rendering.scaffolding.RenderingTestSuite; >> +import org.xwiki.test.ComponentManagerTestSetup; >> + >> +import junit.framework.Test; >> +import junit.framework.TestCase; >> + >> +/** >> + * Rendering tests for ruby macro. >> + * >> + * @version $Id:$ >> + * @since 2.0M2 >> + */ >> +public class RenderingTests extends TestCase >> +{ >> + /** >> + * Creates a rendering test suit for testing ruby macro. >> + * >> + * @return rendering test suit for testing ruby macro. >> + * @throws Exception if an error occurs while setting up the test >> suite. >> + */ >> + public static Test suite() throws Exception >> + { >> + RenderingTestSuite suite = new RenderingTestSuite("Test Ruby >> Macro"); >> + >> + suite.addTestsFromResource("macroruby1", true); >> + suite.addTestsFromResource("macroruby2", true); >> + suite.addTestsFromResource("macroruby3", true); >> + >> + ComponentManagerTestSetup testSetup = new >> ComponentManagerTestSetup(suite); >> + setUpMocks(testSetup.getComponentManager()); >> + >> + return testSetup; >> + } >> + >> + /** >> + * Sets up mock component descriptors. >> + * >> + * @param componentManager the {@link ComponentManager} component. >> + */ >> + public static void setUpMocks(EmbeddableComponentManager >> componentManager) >> + { >> + Mockery context = new Mockery(); >> + >> + // Document Access Bridge Mock setup >> + final DocumentAccessBridge mockDocumentAccessBridge = >> context.mock(DocumentAccessBridge.class); >> + context.checking(new Expectations() >> + { >> + { >> + allowing(mockDocumentAccessBridge).hasProgrammingRights(); >> + will(returnValue(true)); >> + } >> + }); >> + >> + DefaultComponentDescriptor<DocumentAccessBridge> descriptorDAB = >> + new DefaultComponentDescriptor<DocumentAccessBridge>(); >> + descriptorDAB.setRole(DocumentAccessBridge.class); >> + componentManager.registerComponent(descriptorDAB, >> mockDocumentAccessBridge); >> + } >> +} >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test >> =================================================================== >> --- >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test >> (rev 0) >> +++ >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -0,0 +1,14 @@ >> +.#----------------------------------------------------- >> +.input|xwiki/2.0 >> +.#----------------------------------------------------- >> +{{ruby}} >> +puts "Hello World!!!" >> +{{/ruby}} >> + >> +== Hello {{ruby}}puts "World!!!"{{/ruby}}== >> +.#----------------------------------------------------- >> +.expect|xhtml/1.0 >> +.#----------------------------------------------------- >> +<p>Hello World!!!</p><h2 id="HHello"><span>Hello >> World!!!</span></h2> >> \ No newline at end of file >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test >> =================================================================== >> --- >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test >> (rev 0) >> +++ >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -0,0 +1,16 @@ >> +.#----------------------------------------------------- >> +.input|xwiki/2.0 >> +.# Verify ruby macro does not fail with null content >> +.#----------------------------------------------------- >> +{{ruby/}}{{ruby}}{{/ruby}} >> +.#----------------------------------------------------- >> +.expect|event/1.0 >> +.#----------------------------------------------------- >> +beginDocument >> +beginParagraph >> +beginMacroMarkerInline [ruby] [] >> +endMacroMarkerInline [ruby] [] >> +beginMacroMarkerInline [ruby] [] [] >> +endMacroMarkerInline [ruby] [] [] >> +endParagraph >> +endDocument >> \ No newline at end of file >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test >> =================================================================== >> --- >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test >> (rev 0) >> +++ >> platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test >> 2009-07-23 12:19:58 UTC (rev 22042) >> @@ -0,0 +1,28 @@ >> +.#----------------------------------------------------- >> +.input|xwiki/2.0 >> +.#----------------------------------------------------- >> +{{ruby}} >> +require 'java' >> +include_class 'java.util.TreeSet' >> +set = TreeSet.new >> +set.add "foo" >> +set.add "Bar" >> +set.add "baz" >> +set.each do |v| >> + puts "value: #{v}" >> +end >> +{{/ruby}} >> +.#----------------------------------------------------- >> +.expect|xhtml/1.0 >> +.#----------------------------------------------------- >> +<p>value: Bar<br/>value: baz<br/>value: foo</p> >> \ No newline at end of file >> >> _______________________________________________ >> notifications mailing list >> notifications(a)xwiki.org >> http://lists.xwiki.org/mailman/listinfo/notifications >> > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Thomas Mortagne

1 0

[xwiki-devs] Ideas: Google Language API
by dod11＠hotmail.com 23 Jul '09

23 Jul '09

Go easy. First time. Pointed here by your Ideas page. Would be great to have a link/icon from [any] Wiki page to activate the Google Language API and allow the end user to translate the page into the language of their choice. Preferred/default target language could be stored as part of profile. -David. p.s. Great app you've put together. _________________________________________________________________ View photos of singles in your area Click Here http://a.ninemsn.com.au/b.aspx?URL=http%3A%2F%2Fdating%2Eninemsn%2Ecom%2Eau…

1 0

Re: [xwiki-devs] [xwiki-notifications] r22042 - in platform/core/trunk: xwiki-core xwiki-rendering/xwiki-rendering-macros xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src xwiki
by Asiri Rathnayake 23 Jul '09

23 Jul '09

Hi, we might want to exclude ruby macro from default XE build because it's bit heavy. (jruby.jar ~ 7MB) Thanks. - Asiri On Thu, Jul 23, 2009 at 5:49 PM, asiri <platform-notifications(a)xwiki.org>wrote: > Author: asiri > Date: 2009-07-23 14:19:58 +0200 (Thu, 23 Jul 2009) > New Revision: 22042 > > Added: > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/ > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test > > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test > Modified: > platform/core/trunk/xwiki-core/pom.xml > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml > Log: > XWIKI-2849: Create ruby macro for rendering 2.0 > > * Implemented. > > Modified: platform/core/trunk/xwiki-core/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-core/pom.xml 2009-07-22 23:34:44 UTC > (rev 22041) > +++ platform/core/trunk/xwiki-core/pom.xml 2009-07-23 12:19:58 UTC > (rev 22042) > @@ -700,6 +700,13 @@ > <groupId>org.xwiki.platform</groupId> > <artifactId>xwiki-core-rendering-macro-wikibridge</artifactId> > <version>${pom.version}</version> > + </dependency> > + <dependency> > + <groupId>org.xwiki.platform</groupId> > + <artifactId>xwiki-core-rendering-macro-ruby</artifactId> > + <version>${pom.version}</version> > +  > + <scope>runtime</scope> > </dependency> > <dependency> > <groupId>org.xwiki.platform</groupId> > > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml > 2009-07-22 23:34:44 UTC (rev 22041) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -127,6 +127,7 @@ > <module>xwiki-rendering-macro-chart</module> > <module>xwiki-rendering-macro-footnotes</module> > <module>xwiki-rendering-macro-wikibridge</module> > + <module>xwiki-rendering-macro-ruby</module> > </modules> > </project> > > > > Property changes on: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby > ___________________________________________________________________ > Name: svn:ignore > + target > .settings > .classpath > .project > > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml > =================================================================== > --- > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml > (rev 0) > +++ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/pom.xml > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -0,0 +1,78 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > + > + > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi=" > http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" > http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd > "> > + <modelVersion>4.0.0</modelVersion> > + <parent> > + <groupId>org.xwiki.platform</groupId> > + <artifactId>xwiki-core-rendering-macros-parent</artifactId> > + <version>2.0-SNAPSHOT</version> > + </parent> > + <artifactId>xwiki-core-rendering-macro-ruby</artifactId> > + <name>XWiki Platform - Core - Rendering - Macro - Ruby</name> > + <description>XWiki Platform - Core - Rendering - Macro - > Ruby</description> > + <dependencies> > + <dependency> > + <groupId>org.xwiki.platform</groupId> > + <artifactId>xwiki-core-rendering-macro-script</artifactId> > + <version>${pom.version}</version> > + </dependency> > + <dependency> > + <groupId>org.jruby</groupId> > + <artifactId>jruby</artifactId> > + <version>1.3.0</version> > + </dependency> > + <dependency> > + <groupId>com.sun.script</groupId> > + <artifactId>jruby-engine</artifactId> > + <version>1.3.0-xwiki</version> > + </dependency> > +  > + <dependency> > + <groupId>org.xwiki.platform</groupId> > + <artifactId>xwiki-core-rendering-macro-script</artifactId> > + <version>${pom.version}</version> > + <type>test-jar</type> > + <scope>test</scope> > + </dependency> > + </dependencies> > + <build> > + <plugins> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-surefire-plugin</artifactId> > + <configuration> > + <includes> > + <include>**/RenderingTests.java</include> > + </includes> > + </configuration> > + </plugin> > + <plugin> > +  > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-checkstyle-plugin</artifactId> > + </plugin> > + </plugins> > + </build> > +</project> > \ No newline at end of file > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java > =================================================================== > --- > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java > (rev 0) > +++ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/java/org/xwiki/rendering/internal/macro/ruby/RubyMacro.java > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -0,0 +1,66 @@ > +/* > + * 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.ruby; > + > +import javax.script.ScriptContext; > +import javax.script.ScriptEngine; > +import javax.script.ScriptException; > + > +import org.xwiki.component.annotation.Component; > +import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > +import org.xwiki.rendering.macro.script.AbstractJRSR223ScriptMacro; > +import org.xwiki.rendering.macro.script.JSR223ScriptMacroParameters; > + > +/** > + * A macro for executing ruby scripts. > + * > + * @version $Id:$ > + * @since 2.0M2 > + */ > +@Component("ruby") > +public class RubyMacro extends > AbstractJRSR223ScriptMacro<JSR223ScriptMacroParameters> > +{ > + /** > + * The description of the macro. > + */ > + private static final String DESCRIPTION = "Execute a ruby script."; > + > + /** > + * The description of the macro content. > + */ > + private static final String CONTENT_DESCRIPTION = "The ruby script to > execute"; > + > + /** > + * Create and initialize the descriptor of the macro. > + */ > + public RubyMacro() > + { > + super(DESCRIPTION, new > DefaultContentDescriptor(CONTENT_DESCRIPTION)); > + } > + > + /** > + * {@inheritDoc} > + */ > + @Override > + protected Object eval(String content, ScriptEngine engine, > ScriptContext scriptContext) throws ScriptException > + { > + return super.eval(content, engine, scriptContext); > + } > +} > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt > =================================================================== > --- > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt > (rev 0) > +++ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/main/resources/META-INF/components.txt > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -0,0 +1 @@ > +org.xwiki.rendering.internal.macro.ruby.RubyMacro > \ No newline at end of file > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java > =================================================================== > --- > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java > (rev 0) > +++ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/java/org/xwiki/rendering/macro/ruby/RenderingTests.java > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -0,0 +1,86 @@ > +/* > + * 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.ruby; > + > +import org.jmock.Expectations; > +import org.jmock.Mockery; > +import org.xwiki.bridge.DocumentAccessBridge; > +import org.xwiki.component.descriptor.DefaultComponentDescriptor; > +import org.xwiki.component.embed.EmbeddableComponentManager; > +import org.xwiki.component.manager.ComponentManager; > +import org.xwiki.rendering.scaffolding.RenderingTestSuite; > +import org.xwiki.test.ComponentManagerTestSetup; > + > +import junit.framework.Test; > +import junit.framework.TestCase; > + > +/** > + * Rendering tests for ruby macro. > + * > + * @version $Id:$ > + * @since 2.0M2 > + */ > +public class RenderingTests extends TestCase > +{ > + /** > + * Creates a rendering test suit for testing ruby macro. > + * > + * @return rendering test suit for testing ruby macro. > + * @throws Exception if an error occurs while setting up the test > suite. > + */ > + public static Test suite() throws Exception > + { > + RenderingTestSuite suite = new RenderingTestSuite("Test Ruby > Macro"); > + > + suite.addTestsFromResource("macroruby1", true); > + suite.addTestsFromResource("macroruby2", true); > + suite.addTestsFromResource("macroruby3", true); > + > + ComponentManagerTestSetup testSetup = new > ComponentManagerTestSetup(suite); > + setUpMocks(testSetup.getComponentManager()); > + > + return testSetup; > + } > + > + /** > + * Sets up mock component descriptors. > + * > + * @param componentManager the {@link ComponentManager} component. > + */ > + public static void setUpMocks(EmbeddableComponentManager > componentManager) > + { > + Mockery context = new Mockery(); > + > + // Document Access Bridge Mock setup > + final DocumentAccessBridge mockDocumentAccessBridge = > context.mock(DocumentAccessBridge.class); > + context.checking(new Expectations() > + { > + { > + allowing(mockDocumentAccessBridge).hasProgrammingRights(); > + will(returnValue(true)); > + } > + }); > + > + DefaultComponentDescriptor<DocumentAccessBridge> descriptorDAB = > + new DefaultComponentDescriptor<DocumentAccessBridge>(); > + descriptorDAB.setRole(DocumentAccessBridge.class); > + componentManager.registerComponent(descriptorDAB, > mockDocumentAccessBridge); > + } > +} > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test > =================================================================== > --- > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test > (rev 0) > +++ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby1.test > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -0,0 +1,14 @@ > +.#----------------------------------------------------- > +.input|xwiki/2.0 > +.#----------------------------------------------------- > +{{ruby}} > +puts "Hello World!!!" > +{{/ruby}} > + > +== Hello {{ruby}}puts "World!!!"{{/ruby}}== > +.#----------------------------------------------------- > +.expect|xhtml/1.0 > +.#----------------------------------------------------- > +<p>Hello World!!!</p><h2 id="HHello"><span>Hello > World!!!</span></h2> > \ No newline at end of file > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test > =================================================================== > --- > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test > (rev 0) > +++ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby2.test > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -0,0 +1,16 @@ > +.#----------------------------------------------------- > +.input|xwiki/2.0 > +.# Verify ruby macro does not fail with null content > +.#----------------------------------------------------- > +{{ruby/}}{{ruby}}{{/ruby}} > +.#----------------------------------------------------- > +.expect|event/1.0 > +.#----------------------------------------------------- > +beginDocument > +beginParagraph > +beginMacroMarkerInline [ruby] [] > +endMacroMarkerInline [ruby] [] > +beginMacroMarkerInline [ruby] [] [] > +endMacroMarkerInline [ruby] [] [] > +endParagraph > +endDocument > \ No newline at end of file > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test > =================================================================== > --- > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test > (rev 0) > +++ > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-ruby/src/test/resources/macroruby3.test > 2009-07-23 12:19:58 UTC (rev 22042) > @@ -0,0 +1,28 @@ > +.#----------------------------------------------------- > +.input|xwiki/2.0 > +.#----------------------------------------------------- > +{{ruby}} > +require 'java' > +include_class 'java.util.TreeSet' > +set = TreeSet.new > +set.add "foo" > +set.add "Bar" > +set.add "baz" > +set.each do |v| > + puts "value: #{v}" > +end > +{{/ruby}} > +.#----------------------------------------------------- > +.expect|xhtml/1.0 > +.#----------------------------------------------------- > +<p>value: Bar<br/>value: baz<br/>value: foo</p> > \ No newline at end of file > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

1 0

Re: [xwiki-devs] [xwiki-notifications] r22008 - in platform/core/trunk: xwiki-core/src/main/java/com/xpn/xwiki/internal xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/macro/wikibridge xwiki-rende
by Asiri Rathnayake 20 Jul '09

20 Jul '09

Hi, + * Constant for representing XWiki.WikiMacroClass xwiki class. > + */ > + String WIKI_MACRO_CLASS = "XWiki.WikiMacroClass"; > + > + /** > + * Constant for representing macro name property. > + */ > + String MACRO_NAME_PROPERTY = "name"; > + > + /** > + * Constant for representing macro name property. > + */ > + String MACRO_DESCRIPTION_PROPERTY = "description"; > + > + /** > + * Constant for representing macro name property. > + */ > + String MACRO_CONTENT_PROPERTY = "content"; > + > + /** > + * Constant for representing XWiki.WikiMacroParameterClass xwiki > class. > + */ > + String WIKI_MACRO_PARAMETER_CLASS = "XWiki.WikiMacroParameterClass"; > + > + /** > + * Constant for representing parameter name property. > + * > + * Same as MACRO_NAME_PROPERTY (Check style Fix) > + */ > + String PARAMETER_NAME_PROPERTY = MACRO_NAME_PROPERTY; > + > + /** > + * Constant for representing parameter description property. > + * > + * Same as MACRO_DESCRIPTION_PROPERTY (Check style Fix) > + */ > + String PARAMETER_DESCRIPTION_PROPERTY = MACRO_DESCRIPTION_PROPERTY; > + > + /** > + * Constant for representing parameter mandatory property. > + */ > + String PARAMETER_MANDATORY_PROPERTY = "mandatory"; I made a mistake while doing a copy / past, these fields should be marked as "private static final" - Asiri

1 0

Re: [xwiki-devs] Blog 2.0 Upgrade and WYSIWYG
by Andreas Schaefer 17 Jul '09

17 Jul '09

Hi Vincent Great. I was wondering if anyone knows what has changed to fix this so that I could retrofit 1.9.1 because I wanted to upgrade my own Blog to 2.0 to test it. Thanks - Andy On Thursday, July 16, 2009, at 12:12PM, "Vincent Massol" <vincent(a)massol.net> wrote: > >On Jul 16, 2009, at 8:43 PM, Andreas Schaefer wrote: > >> Well, I tried this and it works to some degree but for example Links >> were lost when switching to the Source tab. > >This is a bug that was fixed in 2.0M2 AFAIK. > >Thanks >-Vincent > >> >> Cheers - Andy >> >> On Wednesday, July 15, 2009, at 11:43PM, "Marius Dumitru Florea" <mariusdumitru.florea(a)xwiki.com >> > wrote: >> >>> templates/textarea_wysiwyg.vm and replace >>> >>> #wysiwyg_editProperties($tdoc $editors false) >>> >>> with >>> >>> #wysiwyg_editProperties($tdoc $editors true) >_______________________________________________ >devs mailing list >devs(a)xwiki.org >http://lists.xwiki.org/mailman/listinfo/devs > >

2 1