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

Re: [xwiki-devs] [xwiki-notifications] r23517 - in platform/core/branches/xwiki-core-2.0/xwiki-rendering: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xwiki xwiki-rendering-tests/src/test/java/org/xwiki/rendering xwiki-rendering-tests/src/test/resources/escape
by Vincent Massol 14 Sep '09

14 Sep '09

On Sep 14, 2009, at 6:22 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-09-14 18:22:10 +0200 (Mon, 14 Sep 2009) > New Revision: 23517 > > Added: > platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-tests/src/test/resources/escape/escape20.test > Modified: > platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/ > xwiki/XWikiSyntaxEscapeHandler.java > platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-tests/src/test/java/org/xwiki/rendering/ > SimpleRenderingTests.java > Log: > XWIKI-4341: Quote syntax is not escaped when HTML is parsed > > Modified: platform/core/branches/xwiki-core-2.0/xwiki-rendering/ > xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/ > renderer/xwiki/XWikiSyntaxEscapeHandler.java > =================================================================== > --- platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/ > xwiki/XWikiSyntaxEscapeHandler.java 2009-09-14 16:13:16 UTC (rev > 23516) > +++ platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/ > xwiki/XWikiSyntaxEscapeHandler.java 2009-09-14 16:22:10 UTC (rev > 23517) > @@ -43,6 +43,8 @@ > private static final Pattern LIST_PATTERN = > Pattern.compile("\\p{Blank}*((\\*+[:;]*)|([1*]+\\.[:;]*)| > ([:;]+))\\p{Blank}+"); > > + private static final Pattern QUOTE_PATTERN = Pattern.compile("(\ > \>+)"); > + > private static final Pattern HEADER_PATTERN = Pattern.compile("\ > \p{Blank}*(=+)"); > > private static final Pattern TABLE_PATTERN = Pattern.compile("\ > \p{Blank}*(\\||!!)"); > @@ -77,6 +79,9 @@ > > // Look for table character patterns at beginning of > line and escape the first character only (it's enough) > escapeFirstMatchedCharacter(TABLE_PATTERN, > accumulatedBuffer); > + > + // Look for quote pattern at beginning of line and > escape the first character only (it's enough) > + escapeFirstMatchedCharacter(QUOTE_PATTERN, > accumulatedBuffer); > } > > // Escape table characters > @@ -136,7 +141,7 @@ > > // Escape begin link > replaceAll(accumulatedBuffer, "[[", ESCAPE_CHAR + "[" + > ESCAPE_CHAR + "["); > - > + > // Escape link label > int linkLevel = getLinkLevel(listenerChain); > > > Modified: platform/core/branches/xwiki-core-2.0/xwiki-rendering/ > xwiki-rendering-tests/src/test/java/org/xwiki/rendering/ > SimpleRenderingTests.java > =================================================================== > --- platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-tests/src/test/java/org/xwiki/rendering/ > SimpleRenderingTests.java 2009-09-14 16:13:16 UTC (rev 23516) > +++ platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-tests/src/test/java/org/xwiki/rendering/ > SimpleRenderingTests.java 2009-09-14 16:22:10 UTC (rev 23517) > @@ -184,6 +184,7 @@ > suite.addTestsFromResource("escape/escape17", false); > suite.addTestsFromResource("escape/escape18", false); > suite.addTestsFromResource("escape/escape19", false); > + suite.addTestsFromResource("escape/escape20", false); > > // Other > suite.addTestsFromResource("horizontalline/horizontalline1", > false); > > Added: platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-tests/src/test/resources/escape/escape20.test > =================================================================== > --- platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-tests/src/test/resources/escape/ > escape20.test (rev 0) > +++ platform/core/branches/xwiki-core-2.0/xwiki-rendering/xwiki- > rendering-tests/src/test/resources/escape/escape20.test 2009-09-14 > 16:22:10 UTC (rev 23517) > @@ -0,0 +1,19 @@ > + > .#--------------------------------------------------------------------------------------------------------- > +.input|xwiki/2.0 > +.# Verify that ) is escaped if last character of a group The comment talks about ")" but the test below is about ">". copy paste? Thanks -Vincent > + > .#--------------------------------------------------------------------------------------------------------- > +~> text > +.#----------------------------------------------------- > +.expect|event/1.0 > +.#----------------------------------------------------- > +beginDocument > +beginParagraph > +onSpecialSymbol [>] > +onSpace > +onWord [text] > +endParagraph > +endDocument > +.#----------------------------------------------------- > +.expect|xwiki/2.0 > +.#----------------------------------------------------- > +~> text > \ No newline at end of file

1 0

[xwiki-devs] [UX] Edit Buttons Order
by Ecaterina Valica 14 Sep '09

14 Sep '09

Hi, Because we want to make a standard from vertical-aligned form, this means the buttons should be left-ordered with the most important action first. This should be changed also in Toucan and Albatross skin, not only just in Colibri. Right now the Edit Actions are "Cancel", "Preview", "Save&Continue", "Save&View". What do you think is the right order for them when they are left-aligned? (A) Save&View, Save&Continue, Preview, Cancel (as it is - just in reverse) (B) Save&View, Preview, Save&Continue, Cancel (C) Preview, Save&Continue, Save&View, Cancel (D) other variation Remarks: - "Cancel" should be *last* because it's a terminal (takes you out of the editor), no-saving action. This is the least important. - "Save & View" is also a terminal action (takes you out of the editor) - having it* first* you have the 2 terminal actions at extremities. - "Preview" is the least damaging action in case of accidental submit (Silvia + Marta) - should be *first*? - Some people use ("Preview" + "Save&Continue") {many times} + "Save&View" {final} - Other people just use "Save&Continue" + "Save & View" {final}, never "Preview", etc - What is the necessity for the "Preview" button in a WYSIYWG editor? On the other hand "Preview" is very important if you edit in "Wiki" mode. - Should "Preview" separate the two other SAVING actions? (Marta) - Should "Save&Continue" separate the two other VIEW actions? Thanks, Caty

8 18

[xwiki-devs] about the playground
by [Ricardo Rodriguez] Your EPEC Network ICT Team 12 Sep '09

12 Sep '09

Hi! I've being lately using the XWiki playground to test access to some sample pages with wget and simple authentication. It worked fine. No, when I login I've no access the the site contents. Here what I am seeing.... http://xen.net/images/xwikiPlayground.png I know that the functioning of the playground is not guarantee but do you expect to recover a "normal" operation soon? Thanks! All the best, Ricardo -- Ricardo Rodríguez Your EPEC Network ICT Team

2 2

[xwiki-devs] XWiki.XWikiPreferences_* properties not used anywhere?
by Vincent Massol 12 Sep '09

12 Sep '09

Hi, It seems that the XWiki.XWikiPreferences_* properties are not used anywhere. For example: # XWiki.XWikiPreferences (core) XWiki.XWikiPreferences_skin=Skin XWiki.XWikiPreferences_colorTheme=Color theme XWiki.XWikiPreferences_webbgcolor=Space Background Color XWiki.XWikiPreferences_authenticate_view=Authenticated View XWiki.XWikiPreferences_webcopyright=Space Copyright XWiki.XWikiPreferences_plugins=Plugins XWiki.XWikiPreferences_authenticate_edit=Authenticate On Edit XWiki.XWikiPreferences_menu=Menu XWiki.XWikiPreferences_meta=HTTP Meta Info XWiki.XWikiPreferences_title=Title XWiki.XWikiPreferences_version=Version XWiki.XWikiPreferences_smtp_server=Server XWiki.XWikiPreferences_smtp_port=Port XWiki.XWikiPreferences_smtp_server_username=Server username (optional) XWiki.XWikiPreferences_smtp_server_password=Server password (optional) XWiki.XWikiPreferences_javamail_extra_props=Additional JavaMail properties XWiki.XWikiPreferences_admin_email=Admin email XWiki.XWikiPreferences_validation_email_content=Validation email Content XWiki.XWikiPreferences_confirmation_email_content=Confirmation email Content XWiki.XWikiPreferences_stylesheet=Stylesheet XWiki.XWikiPreferences_stylesheets=Stylesheets XWiki.XWikiPreferences_multilingual=Multilingual XWiki.XWikiPreferences_default_language=Default Language XWiki.XWikiPreferences_editor=Default Editor XWiki.XWikiPreferences_core.defaultDocumentSyntax=Default document syntax XWiki.XWikiPreferences_editbox_width=Editbox Width XWiki.XWikiPreferences_use_email_verification=Use email Verification XWiki.XWikiPreferences_editbox_height=Editbox Height XWiki.XWikiPreferences_ad_clientid=Advertisement Client ID XWiki.XWikiPreferences_backlinks=Backlinks XWiki.XWikiPreferences_macros_languages=Macros Languages XWiki.XWikiPreferences_macros_velocity=Macros for Velocity XWiki.XWikiPreferences_macros_groovy=Macros for Groovy XWiki.XWikiPreferences_macros_wiki2=Macros for new wiki Parser XWiki.XWikiPreferences_macros_mapping=Macros Mapping XWiki.XWikiPreferences_auth_active_check=Authentication Active Check XWiki.XWikiPreferences_macros_wiki=Macros for the wiki Parser XWiki.XWikiPreferences_notification_pages=Notification Pages XWiki.XWikiPreferences_invitation_email_content=Invitation email content XWiki.XWikiPreferences_registration_anonymous=Anonymous XWiki.XWikiPreferences_registration_registered=Registered XWiki.XWikiPreferences_edit_anonymous=Anonymous XWiki.XWikiPreferences_edit_registered=Registered XWiki.XWikiPreferences_comment_anonymous=Anonymous XWiki.XWikiPreferences_comment_registered=Registered XWiki.XWikiPreferences_renderXWikiVelocityRenderer=Render velocity code XWiki.XWikiPreferences_renderXWikiGroovyRenderer=Render Groovy code XWiki.XWikiPreferences_renderXWikiRadeoxRenderer=Render Wiki syntax XWiki.XWikiPreferences_leftPanels=Panels displayed on the left XWiki.XWikiPreferences_rightPanels=Panels displayed on the right XWiki.XWikiPreferences_showLeftPanels=Display the left panel column XWiki.XWikiPreferences_showRightPanels=Display the right panel column XWiki.XWikiPreferences_pageWidth=Preferred page width XWiki.XWikiPreferences_languages=Supported languages XWiki.XWikiPreferences_convertmail=convert email type XWiki.XWikiPreferences_tags=Activate the tagging XWiki.XWikiPreferences_parent=Parent space XWiki.XWikiPreferences_documentBundles=Internationalization Document Bundles XWiki.XWikiPreferences_upload_maxsize=Maximum Upload Size Is that so? I've searched for XWiki.XWikiPreferences_editor=Default Editor and couldn't find it anywhere and XWiki.XWikiPreferences_core.defaultDocumentSyntax isn't used in the General admin page (this is why this text is not translated in French for ex). Any idea? Thanks -Vincent

2 2

[xwiki-devs] [ANN] XWiki Enterprise 2.0 RC 1 released
by Thomas Mortagne 12 Sep '09

12 Sep '09

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.0 RC 1. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This is the first release candidate for the XWiki enterprise 2.0 version. It will be followed by a second RC. 133 Jira issues has been closed for this release. Changes from 2.0 Milestone 4: * Many improvements and bug fixes in the new Colibri skin * Many general UI improvements * Many WYSIWYG improvements * Many Rendering 2.0 improvements ** Script macro improvements ** Introduce Python macro * Many Watchlist improvements * Activity stream improvements * Blog categories UI improvement * Update translations: fr, de, ro, sv As usual we need the community to heavily test this release before the final release to catch all the remaining issues. You can look at http://platform.xwiki.org/xwiki/bin/view/AdminGuide/DistributedEventCluster… to test the new event based clustering support. For more information see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise20RC1 Thanks -The XWiki dev team

3 2

[xwiki-devs] Could you recommend some good books or material which could help me overcome the learning curve of developing Xwiki?
by Leon Wang 11 Sep '09

11 Sep '09

Hi everyone, Could you recommend some books or material which could help me overcome the learning curve of developing Xwiki? I have read the book Maven Definitive Guide. Thank you all! Everyone have a wonderful weekend! Leon

2 1

[xwiki-devs] 2.0 RC1 not working with jar installer or exe installer?
by Vincent Massol 11 Sep '09

11 Sep '09

Hi, Someone just reported http://jira.xwiki.org/jira/browse/XE-492 Could it be caused by the jar installer or the exe one? I thought we had fixed this. It may be something else but it looks very close to the issue reported before. WDYT? Thanks -Vincent

1 0

[xwiki-devs] [NOTICE] Publishing gwt-incubator-july-14-2009.jar to our maven repo
by Marius Dumitru Florea 11 Sep '09

11 Sep '09

Hi devs, The WYSIWYG editor uses the GlassPanel widget from GWT incubator. The version currently used doesn't work with GWT 1.7 ( http://tinyurl.com/nwr4bm ) so we have to upgrade. Unfortunately the latest version is not yet published to the maven central repo ( http://tinyurl.com/ksuh7h ) so we have to publish it in our repo. Let me know if you have something against it. Thanks, Marius

2 1

Re: [xwiki-devs] [xwiki-notifications] r23469 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal
by Vincent Massol 11 Sep '09

11 Sep '09

Hi Asiri, I see you're setting the content author to "System". This hasn't been agreed yet. Could you please send a vote email on the list since it's an important decision? Thanks -Vincent On Sep 11, 2009, at 12:53 PM, asiri (SVN) wrote: > Author: asiri > Date: 2009-09-11 12:53:31 +0200 (Fri, 11 Sep 2009) > New Revision: 23469 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > internal/DefaultWikiMacroInitializer.java > Log: > XWIKI-4320: XWiki.WikiMacroClass and XWiki.WikiMacroParameterClass > are orphaned > > * Fixed. > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > internal/DefaultWikiMacroInitializer.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > internal/DefaultWikiMacroInitializer.java 2009-09-11 10:44:24 UTC > (rev 23468) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > internal/DefaultWikiMacroInitializer.java 2009-09-11 10:53:31 UTC > (rev 23469) > @@ -28,10 +28,10 @@ > import org.xwiki.component.annotation.Requirement; > import org.xwiki.component.logging.AbstractLogEnabled; > import org.xwiki.context.Execution; > -import org.xwiki.rendering.macro.wikibridge.WikiMacroInitializer; > import org.xwiki.rendering.macro.wikibridge.WikiMacro; > +import org.xwiki.rendering.macro.wikibridge.WikiMacroException; > import org.xwiki.rendering.macro.wikibridge.WikiMacroFactory; > -import org.xwiki.rendering.macro.wikibridge.WikiMacroException; > +import org.xwiki.rendering.macro.wikibridge.WikiMacroInitializer; > import org.xwiki.rendering.macro.wikibridge.WikiMacroManager; > > import com.xpn.xwiki.XWikiContext; > @@ -153,29 +153,50 @@ > needsUpdate |= > bclass.addTextAreaField(MACRO_DESCRIPTION_PROPERTY, "Macro > description", 40, 5); > needsUpdate |= > bclass.addTextField(MACRO_DEFAULT_CATEGORY_PROPERTY, "Default > category", 30); > needsUpdate |= bclass.addBooleanField(MACRO_INLINE_PROPERTY, > "Supports inline mode", "select"); > - needsUpdate |= > bclass.addStaticListField(MACRO_CONTENT_TYPE_PROPERTY, "Macro > content type", 1, false, > - "Mandatory|Optional|No content", "select", "|"); > - needsUpdate |= > bclass.addTextAreaField(MACRO_CONTENT_DESCRIPTION_PROPERTY, > - "Content description (Not applicable for \"No content\" > type)", 40, 5); > + needsUpdate |= > + bclass.addStaticListField(MACRO_CONTENT_TYPE_PROPERTY, > "Macro content type", 1, false, > + "Mandatory|Optional|No content", "select", "|"); > + needsUpdate |= > + > bclass.addTextAreaField(MACRO_CONTENT_DESCRIPTION_PROPERTY, > + "Content description (Not applicable for \"No > content\" type)", 40, 5); > needsUpdate |= bclass.addTextAreaField(MACRO_CODE_PROPERTY, > "Macro code", 40, 5); > - > + > if (needsUpdate) { > - xcontext.getWiki().saveDocument(doc, xcontext); > + update(doc); > } > - > + > // Install or Upgrade XWiki.WikiMacroParameterClass > doc = > xcontext.getWiki().getDocument(WIKI_MACRO_PARAMETER_CLASS, xcontext); > bclass = doc.getxWikiClass(); > bclass.setName(WIKI_MACRO_PARAMETER_CLASS); > - > + > needsUpdate = false; > - > + > needsUpdate |= bclass.addTextField(PARAMETER_NAME_PROPERTY, > "Parameter name", 30); > needsUpdate |= > bclass.addTextAreaField(PARAMETER_DESCRIPTION_PROPERTY, "Parameter > description", 40, 5); > needsUpdate |= > bclass.addBooleanField(PARAMETER_MANDATORY_PROPERTY, "Parameter > mandatory", "select"); > - > + > if (needsUpdate) { > - xcontext.getWiki().saveDocument(doc, xcontext); > + update(doc); > } > } > + > + /** > + * Utility method for updating a wiki macro class definition > document. > + * > + * @param doc xwiki document containing the wiki macro class. > + * @throws XWikiException if an error occurs while saving the > document. > + */ > + private void update(XWikiDocument doc) throws XWikiException > + { > + XWikiContext xcontext = getContext(); > + > + if (doc.isNew()) { > + doc.setCreator("System"); > + doc.setParent("XWiki.WebHome"); > + } > + > + doc.setAuthor("System"); > + xcontext.getWiki().saveDocument(doc, xcontext); > + } > } > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

1 0

[xwiki-devs] A better UI for annotation module
by Lucien Pereira 11 Sep '09

11 Sep '09

Hi all, Annotation module success depends strongly of being able to provide a great user exprerience. So I think current annotation module UI should be improved, for now it has only been tested in firefox. Since I really do not have skills concerning interface ergonomy, I would propose that a designer handle it. annotation feature installation and usage instructions can be found here http://dev.xwiki.org/xwiki/bin/view/Drafts/AnnotationModule WDYT ? Lucien

6 20