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

[xwiki-devs] CSS content placeholder when customizing a skin
by Bogdan Flueras 14 Oct '10

14 Oct '10

Hello Xwiki devs, I want to customize the COLIBRI skin.. for the very beginning just the colibry.css file. Basically I've just added a few lines to the original file. I don't want to paste into the 'style' text area ( http://localhost:8080/xwiki/bin/edit/XWiki/RtSkin?editor=object) the whole content of the css file because like I said it has minor additions not modifications. Furthermore when a modification is done to the default colibry.css file, mine's will be deprecated! So do you happen to know if there is a placeholder for the default colibry.css file? To make myself clear, I've painted a pictogram : Style________________________________ | %{placeholder for original Colibry.css}% | | AND here are my additions | |____________________________________| -- ing. Flueras Bogdan

4 4

Re: [xwiki-devs] [xwiki-notifications] r31772 - platform/pom/trunk
by Vincent Massol 14 Oct '10

14 Oct '10

oops that was committed by error.... -Vincent On Oct 14, 2010, at 10:53 AM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-10-14 10:53:33 +0200 (Thu, 14 Oct 2010) > New Revision: 31772 > > Modified: > platform/pom/trunk/pom.xml > Log: > Fixed parent dependency version > > > Modified: platform/pom/trunk/pom.xml > =================================================================== > --- platform/pom/trunk/pom.xml 2010-10-14 08:34:58 UTC (rev 31771) > +++ platform/pom/trunk/pom.xml 2010-10-14 08:53:33 UTC (rev 31772) > @@ -537,6 +537,10 @@ > PrmNWuONRNMnMoPnQRMWWNQPqnnrqRmMrqTuWtUVwStROo > PrnmqmUUnounqquummmmmUUnounqquummmmmUUONfhfUUn > mmmm]]></license> > +  > + <includesTestSourceRoots>false</includesTestSourceRoots> > + <cloverDatabase>${user.home}/.xwiki/clover/clover.db</cloverDatabase> > </configuration> > </plugin> > <plugin> > @@ -718,7 +722,10 @@ > </plugins> > </build> > </profile> > -  > +  > +  > <profile> > <id>clover</id> > <properties> > @@ -727,41 +734,6 @@ >  > <xwiki.clirr.skip>true</xwiki.clirr.skip> > </properties> > - <reporting> > - <plugins> > - <plugin> > - <groupId>com.atlassian.maven.plugins</groupId> > - <artifactId>maven-clover2-plugin</artifactId> > - </plugin> > - </plugins> > - </reporting> > - <build> > - <plugins> > -  > - <plugin> > - <groupId>com.atlassian.maven.plugins</groupId> > - <artifactId>maven-clover2-plugin</artifactId> > - <executions> > - <execution> > - <id>main</id> > - <phase>verify</phase> > - <goals> > - <goal>instrument</goal> > - <goal>aggregate</goal> > - </goals> > - </execution> > - <execution> > - <id>site</id> > - <phase>pre-site</phase> > - <goals> > - <goal>instrument</goal> > - <goal>aggregate</goal> > - </goals> > - </execution> > - </executions> > - </plugin> > - </plugins> > - </build> > </profile> > <profile> > <!-- We run Cobertura in a profile since Cobertura interferes with Clirr and thus we run

1 0

Re: [xwiki-devs] [xwiki-notifications] r31742 - platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/usersandgroups
by Ecaterina Valica 13 Oct '10

13 Oct '10

How about <th width="50px"> in the HTML (like on http://l10n.xwiki.org/xwiki/bin/view/L10N/ ) so that it works also for IE6? Caty On Tue, Oct 12, 2010 at 22:37, sdumitriu <platform-notifications(a)xwiki.org>wrote: > Author: sdumitriu > Date: 2010-10-12 21:37:35 +0200 (Tue, 12 Oct 2010) > New Revision: 31742 > > Modified: > > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/usersandgroups/usersandgroups.css > Log: > XWIKI-5572: Make the avatar column in the User Directory smaller > Done. > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/usersandgroups/usersandgroups.css > =================================================================== > --- > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/usersandgroups/usersandgroups.css > 2010-10-12 18:53:36 UTC (rev 31741) > +++ > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/usersandgroups/usersandgroups.css > 2010-10-12 19:37:35 UTC (rev 31742) > @@ -78,4 +78,9 @@ > > tr.userorgroups-header { > background-color:#DDDDDD; > -} > \ No newline at end of file > +} > + > +/* Make the avatar column smaller */ > +table#groupusers th.xwiki-livetable-display-header-text:first-child { > + width: 50px; > +} > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

2 1

[xwiki-devs] Fwd: [hibernate-dev] Hibernate Core is now using Git
by Caleb James DeLisle 13 Oct '10

13 Oct '10

Moving to github is an interesting solution, also it looks like they only gitified branches and tags on an "as needed" basis. Caleb -------- Original Message -------- Subject: [hibernate-dev] Hibernate Core is now using Git Date: Thu, 7 Oct 2010 11:30:11 +0200 From: Emmanuel Bernard <emmanuel(a)hibernate.org> To: hibernate-dev(a)lists.jboss.org Hibernate Core now uses Git as the version control system. You can access it at http://github.com/hibernate/hibernate-core Core on Git We have imported the SVN history (at least what GIT could extract) and pushed the SVN trunk, branch 3.5 and branch 3.3. If you need more of the legacy branches or tags, let me know, that can be arranged. If you want to contribute a fix or new feature, either use the pure Git approach, or use the GitHub fork capability (see http://help.github.com/forking/ and http://help.github.com/pull-requests/ ) The benefit of the GitHub approach is that we can comment on the pull request and code though I am far from an expert so far and their flow could easily be improved (slightly confusing). If you still want to do it the old way a provide a patch file, that's ok too. Tips on Git Here are some tips on Git: o read Pro Git http://progit.org/book/ awesome book and very practical. It has a free html and epub version (buying the tree version is recommended to repay the author). o prefer the git protocol when cloning over http (so say the experts). At the very least that will be much faster. cloning the repo from GitHub took me less than 3 minutes #for people with read/write access git clone git@github.com:hibernate/hibernate-core.git #for people with read-only access git clone git://github.com/hibernate/hibernate-core.git It will create a "remote" link named origin. I usually tend to rename it to reflect what it is really. git remote rename origin core-on-github o always work on a topic branch and merge your work when you are done git checkout master git checkout -b HHH-XXX hack commit hack commit Likewise if you want to share a work with somebody from the Hibernate team, push or define the pull request of your topic branch (though make sure your topic branch is above master). o prefer small commits, they will be more readable and will very unlikely fail on merge o write good comments (short one line including the issue at stack followed by a blank line and a more detailed explanation if needed) `HHH-XXX Fix NPE on persist Fix stupid bug by Gavin that lead to a NPE when persisting objects with components` o prefer rebase over merge Rebase put changes from the branch you forked below the new commits you have done and thus keep the history linear. got checkout HHH-XXX git rebase master DO NOT rebase a branch that you have shared publicly (unless you know people won't use it or you wish them harm). o while you are at rebasing, you can rewrite your commit history to clean comments or merge some commits together (named squashing) git rebase -i HEAD~6 (go back 6 commits in time) o once you're fed up with typing longish command lines, use aliases (see below) o I've put a copy of my ~/.gitconfig file in case people want to copy some things including aliases (see below) o if you use Mac OS X, GitX is a fantastic tool, in particular to do interactive staging and commit only some parts of a file o you can read this blog entry that was some more info http://blog.emmanuelbernard.com/2010/05/git-how-my-life-has-improved-since-… o feel free to add your tips to this email thread, I'll likely compile them in a blog entry. ~/.gitconfig [user] name = Redacted email = redacted(a)redacted.com signingkey = id_key.pub [core] editor = open -nW -a Smultron [merge] tool = opendiff [color] ui = auto [color "branch"] current = yellow reverse local = yellow remote = green [color "diff"] meta = yellow bold frag = magenta bold old = red bold new = green bold [color "status"] added = yellow changed = green untracked = cyan [github] user = redacted token = redacted [alias] co = checkout undo = reset --hard cb = checkout -b br = branch cp = cherry-pick _______________________________________________ hibernate-dev mailing list hibernate-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev

1 0

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-macr
by Thomas Mortagne 12 Oct '10

12 Oct '10

On Tue, Oct 12, 2010 at 15:45, Sergiu Dumitriu <sergiu(a)xwiki.com> wrote: > 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. Yes i already changed that to do "traditional" unit tests instead. > >> +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/ > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Thomas Mortagne

1 0

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:image001.gif@01CB69F1.481DD2E0]<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