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

Re: [xwiki-devs] [xwiki-notifications] r30796 - platform/web/trunk/standard/src/main/webapp/WEB-INF
by Vincent Massol 02 Sep '10

02 Sep '10

On Aug 30, 2010, at 5:15 PM, abusenius (SVN) wrote: > Author: abusenius > Date: 2010-08-30 17:15:09 +0200 (Mon, 30 Aug 2010) > New Revision: 30796 > > Modified: > platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml > Log: > Updated SetCharacterEncodingFilter class in web.xml after moving > > Modified: platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml 2010-08-30 14:31:45 UTC (rev 30795) > +++ platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml 2010-08-30 15:15:09 UTC (rev 30796) > @@ -22,7 +22,7 @@ > without affecting the whole container (and the other applications hosted). --> > <filter> > <filter-name>Set Character Encoding</filter-name> > - <filter-class>com.xpn.xwiki.web.SetCharacterEncodingFilter</filter-class> > + <filter-class>org.xwiki.container.servlet.filters.internal.SetCharacterEncodingFilter</filter-class> This is going to cause problems to users when they upgrade... We need to make it as easy as possible: - deprecate the old class but keep it - add what needs to be done in the release notes. WDYT? Thanks -Vincent >  > <init-param>

2 1

Re: [xwiki-devs] [xwiki-notifications] r30768 - enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui
by Vincent Massol 02 Sep '10

02 Sep '10

Cool to have a test for this, thanks Alex. However I think that in the near future we need to find a way to write these type of tests as unit tests instead of functional tests since otherwise we're going to have too many functional tests, which will lead to the following problems: - take a lot of time to execute (and hence are not executed often + need more machines, etc) - are hard to debug when they fail (since they're not unit tests) - do not make us improve the design of the code WDYT? Thanks -Vincent PS: I haven't looked at this example in particular and my comment is general. Maybe this is testing old code which would need some heavy refactoring before we can write a unit test for it. On Aug 27, 2010, at 11:33 AM, abusenius (SVN) wrote: > Author: abusenius > Date: 2010-08-27 11:33:57 +0200 (Fri, 27 Aug 2010) > New Revision: 30768 > > Modified: > enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/LoginTest.java > Log: > XWIKI-5434: Added a functional test > > Modified: enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/LoginTest.java > =================================================================== > --- enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/LoginTest.java 2010-08-27 09:30:38 UTC (rev 30767) > +++ enterprise/trunk/distribution-test/ui-tests/src/test/it/org/xwiki/it/ui/LoginTest.java 2010-08-27 09:33:57 UTC (rev 30768) > @@ -26,6 +26,7 @@ > import org.xwiki.it.ui.administration.elements.GlobalRightsPage; > import org.xwiki.it.ui.framework.AbstractTest; > import org.xwiki.it.ui.framework.elements.LoginPage; > +import org.xwiki.it.ui.framework.elements.editor.WikiEditPage; > import org.xwiki.it.ui.xe.elements.HomePage; > > /** > @@ -114,4 +115,31 @@ > rights.unforceAuthenticatedView(); > } > } > + > + @Test > + public void testRedirectPreservesPOSTParameters() throws InterruptedException > + { > + String test = "Test string " + System.currentTimeMillis(); > + final String space = "Main"; > + final String page = "POSTTest"; > + LoginPage loginPage = this.homePage.clickLogin(); > + loginPage.loginAsAdmin(); > + // start editing a page > + WikiEditPage editPage = new WikiEditPage(); > + editPage.switchToEdit(space, page); > + editPage.setTitle(test); > + editPage.setContent(test); > + // emulate expired session: delete the cookies > + getDriver().manage().deleteAllCookies(); > + // try to save > + editPage.clickSaveAndView(); > + // we should have been redirected to login > + Assert.assertTrue(getDriver().getCurrentUrl().startsWith(getUtil().getURL("XWiki", "XWikiLogin", "login"))); > + loginPage.loginAsAdmin(); > + // we should have been redirected back to view, and the page should have been saved > + Assert.assertTrue(getDriver().getCurrentUrl().startsWith(getUtil().getURL(space, page))); > + editPage.switchToEdit(space, page); > + Assert.assertEquals(test, editPage.getTitle()); > + Assert.assertEquals(test, editPage.getContent()); > + } > } > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

3 2

Re: [xwiki-devs] [xwiki-notifications] r30697 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/util
by Vincent Massol 02 Sep '10

02 Sep '10

IMO we'll need to find a better place than Util for this since Util is meant to be deprecated and we should slim it down instead. Thanks -Vincent On Aug 18, 2010, at 11:44 PM, abusenius (SVN) wrote: > Author: abusenius > Date: 2010-08-18 23:44:07 +0200 (Wed, 18 Aug 2010) > New Revision: 30697 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/util/Util.java > Log: > Added Util.normalizeLanguage(String) > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/util/Util.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/util/Util.java 2010-08-18 19:11:05 UTC (rev 30696) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/util/Util.java 2010-08-18 21:44:07 UTC (rev 30697) > @@ -37,7 +37,9 @@ > import java.util.HashSet; > import java.util.Hashtable; > import java.util.List; > +import java.util.Locale; > import java.util.Map; > +import java.util.MissingResourceException; > import java.util.Set; > import java.util.Vector; > > @@ -880,4 +882,54 @@ > > return Thread.currentThread().getContextClassLoader().getResourceAsStream(resource); > } > + > + /** > + * Normalize the given language code. Converts the given language code to lower case and checks its validity (i.e. > + * whether it is an ISO 639 language code or the string "default"). > + * <p><pre> > + * Util.normalizeLanguage(null) = null > + * Util.normalizeLanguage("") = "" > + * Util.normalizeLanguage(" ") = "" > + * Util.normalizeLanguage("default") = "default" > + * Util.normalizeLanguage("DeFault") = "default" > + * Util.normalizeLanguage("invalid") = "default" > + * Util.normalizeLanguage("en") = "en" > + * Util.normalizeLanguage("DE_at") = "de_AT" > + * </pre></p> > + * > + * @param languageCode the language code to normalize > + * @return normalized language code or the string "default" if the code is invalid > + */ > + public static String normalizeLanguage(String languageCode) > + { > + if (languageCode == null) { > + return null; > + } > + if (StringUtils.isBlank(languageCode)) { > + return ""; > + } > + // handle language_COUNTRY case > + final String separator = "_"; > + String[] parts = languageCode.toLowerCase().split(separator); > + String result = parts[0]; > + if (parts.length > 1) { > + parts[1] = parts[1].toUpperCase(); > + // NOTE cannot use Locale#toString(), because it would change some language codes > + result = parts[0] + separator + parts[1]; > + } > + // handle the "default" case > + final String defaultLanguage = "default"; > + if (defaultLanguage.equals(result)) { > + return defaultLanguage; > + } > + try { > + Locale l = new Locale(parts[0], parts.length > 1 ? parts[1] : ""); > + // Will throw an exception if the language code is not valid > + l.getISO3Language(); > + return result; > + } catch (MissingResourceException ex) { > + LOG.warn("Invalid language: " + languageCode); > + } > + return defaultLanguage; > + } > }

3 2

[xwiki-devs] [Contrib] Log Application
by Flavius Olaru 02 Sep '10

02 Sep '10

Hi devs, I would like to contribute on svn an application i have developed that logs messages from velocity and groovy code blocks. It uses XWiki objects and does not require changes in XE installation to work. Only requires PR rights for groovy scripts to work. Currently the application can be found at http://flavius.myxwiki.org/xwiki/bin/view/Log/. I only require commit rights to contrib sandbox to get started. SVN username: flavius Thanks, -- XWiki SAS Web Developer Flavius Olaru

2 1

Re: [xwiki-devs] [Proposal][UX] Recent Changes Improvements
by Jerome Velociter 02 Sep '10

02 Sep '10

I still strongly believe that user photos should appear in the stream before any click. Especially for user updates instead of the "user.gif" icon. Thanks Jerome. ----- "Ecaterina Valica" <valicac(a)gmail.com> wrote: > Added: > - Application + User Changes > http://incubator.myxwiki.org/xwiki/bin/download/Improvements/ActivityStream… > > - Feed + Filters > http://incubator.myxwiki.org/xwiki/bin/download/Improvements/ActivityStream… > > Prototype: > http://incubator.myxwiki.org/xwiki/bin/view/Improvements/ActivityStreamP3D > > Thanks, > Caty > > > On Tue, Aug 31, 2010 at 11:35, Fabio Mancinelli > <fabio.mancinelli(a)xwiki.com>wrote: > > > On 08/30/2010 07:16 PM, Jerome Velociter wrote: > > > > >> The "user centric" view, imho, is also useful because a "user" > could > > >> also be an application that sends events (e.g., meeting or > deadlines > > >> reminders, etc.) that can be shown in a more natural way in a > user > > >> centric view. Basically even applications might share their > thoughts > > >> through the activity stream ;) > > > > > > I completely agree with the last sentence. BUT I think it's not > > incompatible with a document/user mixed-approched (I don't think > either full > > document-centric or full user-centric can embrace the versatility of > XWiki) > > > > > > I see two types of entries : > > > > > > * Document updates. Basically what is currently in latest > proposal > > (though I would add little user pictures here as well, even before > the > > click). This is KM, collaboration, etc. > > > * Users/applications updates. Those are less structured, more > a-la > > facebook. > > > > > > I see something like > > > http://incubator.myxwiki.org/xwiki/bin/view/Improvements/ActivityStreamMixe… > picture, would have to be refined) > > > (Note I also have right-padded a bit more the > > comment/annotation/pencil/etc icons that are on top of user photos, > I think > > they were a bit too masked by them) > > > > > I would have called that version "user centric" as well since > documents > > updates might be seen as posts done by the "XWiki system" user :) > > > > Anyway, I think that the mixed approach is fine. > > > > -Fabio > > _______________________________________________ > > devs mailing list > > devs(a)xwiki.org > > http://lists.xwiki.org/mailman/listinfo/devs > > > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs

4 6

[xwiki-devs] Supress contents from PDF export
by Luiz Marcelo Serique 02 Sep '10

02 Sep '10

Hu guys, there is any way to supress content parts from the pdf report? Here is the problem: Most of pages have a toc macro with this code {{box cssClass="floatinginfobox"}} {{toc depth="3"/}} {{/box}} As we know, the pdf report also puts a toc page. My reports are getting two tocs, one from report and one from content. But i do not want to remove de pdf toc because some wiki pages do not have the content toc. There is a way to supress the content toc from appearing in the pdf report? thanks -- L. Marcelo Serique

4 8

Re: [xwiki-devs] [xwiki-notifications] r30816 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api
by Sergiu Dumitriu 01 Sep '10

01 Sep '10

On 09/01/2010 12:13 PM, cjdelisle (SVN) wrote: > Author: cjdelisle > Date: 2010-09-01 12:13:53 +0200 (Wed, 01 Sep 2010) > New Revision: 30816 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java > Log: > XWIKI-1962: $doc.removeObject causes changes to other objects to be discarded > Replaced this.doc with this.getDoc() in places where the document might be changed. You shouldn't reuse closed issue identifiers. -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 2

[xwiki-devs] [discussion] Macro categories usage & multiple categories per macro
by Anca Luca 01 Sep '10

01 Sep '10

Hi guys, Short story: 1/ glorify macro categories and use them for more than presentational purposes (e.g. using a category to differentiate "gadgets" macros from other macros) 2/ allow a macro to be part of multiple categories at the same time WDYT? Long story: I have read http://markmail.org/thread/wwv56pojo6rix5zv about the current implementation for macro categories and I noticed that the discussion / approach there focuses on the presentational use of categories for macros, how to display them grouped to the user. I would say there's an important additional usecase, the usage of categories as macros metadata, describing their semantic, to allow some apps to implement different behaviour for macros in a category or another. For example, in the case of gadgets / dashboard, if a gadget would be implemented as a macro, then we'd need some sort of method to differentiate the macros that can be used as gadgets. The most 'semantic' way would be to use a gadgets category to mark the gadgets, and the dashboard implementation will allow only macros from this category to be added in the dashboard. However this approach would mean that macro category gains importance, and we need to think if it's still ok that an admin can change the category of a macro and the macro category declared by the author can be completely overwritten. WDYT about using the macro categories for much more than grouping for presentation? I'm +1, and I think that ftm there's no need to strategy change wrt to who establishes the category of a macro. Also, because of this, it's very possible that we might need a macro to be part of more than one category, because, to continue the example, we might want gadgets to also be grouped in several categories (of gadgets), or a gadget to also be included in the, say, "presentation" category of macros to be used in plain xwiki documents. WDYT? I am +1 for this as well, and ready to start building the patch (modulo some macros API changes) as soon as we all agree. Thanks, Anca

3 2

Re: [xwiki-devs] [xwiki-notifications] r30693 - platform/web/trunk/standard/src/main/webapp/templates
by Vincent Massol 01 Sep '10

01 Sep '10

Hi Alex, Great serie of commits Alex (just looking at them now since I'm back from holidays)! Just a little comment: re the svn commit comment, could you always refer to a jira issue? (I've seen several commits where there were no jira issues mentioned). Thanks a lot -Vincent On Aug 18, 2010, at 6:23 PM, abusenius (SVN) wrote: > Author: abusenius > Date: 2010-08-18 18:23:50 +0200 (Wed, 18 Aug 2010) > New Revision: 30693 > > Modified: > platform/web/trunk/standard/src/main/webapp/templates/editclass.vm > Log: > Added missing escaping to class editor. > > Modified: platform/web/trunk/standard/src/main/webapp/templates/editclass.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/editclass.vm 2010-08-18 16:12:24 UTC (rev 30692) > +++ platform/web/trunk/standard/src/main/webapp/templates/editclass.vm 2010-08-18 16:23:50 UTC (rev 30693) > @@ -36,10 +36,10 @@ > #if($prevSpace != '') > </optgroup> > #end > - <optgroup label="${classdoc.space}"> > + <optgroup label="${escapetool.xml($classdoc.space)}"> > #set($prevSpace = ${classdoc.space}) > #end > - <option value="$classdoc.getURL('edit', 'editor=class')">${classdoc.name}</option> > + <option value="$classdoc.getURL('edit', 'editor=class')">${escapetool.xml($classdoc.name)}</option> > #end > #end > #if($prevSpace != '') > @@ -60,9 +60,9 @@ > * Display a class property > *# > #macro(displayProperty $field) > - <div id="xproperty_$field.name" class="xproperty #if($field.disabled)disabled#end"> > + <div id="xproperty_${field.name}" class="xproperty #if($field.disabled)disabled#end"> > <div id="xproperty_${field.name}_title" class="xproperty-title ${field.type}"> > - <h2>$doc.displayView($field.xWikiClass.get('prettyName'), "${field.name}_" , $field) > + <h2>$!{escapetool.xml($doc.displayView($field.xWikiClass.get('prettyName'), "${field.name}_" , $field))} > ($doc.displayView($field.xWikiClass.get('name'), "${field.name}_" , $field): $xwiki.metaclass.get($field.classType).prettyName)</h2> > <div class="tools propertyTools"><a href='$doc.getURL('propdelete', "propname=${field.name}")' title="$msg.get('core.editors.class.deleteProperty.tooltip', [${field.name}])" class="tool delete">$msg.get('core.editors.class.deleteProperty.text')</a></div> > </div> > @@ -76,9 +76,9 @@ > #set($propDef = $field.xWikiClass.get($classprop)) > #if($hiddenProperties.indexOf($propDef.name) == -1) > #if($propDef.type.indexOf('Boolean') != -1) > - <dt class="boolean-property"><label class="hidden" for="${field.name}_$classprop">$propDef.getPrettyName()</label>$doc.displayEdit($propDef, "${field.name}_" , $field) $propDef.getPrettyName()</dt> > + <dt class="boolean-property"><label class="hidden" for="${field.name}_$classprop">${escapetool.xml($propDef.getPrettyName())}</label>$doc.displayEdit($propDef, "${field.name}_" , $field) $propDef.getPrettyName()</dt> > #else > - <dt><label for="${field.name}_$classprop">$propDef.getPrettyName() $!{propertyDetails.get($classprop)}</label></dt> > + <dt><label for="${field.name}_$classprop">${escapetool.xml($propDef.getPrettyName())} $!{propertyDetails.get($classprop)}</label></dt> > <dd>$doc.displayEdit($propDef, "${field.name}_" , $field)</dd> > #end > #end > @@ -99,7 +99,7 @@ > <label for="proptype" class="property-type-label">$msg.get('core.editors.class.addProperty.type.label'):</label> > <select id="proptype" name="proptype" size="1"> > #foreach($prop in $xwiki.metaclass.properties) > - <option value="${prop.name}">${prop.prettyName}</option> > + <option value="${prop.name}">${escapetool.xml($prop.prettyName)}</option> > #end > </select> > <span class="buttonwrapper"> > @@ -140,10 +140,10 @@ > #editActionButton('preview', 'preview') > </div> > <div id="xwikiclassproperties"> > - <div id="xclass_${class.name}" class="xclass"> > - <div id="xclass_${class.name}_title" class="xclass-title"><h2>$class.name</h2></div> > + <div id="xclass_${escapetool.xml($class.name)}" class="xclass"> > + <div id="xclass_${escapetool.xml($class.name)}_title" class="xclass-title"><h2>${escapetool.xml($class.name)}</h2></div> > #addPropertyForm() > - <div id="xclass_${class.name}_content" class="xclass-content"><div id="xclassContent"> > + <div id="xclass_${escapetool.xml($class.name)}_content" class="xclass-content"><div id="xclassContent"> > #foreach ($field in $class.properties) > #displayProperty($field) > #end > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

1 0

[xwiki-devs] [VOTE] Alex Busenius as a committer.
by Caleb James DeLisle 01 Sep '10

01 Sep '10

Hello, I have been working with Alex on security related code and have been impressed with his abilities as well as dedication to consistent improvement of the project and his own code. Alex has worked on some complex changes to difficult code such as: XWIKI-5275: Prevent nested script macros. http://jira.xwiki.org/jira/browse/XWIKI-5275 As well as a large quantity of cross site script related patches such as: XWIKI-5161: Using XML symbols (<, >, &, ") inside the document title/name/space breaks various parts of the UI and causes the PDF export to throw exceptions http://jira.xwiki.org/jira/browse/XWIKI-5161 A full list is here, most are not viewable by the public. http://jira.xwiki.org/jira/secure/ViewProfile.jspa?name=nickless#selectedTa… Alex has developed an automated cross site script fuzzing test which can be seen here: http://svn.xwiki.org/svnroot/xwiki/contrib/sandbox/xwiki-enterprise-test-es… He is also responsible for parts of xwiki-crypto including PKCS7 signing and validation and X509 certificate handling. see: http://svn.xwiki.org/svnroot/xwiki/platform/core/trunk/xwiki-crypto/src/mai… http://svn.xwiki.org/svnroot/xwiki/platform/core/trunk/xwiki-crypto/src/mai… http://svn.xwiki.org/svnroot/xwiki/platform/core/trunk/xwiki-crypto/src/mai… As far as write access to the main repository, I think there is no question that he will be a good committer. It should be noted that I would be +1 for giving write access to anyone who demonstrates a need. The remaining issue is the responsibility of being on the "steering committee", having the power to -1 a vote. Alex and I agree on a lot of issues where we hold the minority position so my opinion should be taken with the salt it deserves. That said, he has the courage to voice disagreement when he has it, he takes an interest in decisions regarding the core rather than being concentrated on the user interface, and he has the ability to spot problems in design which will not become obvious until later. I think Alex Busenius will be a great committer. +1 Caleb

8 8