October 2010 - xwiki-devs@xwiki.org

Re: [xwiki-devs] [xwiki-notifications] r31733 - in platform/core/trunk/xwiki-rendering: xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter xwiki-rendering-macros/xwiki-rendering-macro-toc xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/java/org/xwiki/rendering xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/resources
by Sergiu Dumitriu 12 Oct '10

12 Oct '10

On 10/12/2010 02:03 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2010-10-12 14:03:53 +0200 (Tue, 12 Oct 2010) > New Revision: 31733 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/resources/macrotoc11.test > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/java/org/xwiki/rendering/RenderingTests.java > Log: > XWIKI-5571: Toc macro parameters bean should use standard Java bean validator > Also deprecated two exceptions that are useless since xwiki-properties is executing Java bean validation > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java 2010-10-12 11:18:57 UTC (rev 31732) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java 2010-10-12 12:03:53 UTC (rev 31733) > @@ -23,7 +23,9 @@ > * Exception used when the macro parameter is two high. > * > * @version $Id$ > + * @deprecated use {@link javax.validation.constraints.Max} instead > */ > +@Deprecated > public class ParameterValueTooHighException extends MacroParameterException > { > /** > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java 2010-10-12 11:18:57 UTC (rev 31732) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java 2010-10-12 12:03:53 UTC (rev 31733) > @@ -23,7 +23,9 @@ > * Exception used when the macro parameter is two low. > * > * @version $Id$ > + * @deprecated use {@link javax.validation.constraints.Min} instead > */ > +@Deprecated > public class ParameterValueTooLowException extends MacroParameterException > { > /** > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml 2010-10-12 11:18:57 UTC (rev 31732) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml 2010-10-12 12:03:53 UTC (rev 31733) > @@ -32,4 +32,12 @@ > <artifactId>xwiki-core-rendering-macro-toc</artifactId> > <name>XWiki Platform - Core - Rendering - Macro - Toc</name> > <description>XWiki Platform - Core - Rendering - Macro - Toc</description> > +<dependencies> > +<dependency> > +<groupId>org.hibernate</groupId> > +<artifactId>hibernate-validator</artifactId> > +<version>4.0.2.GA</version> > +<scope>test</scope> > +</dependency> > +</dependencies> > </project> > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java 2010-10-12 11:18:57 UTC (rev 31732) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java 2010-10-12 12:03:53 UTC (rev 31733) > @@ -19,8 +19,9 @@ > */ > package org.xwiki.rendering.macro.toc; > > +import javax.validation.constraints.Min; > + > import org.xwiki.properties.annotation.PropertyDescription; > -import org.xwiki.rendering.macro.parameter.ParameterValueTooLowException; > > /** > * Parameters for the {@link org.xwiki.rendering.internal.macro.toc.TocMacro} Macro. > @@ -49,6 +50,7 @@ > /** > * The minimum section level. For example if 2 then level 1 sections will not be listed. > */ > + @Min(1) > private int start = 1; > > /** > @@ -59,6 +61,7 @@ > /** > * The maximum section level. For example if 3 then all section levels from 4 will not be listed. > */ > + @Min(1) > private int depth = 6; > > /** > @@ -74,15 +77,10 @@ > > /** > * @param start the minimum section level. For example if 2 then level 1 sections will not be listed. > - * @throws ParameterValueTooLowException the provided value is too low, it needs to be>= 1. > */ > @PropertyDescription("the minimum section level. For example if 2 then level 1 sections will not be listed") > - public void setStart(int start) throws ParameterValueTooLowException > + public void setStart(int start) > { > - if (start< 1) { > - throw new ParameterValueTooLowException(1); > - } > - > this.start = start; > this.customStart = true; > } > @@ -105,16 +103,11 @@ > > /** > * @param depth the maximum section level. For example if 3 then all section levels from 4 will not be listed. > - * @throws ParameterValueTooLowException the provided value is too low, it needs to be>= 1. > */ > @PropertyDescription("the maximum section level. " > + "For example if 3 then all section levels from 4 will not be listed") > - public void setDepth(int depth) throws ParameterValueTooLowException > + public void setDepth(int depth) > { > - if (depth< 1) { > - throw new ParameterValueTooLowException(1); > - } > - > this.depth = depth; > } > > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/java/org/xwiki/rendering/RenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/java/org/xwiki/rendering/RenderingTests.java 2010-10-12 11:18:57 UTC (rev 31732) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/java/org/xwiki/rendering/RenderingTests.java 2010-10-12 12:03:53 UTC (rev 31733) > @@ -35,7 +35,7 @@ > { > public static Test suite() throws Exception > { > - RenderingTestSuite suite = new RenderingTestSuite("Test Toc Macro"); > + RenderingTestSuite suite = new RenderingTestSuite("Test Toc Macro", "", "macrotoc11.test"); > return new ComponentManagerTestSetup(suite); > } > } > > Added: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/resources/macrotoc11.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/resources/macrotoc11.test (rev 0) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/test/resources/macrotoc11.test 2010-10-12 12:03:53 UTC (rev 31733) > @@ -0,0 +1,81 @@ > +.runTransformations > +.#----------------------------------------------------- > +.input|xwiki/2.0 > +.# Verify the TOC produce error when "start" or "depth" parameters are too low > +.#----------------------------------------------------- > +{{toc start="0"/}} > + > +{{toc depth="0"/}} > +.#----------------------------------------------------- > +.expect|event/1.0 > +.#----------------------------------------------------- > +beginDocument > +beginMacroMarkerStandalone [toc] [start=0] > +beginGroup [[class]=[xwikirenderingerror]] > +onWord [Invalid macro parameters used for the "toc" macro] > +endGroup [[class]=[xwikirenderingerror]] > +beginGroup [[class]=[xwikirenderingerrordescription hidden]] This stacktrace looks really fragile, any changes in the source files will prompt redoing the test file. > +onVerbatim [org.xwiki.properties.PropertyException: Failed to validate bean: [must be greater than or equal to 1] > + at org.xwiki.properties.internal.DefaultBeanManager.validateBean(DefaultBeanManager.java:178) > + at org.xwiki.properties.internal.DefaultBeanManager.populate(DefaultBeanManager.java:113) > + at org.xwiki.rendering.internal.transformation.MacroTransformation.transformOnce(MacroTransformation.java:158) > + at org.xwiki.rendering.internal.transformation.MacroTransformation.transform(MacroTransformation.java:117) > + at org.xwiki.rendering.internal.transformation.DefaultTransformationManager.performTransformations(DefaultTransformationManager.java:85) > + at org.xwiki.rendering.scaffolding.RenderingTestCase.runTestInternal(RenderingTestCase.java:126) > + at org.xwiki.rendering.scaffolding.RenderingTestCase.runTest(RenderingTestCase.java:99) > + at org.jmock.core.VerifyingTestCase.runBare(VerifyingTestCase.java:39) > + at junit.framework.TestResult$1.protect(TestResult.java:110) > + at junit.framework.TestResult.runProtected(TestResult.java:128) > + at junit.framework.TestResult.run(TestResult.java:113) > + at junit.framework.TestCase.run(TestCase.java:124) > + at junit.framework.TestSuite.runTest(TestSuite.java:232) > + at junit.framework.TestSuite.run(TestSuite.java:227) > + at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) > + at junit.extensions.TestSetup$1.protect(TestSetup.java:23) > + at junit.framework.TestResult.runProtected(TestResult.java:128) > + at junit.extensions.TestSetup.run(TestSetup.java:27) > + at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:79) > + at org.eclipse.jdt.internal.junit4.runner.JUnit4TestReference.run(JUnit4TestReference.java:49) > + at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:467) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:683) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:390) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:197) > +] [false] > +endGroup [[class]=[xwikirenderingerrordescription hidden]] > +endMacroMarkerStandalone [toc] [start=0] > +beginMacroMarkerStandalone [toc] [depth=0] > +beginGroup [[class]=[xwikirenderingerror]] > +onWord [Invalid macro parameters used for the "toc" macro] > +endGroup [[class]=[xwikirenderingerror]] > +beginGroup [[class]=[xwikirenderingerrordescription hidden]] > +onVerbatim [org.xwiki.properties.PropertyException: Failed to validate bean: [must be greater than or equal to 1] > + at org.xwiki.properties.internal.DefaultBeanManager.validateBean(DefaultBeanManager.java:178) > + at org.xwiki.properties.internal.DefaultBeanManager.populate(DefaultBeanManager.java:113) > + at org.xwiki.rendering.internal.transformation.MacroTransformation.transformOnce(MacroTransformation.java:158) > + at org.xwiki.rendering.internal.transformation.MacroTransformation.transform(MacroTransformation.java:117) > + at org.xwiki.rendering.internal.transformation.DefaultTransformationManager.performTransformations(DefaultTransformationManager.java:85) > + at org.xwiki.rendering.scaffolding.RenderingTestCase.runTestInternal(RenderingTestCase.java:126) > + at org.xwiki.rendering.scaffolding.RenderingTestCase.runTest(RenderingTestCase.java:99) > + at org.jmock.core.VerifyingTestCase.runBare(VerifyingTestCase.java:39) > + at junit.framework.TestResult$1.protect(TestResult.java:110) > + at junit.framework.TestResult.runProtected(TestResult.java:128) > + at junit.framework.TestResult.run(TestResult.java:113) > + at junit.framework.TestCase.run(TestCase.java:124) > + at junit.framework.TestSuite.runTest(TestSuite.java:232) > + at junit.framework.TestSuite.run(TestSuite.java:227) > + at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) > + at junit.extensions.TestSetup$1.protect(TestSetup.java:23) > + at junit.framework.TestResult.runProtected(TestResult.java:128) > + at junit.extensions.TestSetup.run(TestSetup.java:27) > + at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:79) > + at org.eclipse.jdt.internal.junit4.runner.JUnit4TestReference.run(JUnit4TestReference.java:49) > + at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:467) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:683) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:390) > + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:197) > +] [false] > +endGroup [[class]=[xwikirenderingerrordescription hidden]] > +endMacroMarkerStandalone [toc] [depth=0] > +endDocument > \ No newline at end of file -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

[xwiki-devs] CSRF tests taking long
by Vincent Massol 12 Oct '10

12 Oct '10

Hi (Alex), Is it normal that CSRF tests take so long to execute on hudson (> 5mn for 7 unit tests): http://hudson.xwiki.org/job/xwiki-platform-core/org.xwiki.platform$xwiki-co… On my local machine they took 26 seconds. Thanks -Vincent

3 2

[xwiki-devs] outofmemory errors
by Iola Hagen [ioh] 12 Oct '10

12 Oct '10

Hi we are having problems with outofmemory permgen errors, we make heavy use of the attachment feature in our xwiki installation and as the site has become more popular the memory errors have increased. I found the email below as a response to a similar question does anyone know if this has now been resolved. We are running XWiki Enterprise 2.1.1.25889, on Windows Server 2008 Tomcat 6.0 with Java 1.6.0_18, the database is SQL server 2008. Thanks for any help. Cheers Iola Subject: Re: [xwiki-users] Out of memory error<http://markmail.org/message/dctm6ag7j2ci6j42> [cid:[email protected]]<http://markmail.org/message/dctm6ag7j2ci6j42> From: Vincent Massol (vinc...(a)massol.net) Date: Jul 16, 2009 4:19:39 am List: org.xwiki.users Hi there, Unfortunately XWiki is still memory intensive when it comes to attachment manipulation. Thus the memory required depends on the size of the attachment you're uploading. Seen the OOM error you're getting you'd need to increase the memory to make it work. We really need to look into this and see how we can reduce the memory needs. Thanks -Vincent

2 1

[xwiki-devs] [proposal] Deprecate functions in XWikiAttachment and XWikiAttachmentArchive which are bound to JRCS based implementation.
by Caleb James DeLisle 12 Oct '10

12 Oct '10

I propose that we deprecate some functions in XWikiAttachment and XWikiAttachmentArchive for 2.5 final. The theoretical reason is that they are implementation bound and we should not expose the implementation to the user of the API. The practical reason is that JRCS is very badly suited for handling large data as it stores everything (including all versions) in a String. Since the content is base64 encoded (increasing the size by 30%) and java Strings are UTF-16 (doubling the size) the memory consumption from using JRCS is at least 2.6 times the size of all revisions of the content. I didn't find these functions used anywhere else in platform. These are the functions I would like to deprecate: XWikiAttachment public void setArchive(Archive archive) public Archive getArchive() XWikiAttachmentArchive public Archive getRCSArchive() public void setRCSArchive(Archive archive) WDYT? Caleb

6 5

[xwiki-devs] [VOTE] Release XE 2.5RC1, create branches for 2.5, move trunks to 2.6
by Sergiu Dumitriu 11 Oct '10

11 Oct '10

Hi devs, The XWiki 2.5 RC1 was scheduled today. Given that M2 was released a couple of days later, and that we still need to wait for the vote results, I propose to release XE 2.5 RC1 tomorrow. Since 2.5 is entering the RC phase, I also propose to move 2.5 to a branch (core, web, enterprise, manager). -- Sergiu Dumitriu http://purl.org/net/sergiu/

4 3

[xwiki-devs] [Proposal][Standard][UX] Forms
by Ecaterina Valica 11 Oct '10

11 Oct '10

I've made some additions to our Forms Standard page: http://incubator.myxwiki.org/xwiki/bin/view/Standards/Forms The standard is very similar to what we have for the WYSIWYG editor: - vertical alignment - display of labels (we have uppercase text for Colibri style consistency) - display of hints/error messages - primary/secondary buttons I made a proposal to integrate this standards inside the platform: http://incubator.myxwiki.org/xwiki/bin/view/Standards/FormsProposal - administration - object editor - user profile - Create Space/Page - Copy/Rename Page Any feedback is welcomed, Caty

8 12

[xwiki-devs] Fwd: [ANN] Maven Release Plugin 2.1 Released
by Vincent Massol 11 Oct '10

11 Oct '10

fyi -Vincent Begin forwarded message: > From: Brett Porter <brett(a)apache.org> > Date: October 8, 2010 7:03:48 PM GMT+02:00 > To: announce(a)maven.apache.org, Maven Users List <users(a)maven.apache.org> > Cc: Maven Developers List <dev(a)maven.apache.org> > Subject: [ANN] Maven Release Plugin 2.1 Released > Reply-To: users(a)maven.apache.org > > The Maven team is pleased to announce the release of the Maven Release Plugin, version 2.1 > > This plugin is used to release a project with Maven, saving a lot of repetitive, manual work. Releasing a project is made in two steps: prepare and perform. > > http://maven.apache.org/plugins/maven-release-plugin/ > > You should specify the version in your project's plugin configuration: > > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-release-plugin</artifactId> > <version>2.1</version> > </plugin> > > Release Notes - Maven Release Plugin - Version 2.1 > > ** Bug > * [MRELEASE-128] - SCM properties being replaced during release:perform > * [MRELEASE-317] - release:prepare should fail if any pom depends on SNAPSHOT parent > * [MRELEASE-318] - Release plugin throws NullPointerException when using version range for dependency > * [MRELEASE-350] - Option '0' for "specify the selection number ( 0:All 1:Project Dependencies 2:Plugins 3:Reports 4:Extensions ):" is broken > * [MRELEASE-370] - release:prepare is not updating inter-modules dependencies to the next version snapshot identifier correctly (-DdryRun=true). > * [MRELEASE-458] - Branch Does Not Honor updateWorkingCopyVersions Setting > * [MRELEASE-524] - command line versions don't seem to work on release:branch for specific format > * [MRELEASE-536] - CommonBasedir Calculation fails on windows > * [MRELEASE-546] - regression introduced in MRELEASE-261 > * [MRELEASE-551] - Unable to release with maven 3 when having no $HOME/.m2/settings.xml > * [MRELEASE-563] - help strings need help, they are not helpful out of context > * [MRELEASE-586] - release:perform - The temporary file "pom.xml.branch" should be ignored as "pom.xml.next" and "pom.xml.tag" are ignored > * [MRELEASE-589] - Resolved dependencies overwritten when multiple subprojects with SNAPSHOT dependencies are released > > ** Improvement > * [MRELEASE-497] - Don't overwrite SVN auth cache > * [MRELEASE-530] - Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade) > * [MRELEASE-554] - Allow custom files to be modified before doing a prepare or branch... > * [MRELEASE-583] - Better Snapshot Dependency Handling > > Enjoy, > -The Maven team > > -- > Brett Porter > brett(a)apache.org > http://brettporter.wordpress.com/ > > > >

1 0

[xwiki-devs] [discussion] Synchronizing version numbers of applications, plugins, and core.
by Caleb James DeLisle 08 Oct '10

08 Oct '10

I have been observing problems with the versioning scheme which we are using. Because applications are not branched along with core, when a bugfix version of a stable branch is released, new versions of applications are typically pulled in. This means that `experimental' code is being introduced into a `stable' branch in a bugfix version. This is not the path I would choose but more importantly we can't honestly say that our code goes through a milestone/release candidate verification process if some of the code is allowed to bypass it. This situation has caused me to make a mistake which I was able to correct during the release without major issue, I think the same issue is behind the release of 2 bogus versions (2.4.1 and 2.4.2) There is another issue, users who want to mix and match applications to build their own wiki are faced with a set of version numbers and no way to know what is compatible with what. A user who I spoke with last night had this very problem. We could publish a compatibility matrix but if we were to show all the versions a given application is compatible with, that would require testing each application version against each core version and I think we need to concentrate on testing what gets released in XE. Both of these problems would be fixed if version numbers were synchronized and everything was branched for a release. Relevant questions which come to mind are "do we need the capability to release applications at separate times?" and "is there no way to do that with synchronized version numbers?" Am I missing any other reasons? Should this not become a proposal? Caleb

8 37

[xwiki-devs] UniqueIdentificationNumber component
by Stefan abageru 08 Oct '10

08 Oct '10

Hello Devs ! I built a component to handle unique generation of document names. The documents must be instantiations of a specified class and the generation is done taking into consideration the currently existing documents and all the values used before. It retrieves the maximum value currently used, increments It is configurable in xwiki.properties. More info cand be found here http://code.xwiki.org/xwiki/bin/view/Plugins/UniqueIdentificationNumberPlug… . Thanks, Stefan Abageru !

1 0

[xwiki-devs] [proposal] Deprecate com.xpn.xwiki.api.Context#getUtil()
by Caleb James DeLisle 08 Oct '10

08 Oct '10

Hi, I would like to hard deprecate com.xpn.xwiki.api.Context#getUtil(). It exposes functions to the user which are not optimized for scripting and some of which are security vulnerabilities. This class is not in the api package and it appears that it was never intended to be exposed to the user. +1 @Deprecated. Caleb

5 5