September 2009 - xwiki-devs@xwiki.org

Re: [xwiki-devs] [xwiki-notifications] r24079 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc
by Vincent Massol 27 Sep '09

27 Sep '09

On Sep 27, 2009, at 5:18 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2009-09-27 05:18:20 +0200 (Sun, 27 Sep 2009) > New Revision: 24079 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > XWikiDocument.java > Log: > XWIKI-4416: Add getPrefixedFullName in XWikiDocument > Done. > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > doc/XWikiDocument.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > XWikiDocument.java 2009-09-27 02:37:41 UTC (rev 24078) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > XWikiDocument.java 2009-09-27 03:18:20 UTC (rev 24079) > @@ -651,12 +651,20 @@ > public String getFullName() > { > StringBuffer buf = new StringBuffer(); > - buf.append(getSpace()); > - buf.append("."); > + buf.append(getSpace()).append("."); > buf.append(getName()); > return buf.toString(); > } > > + public String getPrefixedFullName() > + { > + StringBuffer buf = new StringBuffer(); > + buf.append(getDatabase()).append(":"); > + buf.append(getSpace()).append("."); > + buf.append(getName()); > + return buf.toString(); > + } Shouldn't users of this method instead use DocumentName? Couldn't we instead introduce a getDocumentName() in XWikiDocument. Of course if the calling code needs a string (which it shouldn't except in very rare cases but right now it's possible it needs one because not all our api are using DocumentName) then it can use the DocumentNameSerializer. Thanks -Vincent

1 1

[xwiki-devs] Fwd: The Release of Lucene 2.9
by Vincent Massol 25 Sep '09

25 Sep '09

fyi -Vincent Begin forwarded message: > From: Mark Miller <markrmiller(a)apache.org> > Date: September 25, 2009 6:15:57 PM CEDT > To: announce(a)apache.org > Subject: The Release of Lucene 2.9 > Reply-To: markrmiller(a)apache.org > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA512 > > Hello Lucene users, > > On behalf of the Lucene dev community (a growing community far larger > than just the committers) I would like to announce the release of > Lucene 2.9. > > While we generally try and maintain full backwards compatibility > between major versions, Lucene 2.9 has a variety of breaks that are > spelled out in the 'Changes in backwards compatibility policy' section > of CHANGES.txt. > > We recommend that you recompile your application with Lucene 2.9 > rather than attempting to “drop” it in. This will alert you to any > issues you may have to fix if you are affected by one of the backward > compatibility breaks. As always, its a really good idea to thoroughly > read CHANGES.txt before upgrading. > > Lucene 2.9 comes with a bevy of new features, including: > > * Per segment searching and caching (can lead to much faster reopen > among other things) > > * Near real-time search capabilities added to IndexWriter > > * New Query types > > * Smarter, more scalable multi-term queries (wildcard, range, etc) > > * A freshly optimized Collector/Scorer API > > * Improved Unicode support and the addition of Collation contrib > > * A new Attribute based TokenStream API > > * A new QueryParser framework in contrib with a core QueryParser > replacement impl included. > > * Scoring is now optional when sorting by Field, or using a custom > Collector, gaining sizable performance when scores are not > required. > > * New analyzers (PersianAnalyzer, ArabicAnalyzer, > SmartChineseAnalyzer) > > * New fast-vector-highlighter for large documents > > * Lucene now includes high-performance handling of numeric fields. > Such fields are indexed with a trie structure, enabling simple to > use and much faster numeric range searching without having to > externally pre-process numeric values into textual values. > > --- > > And many, many more features, bug fixes, optimizations, and various > improvements. You can find the full list of changes here: > > http://lucene.apache.org/java/2_9_0/changes/Changes.html > > > Many changes have also occurred in Lucene's Contrib area: > > http://lucene.apache.org/java/2_9_0/changes/Contrib-Changes.html > > > Binary and source distributions are available at > http://www.apache.org/dyn/closer.cgi/lucene/java/ > > Lucene artifacts are also available in the Maven2 repository at > http://repo1.maven.org/maven2/org/apache/lucene/ > > The Next Release: > > The next release will be Lucene 3.0. This should come along shortly, > and will > remove all of the deprecated code in Lucene 2.9. Lucene 3.0 will also > be the > first release to move from Java 1.4 to Java 1.5 as a requirement. > > > Thanks, > > Mark Miller > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.9 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQIcBAEBCgAGBQJKvOy9AAoJEBMFmEzrAZn4rmYP/AsmtlRAOZzCUyGo83pkYyPx > kR2XdaZPUN8Le5RdaW2BuYtm+i3OLhsLFrWeJwCm/DrFM7tTlwLtFGFnYyga3BM6 > L+TCVmgMOke1Mo36E/Sjn6+aPcXLZK/HMb5EHuoYpZZAk7Vx+jsWmTpHPvP5HR4t > ZXNa6CT9wjaK1iV7nvaJnifC5QjPeDncM2qOQWF5wLY26eS/G7a4dXJOsl6IHP7z > uJ2j7fxMSucvSGOzWNjW9SouymVuYqL5m4KyEeiqwUlGvHPfLn1AySmCYClEhSL1 > 5kI0Fmr6z6duPY/LKvTNVTe2S1tQS8DKErtOP2vbclglvuw//dqp/cbjvjP8oTZg > 5B610ehDBNwmKN5DAq8v1PAj0vGj1ygk9hotXFcjGlnEEoTCPegh1P3lg0t0LKlk > vBt5GJC61+8dJMs0BXRznSESV8dl7IjjBzfnGiEqQS1sSGBGxAzgUHaOrVnHW/vh > BfaNwzqFguYvOXMzV8DkwQPpXMOxDMDEHKjAKj3SSYsIAIPLbRP0XwkU2Y6csfoP > rrom1+fZEkNFd/qbQw2i7xhvX1LmShlT6GYezkR9St+fSoWzg2Js44dSpDAYYh33 > 3Ngz6koNyZVCfcwz1oOMI5yz+oD98OICxyG0j/m6w8RtEAhsUE07tX/LEvHp0HPZ > uF1TIGPZcQbC4g3yf8Kz > =WImG > -----END PGP SIGNATURE----- >

2 1

Re: [xwiki-devs] [xwiki-notifications] Build failed in Hudson: xwiki-platform-core-2.0 #42
by Vincent Massol 25 Sep '09

25 Sep '09

On Sep 25, 2009, at 4:07 PM, Hudson wrote: > See <http://hudson.xwiki.org/job/xwiki-platform-core-2.0/42/changes> > > Changes: > > [Thomas Mortagne] [maven-release-plugin] prepare for next > development iteration > > [Thomas Mortagne] [maven-release-plugin] prepare release xwiki- > core-2.0 > > ------------------------------------------ > [...truncated 3713 lines...] > Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.201 sec > Running > org.xwiki.officeimporter.internal.OfficeImporterFileStorageTest > Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.031 sec > Running > org.xwiki.officeimporter.internal.cleaner.MiscWysiwygCleaningTest > Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.057 sec > Running > org > .xwiki > .officeimporter.internal.cleaner.InvalidTagOpenOfficeCleaningTest > Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.062 sec > Running > org.xwiki.officeimporter.internal.cleaner.LinkOpenOfficeCleaningTest > Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.103 sec > Running > org > .xwiki > .officeimporter > .internal.cleaner.EmptyLineParagraphOpenOfficeCleaningTest > Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.047 sec > [snip] > ------------------------------------------------------- > T E S T S > ------------------------------------------------------- > Running com.xpn.xwiki.criteria.impl.PeriodFactoryTest > Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.399 sec > Running com.xpn.xwiki.render.DefaultXWikiRenderingEngineTest > 2009-09-25 15:01:00,806 [] [main] ERROR > internal.DefaultVelocityEngine - WebappLoader : unable to retrieve > ServletContext > 2009-09-25 15:01:01,205 [] [main] ERROR > internal.DefaultVelocityEngine - WebappLoader : unable to retrieve > ServletContext > Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 6.097 sec > Running com.xpn.xwiki.user.impl.xwiki.XWikiAuthServiceImplTest > Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 1.366 sec > Running com.xpn.xwiki.doc.DefaultDocumentNameFactoryTest > Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.453 sec > Running com.xpn.xwiki.doc.XWikiDocumentArchiveTest > 2009-09-25 15:01:04,256 [] [main] WARN > rcs.XWikiRCSArchive - isDiff: Archive is inconsistent. > Text and diff field are contradicting. version=1.1 > 2009-09-25 15:01:04,347 [] [main] WARN > rcs.XWikiRCSArchive - isDiff: Archive is inconsistent. > Text and diff field are contradicting. version=1.1 > Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 2.505 sec > Running com.xpn.xwiki.doc.XWikiDocumentTest > ERROR: Processing failed due to a bug in the code. Please report > this to users(a)hudson.dev.java.net > java.lang.NullPointerException > at hudson.model.Run$Runner.access$000(Run.java:1007) > at hudson.model.Run.reportCheckpoint(Run.java:984) > at hudson.model.CheckPoint.report(CheckPoint.java:113) > at hudson.tasks.MailSender.execute(MailSender.java:107) > at hudson.maven.reporters.MavenMailer.end(MavenMailer.java:54) > at hudson.maven.MavenModuleSetBuild > $Builder.end(MavenModuleSetBuild.java:677) > at hudson.maven.MavenModuleSetBuild > $RunnerImpl.doRun(MavenModuleSetBuild.java:480) > at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java: > 354) > at hudson.model.Run.run(Run.java:1123) > at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:302) > at hudson.model.ResourceController.execute(ResourceController.java: > 88) > at hudson.model.Executor.run(Executor.java:123) this looks like a false positive, isn't it? [snip] Thanks -Vincent

2 1

[xwiki-devs] [VOTE] Release XWiki Enterprise 2.0 final
by Thomas Mortagne 24 Sep '09

24 Sep '09

Hi, I would like to start the release of XWiki Enterprise 2.0 final. It's a very important release so make sure there is no blocker remaining on your side before voting. You can look at http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise20 for more details. Here is my +1 Thanks, -- Thomas Mortagne

6 6

Re: [xwiki-devs] [xwiki-notifications] r23883 - in enterprise/branches/xwiki-enterprise-2.0/distribution-test: ldap-tests/src/test/it/com/xpn/xwiki/it selenium-tests/src/test/it/com/xpn/xwiki/it/selenium selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium
by Anca Luca 24 Sep '09

24 Sep '09

Hi Vincent, vmassol (SVN) wrote: > Author: vmassol > Date: 2009-09-24 08:58:35 +0200 (Thu, 24 Sep 2009) > New Revision: 23883 > > Modified: > enterprise/branches/xwiki-enterprise-2.0/distribution-test/ldap-tests/src/test/it/com/xpn/xwiki/it/LDAPAuthTest.java > enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/AllDocsTest.java > enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/DocExtraTest.java > enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/SectionTest.java > enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java > enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java > Log: > Improve API names thanks to Marius Shouldn't this also be on trunk? Thanks, Anca > > Modified: enterprise/branches/xwiki-enterprise-2.0/distribution-test/ldap-tests/src/test/it/com/xpn/xwiki/it/LDAPAuthTest.java > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/ldap-tests/src/test/it/com/xpn/xwiki/it/LDAPAuthTest.java 2009-09-23 21:45:22 UTC (rev 23882) > +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/ldap-tests/src/test/it/com/xpn/xwiki/it/LDAPAuthTest.java 2009-09-24 06:58:35 UTC (rev 23883) > @@ -110,7 +110,7 @@ > // /////////////////// > // Validate XWIKI-2201: LDAP group mapping defined in XWikiPreferences is not working > open("XWiki", "XWikiAdminGroup"); > - assertAndWaitBodyContains("XWiki." + LDAPTestSetup.WILLIAMBUSH_UID); > + waitForBodyContains("XWiki." + LDAPTestSetup.WILLIAMBUSH_UID); > > // /////////////////// > // Validate > > Modified: enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/AllDocsTest.java > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/AllDocsTest.java 2009-09-23 21:45:22 UTC (rev 23882) > +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/AllDocsTest.java 2009-09-24 06:58:35 UTC (rev 23883) > @@ -60,7 +60,7 @@ > // elements in the table > open("Main", "AllDocs"); > // We verify we have a least 3 pages displayed > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > if (isAuthenticated()) { > logout(); > } > @@ -69,7 +69,7 @@ > // Validate presence of "Actions" column in table view for administrator. > loginAsAdmin(); > open("Main", "AllDocs"); > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > assertElementPresent("//th[normalize-space(text())='Actions']"); > > // Validate input suggest for Page field. > @@ -77,29 +77,29 @@ > // Note: We wait on the pagination result since it's the last element updated and it's done after the > // table rows have been updated so this allows us to wait on it. In the code below "1" represents the > // displayed pages. > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > assertElementPresent("//td[contains(@class, 'doc_name')]/a[text()='Treeview']"); > > // Validate input suggest for Space field. > open("Main", "AllDocs"); > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > getSelenium().typeKeys("xpath=//input[@name='doc.space']", "XWiki"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "treeview"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > assertElementPresent("//td[contains(@class, 'doc_name')]/a[text()='Treeview']"); > > // Validate input suggest for Last Author field. > open("Main", "AllDocs"); > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > getSelenium().typeKeys("xpath=//input[@name='doc.author']", "SomeUnknownAuthor"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", ""); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", ""); > assertElementNotPresent("//td[contains(@class, 'doc_name')]/a[text()='Treeview']"); > > // Validate Copy link action. > open("Main", "AllDocs"); > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "treeview"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > assertElementPresent("//td[contains(@class, 'doc_name')]/a[text()='Treeview']"); > clickLinkWithText("copy"); > setFieldValue("targetdoc", "New.TreeviewCopy"); > @@ -107,40 +107,40 @@ > open("Main", "AllDocs"); > getSelenium().typeKeys("xpath=//input[@name='doc.space']", "New"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "treeviewcopy"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > assertElementPresent("//td[contains(@class, 'doc_name')]/a[text()='TreeviewCopy']"); > > // Validate Rename link action. > open("Main", "AllDocs"); > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "TreeviewCopy"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > clickLinkWithLocator("//tbody/tr/td/a[text()='rename']"); > setFieldValue("newPageName", "TreeviewCopyRenamed"); > clickLinkWithLocator("//input[@value='Rename']"); > open("Main", "AllDocs"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "TreeviewCopyRenamed"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > assertElementPresent("//td[contains(@class, 'doc_name')]/a[text()='TreeviewCopyRenamed']"); > > // Validate Delete link action. > open("Main", "AllDocs"); > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "Treeviewcopyrenamed"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > clickLinkWithLocator("//tbody/tr/td/a[text()='delete']"); > clickLinkWithLocator("//input[@value='yes']"); > assertTextPresent("The document has been deleted."); > open("Main", "AllDocs"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "treeview"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > assertElementNotPresent("//td[contains(@class, 'doc_name')]/a[text()='TreeviewCopyRenamed']"); > > // Validate Rights link action. > open("Main", "AllDocs"); > - assertAndWaitTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > + waitForTextContains("//span[@class='xwiki-livetable-pagination-content']", "1 2 3"); > getSelenium().typeKeys("xpath=//input[@name='doc.name']", "Treeview"); > - assertAndWaitTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > + waitForTextPresent("//span[@class='xwiki-livetable-pagination-content']", "1"); > clickLinkWithLocator("//tbody/tr/td/a[text()='rights']"); > Assert.assertEquals("Editing Rights for Tree", getTitle()); > } > > Modified: enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/DocExtraTest.java > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/DocExtraTest.java 2009-09-23 21:45:22 UTC (rev 23882) > +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/DocExtraTest.java 2009-09-24 06:58:35 UTC (rev 23883) > @@ -55,28 +55,28 @@ > open("Main", "WebHome"); > int initialScrollY = Integer.parseInt(getSelenium().getEval("window.scrollY")); > > - assertAndWaitForElement("//a[@id='Attachmentslink']"); > + waitForElement("//a[@id='Attachmentslink']"); > clickLinkWithXPath("//a[@id='Attachmentslink']", false); > waitForCondition("selenium.browserbot.findElement(\"Attachmentspane\").className.indexOf(\"empty\") == -1"); > assertElementPresent("attachform"); > int scrollY = Integer.parseInt(getSelenium().getEval("window.scrollY")); > assertEquals(initialScrollY, scrollY); > > - assertAndWaitForElement("//a[@id='Historylink']"); > + waitForElement("//a[@id='Historylink']"); > clickLinkWithXPath("//a[@id='Historylink']", false); > waitForCondition("selenium.browserbot.findElement(\"Historypane\").className.indexOf(\"empty\") == -1"); > assertElementPresent("historyform"); > scrollY = Integer.parseInt(getSelenium().getEval("window.scrollY")); > assertEquals(initialScrollY, scrollY); > > - assertAndWaitForElement("//a[@id='Informationlink']"); > + waitForElement("//a[@id='Informationlink']"); > clickLinkWithXPath("//a[@id='Informationlink']", false); > waitForCondition("selenium.browserbot.findElement(\"Informationpane\").className.indexOf(\"empty\") == -1"); > assertTextPresent("Created"); > scrollY = Integer.parseInt(getSelenium().getEval("window.scrollY")); > assertEquals(initialScrollY, scrollY); > > - assertAndWaitForElement("//a[@id='Commentslink']"); > + waitForElement("//a[@id='Commentslink']"); > clickLinkWithXPath("//a[@id='Commentslink']", false); > waitForCondition("selenium.browserbot.findElement(\"Commentspane\").className.indexOf(\"empty\") == -1"); > assertElementPresent("commentform"); > > Modified: enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/SectionTest.java > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/SectionTest.java 2009-09-23 21:45:22 UTC (rev 23882) > +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/SectionTest.java 2009-09-24 06:58:35 UTC (rev 23883) > @@ -96,7 +96,7 @@ > { > initXWiki20Env(); > // Since the section edit links are inserted with JS we need to ensure they've been generated > - assertAndWaitForElement("//div[@id='xwikicontent']/span[2]/a"); > + waitForElement("//div[@id='xwikicontent']/span[2]/a"); > // TODO: I don't understand why the following xpath expression doesn't work: > // clickLinkWithLocator("//div[@id='xwikicontent']/span/a[contains(@href, 'section=2']"); > clickLinkWithLocator("//div[@id='xwikicontent']/span[2]/a"); // Edit the second editable section > @@ -114,7 +114,7 @@ > { > initXWiki20Env(); > // Since the section edit links are inserted with JS we need to ensure they've been generated > - assertAndWaitForElement("//div[@id='xwikicontent']/span[4]/a"); > + waitForElement("//div[@id='xwikicontent']/span[4]/a"); > // TODO: I don't understand why the following xpath expression doesn't work: > // clickLinkWithLocator("//div[@id='xwikicontent']/span/a[contains(@href, 'section=4']"); > clickLinkWithLocator("//div[@id='xwikicontent']/span[4]/a"); // Edit the last editable section > @@ -132,7 +132,7 @@ > { > initXWiki20Env(); > // Since the section edit links are inserted with JS we need to ensure they've been generated > - assertAndWaitForElement("//div[@id='xwikicontent']/span[4]/a"); > + waitForElement("//div[@id='xwikicontent']/span[4]/a"); > // TODO: I don't understand why the following xpath expression doesn't work: > // clickLinkWithLocator("//div[@id='xwikicontent']/span/a[contains(@href, 'section=4']"); > clickLinkWithLocator("//div[@id='xwikicontent']/span[4]/a"); // Edit the last editable section > > Modified: enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java 2009-09-23 21:45:22 UTC (rev 23882) > +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/selenium-tests/src/test/it/com/xpn/xwiki/it/selenium/framework/AbstractXWikiTestCase.java 2009-09-24 06:58:35 UTC (rev 23883) > @@ -148,33 +148,6 @@ > assertTrue("[" + text + "] isn't present.", getSelenium().isTextPresent(text)); > } > > - public void assertAndWaitTextPresent(final String elementLocator, final String expectedValue) > - { > - new Wait() { > - public boolean until() { > - return getSelenium().getText(elementLocator).equals(expectedValue); > - } > - }.wait("element [" + elementLocator + "] not found or doesn't have the value [" + expectedValue + "]"); > - } > - > - public void assertAndWaitTextContains(final String elementLocator, final String containsValue) > - { > - new Wait() { > - public boolean until() { > - return getSelenium().getText(elementLocator).indexOf(containsValue) > -1; > - } > - }.wait("element [" + elementLocator + "] not found or doesn't contain the value [" + containsValue + "]"); > - } > - > - public void assertAndWaitBodyContains(final String containsValue) > - { > - new Wait() { > - public boolean until() { > - return getSelenium().getBodyText().indexOf(containsValue) > -1; > - } > - }.wait("Body text doesn't contain the value [" + containsValue + "]"); > - } > - > public void assertTextNotPresent(String text) > { > assertFalse("[" + text + "] is present.", getSelenium().isTextPresent(text)); > @@ -185,15 +158,6 @@ > assertTrue("[" + elementLocator + "] isn't present.", isElementPresent(elementLocator)); > } > > - public void assertAndWaitForElement(final String elementLocator) > - { > - new Wait() { > - public boolean until() { > - return getSelenium().isElementPresent(elementLocator); > - } > - }.wait("element [" + elementLocator + "] not found"); > - } > - > public void assertElementNotPresent(String elementLocator) > { > assertFalse("[" + elementLocator + "] is present.", isElementPresent(elementLocator)); > @@ -316,6 +280,42 @@ > getSelenium().waitForCondition(condition, "" + WAIT_TIME); > } > > + public void waitForTextPresent(final String elementLocator, final String expectedValue) > + { > + new Wait() { > + public boolean until() { > + return getSelenium().getText(elementLocator).equals(expectedValue); > + } > + }.wait("element [" + elementLocator + "] not found or doesn't have the value [" + expectedValue + "]"); > + } > + > + public void waitForTextContains(final String elementLocator, final String containsValue) > + { > + new Wait() { > + public boolean until() { > + return getSelenium().getText(elementLocator).indexOf(containsValue) > -1; > + } > + }.wait("element [" + elementLocator + "] not found or doesn't contain the value [" + containsValue + "]"); > + } > + > + public void waitForBodyContains(final String containsValue) > + { > + new Wait() { > + public boolean until() { > + return getSelenium().getBodyText().indexOf(containsValue) > -1; > + } > + }.wait("Body text doesn't contain the value [" + containsValue + "]"); > + } > + > + public void waitForElement(final String elementLocator) > + { > + new Wait() { > + public boolean until() { > + return getSelenium().isElementPresent(elementLocator); > + } > + }.wait("element [" + elementLocator + "] not found"); > + } > + > /** > * {@inheritDoc} > * > > Modified: enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java 2009-09-23 21:45:22 UTC (rev 23882) > +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java 2009-09-24 06:58:35 UTC (rev 23883) > @@ -1851,7 +1851,7 @@ > > protected void waitForStepToLoad(String name) > { > - assertAndWaitForElement("//*[contains(@class, '" + name + "')]"); > + waitForElement("//*[contains(@class, '" + name + "')]"); > } > > protected void typeInExplorerInput(String text) > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

2 1

Re: [xwiki-devs] [xwiki-notifications] r23882 - enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium
by Anca Luca 24 Sep '09

24 Sep '09

Hi Vincent, vmassol (SVN) wrote: > Author: vmassol > Date: 2009-09-23 23:45:22 +0200 (Wed, 23 Sep 2009) > New Revision: 23882 > > Modified: > enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java > Log: > Try to fix flickering test > > Modified: enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java 2009-09-23 21:22:39 UTC (rev 23881) > +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java 2009-09-23 21:45:22 UTC (rev 23882) > @@ -167,7 +167,7 @@ > /** > * Test the basic feature for adding a link to a new page in a new space. > * > - * @see http://jira.xwiki.org/jira/browse/XWIKI-3511 > + * @see <a href="http://jira.xwiki.org/jira/browse/XWIKI-3511">XWIKI-3511</a> > */ > public void testCreateLinkToNewPageInNewSpace() > { > @@ -931,7 +931,7 @@ > /** > * Test that editing a link with custom parameters set from wiki syntax preserves the parameters of the link. > * > - * @see http://jira.xwiki.org/jira/browse/XWIKI-3568 > + * @see <a href="http://jira.xwiki.org/jira/browse/XWIKI-3568">XWIKI-3568</a> > */ > public void testEditLinkPreservesCustomParameters() > { > @@ -988,8 +988,8 @@ > /** > * Test that quotes in link tooltips are correctly escaped. > * > - * @see http://jira.xwiki.org/jira/browse/XWIKI-3569 > - * @see http://jira.xwiki.org/jira/browse/XWIKI-3575 > + * @see <a href="http://jira.xwiki.org/jira/browse/XWIKI-3569">XWIKI-3569</a> > + * @see <a href="http://jira.xwiki.org/jira/browse/XWIKI-3569">XWIKI-3575</a> > */ > public void testQuoteInLinkTooltip() > { > @@ -1267,7 +1267,7 @@ > /** > * Test that a relative link is correctly edited. > * > - * @see http://jira.xwiki.org/jira/browse/XWIKI-3676 > + * @see <a href="http://jira.xwiki.org/jira/browse/XWIKI-3676">XWIKI-3676</a> > */ > public void testEditRelativeLink() > { > @@ -1851,7 +1851,7 @@ > > protected void waitForStepToLoad(String name) > { > - waitForCondition("selenium.isElementPresent('//*[contains(@class, \"" + name + "\")]');"); > + assertAndWaitForElement("//*[contains(@class, '" + name + "')]"); Is there any other reason for this change of waiting method besides "let's try something else"? Thanks, Anca > } > > protected void typeInExplorerInput(String text) > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

2 1

Re: [xwiki-devs] [xwiki-notifications] r23882 - enterprise/branches/xwiki-enterprise-2.0/distribution-test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium
by Vincent Massol 24 Sep '09

24 Sep '09

On Sep 24, 2009, at 8:54 AM, Marius Dumitru Florea wrote: > Hi Vincent, > > vmassol (SVN) wrote: >> Author: vmassol >> Date: 2009-09-23 23:45:22 +0200 (Wed, 23 Sep 2009) >> New Revision: 23882 >> >> Modified: >> enterprise/branches/xwiki-enterprise-2.0/distribution-test/ >> wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java >> Log: >> Try to fix flickering test >> >> Modified: enterprise/branches/xwiki-enterprise-2.0/distribution- >> test/wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/ >> LinkTest.java >> =================================================================== >> --- enterprise/branches/xwiki-enterprise-2.0/distribution-test/ >> wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java >> 2009-09-23 21:22:39 UTC (rev 23881) >> +++ enterprise/branches/xwiki-enterprise-2.0/distribution-test/ >> wysiwyg-tests/src/test/it/com/xpn/xwiki/it/selenium/LinkTest.java >> 2009-09-23 21:45:22 UTC (rev 23882) >> @@ -167,7 +167,7 @@ >> /** >> * Test the basic feature for adding a link to a new page in a >> new space. >> * >> - * @see http://jira.xwiki.org/jira/browse/XWIKI-3511 >> + * @see <a href="http://jira.xwiki.org/jira/browse/ >> XWIKI-3511">XWIKI-3511</a> >> */ >> public void testCreateLinkToNewPageInNewSpace() >> { >> @@ -931,7 +931,7 @@ >> /** >> * Test that editing a link with custom parameters set from >> wiki syntax preserves the parameters of the link. >> * >> - * @see http://jira.xwiki.org/jira/browse/XWIKI-3568 >> + * @see <a href="http://jira.xwiki.org/jira/browse/ >> XWIKI-3568">XWIKI-3568</a> >> */ >> public void testEditLinkPreservesCustomParameters() >> { >> @@ -988,8 +988,8 @@ >> /** >> * Test that quotes in link tooltips are correctly escaped. >> * >> - * @see http://jira.xwiki.org/jira/browse/XWIKI-3569 >> - * @see http://jira.xwiki.org/jira/browse/XWIKI-3575 >> + * @see <a href="http://jira.xwiki.org/jira/browse/ >> XWIKI-3569">XWIKI-3569</a> >> + * @see <a href="http://jira.xwiki.org/jira/browse/ >> XWIKI-3569">XWIKI-3575</a> >> */ >> public void testQuoteInLinkTooltip() >> { >> @@ -1267,7 +1267,7 @@ >> /** >> * Test that a relative link is correctly edited. >> * >> - * @see http://jira.xwiki.org/jira/browse/XWIKI-3676 >> + * @see <a href="http://jira.xwiki.org/jira/browse/ >> XWIKI-3676">XWIKI-3676</a> >> */ >> public void testEditRelativeLink() >> { >> @@ -1851,7 +1851,7 @@ >> >> protected void waitForStepToLoad(String name) >> { >> - waitForCondition("selenium.isElementPresent('// >> *[contains(@class, \"" + name + "\")]');"); > >> + assertAndWaitForElement("//*[contains(@class, '" + name + >> "')]"); > > I find "assertAndWait.." a bit confusing since I'm thinking that it > asserts something and then waits for the element to be present. From > the > code it looks like the method just waits for the element to be > present. > Why not simply "waitForElement"? Agreed. Thanks -Vincent

1 0

Re: [xwiki-devs] [xwiki-notifications] r23844 - enterprise/branches/xwiki-enterprise-2.0
by Vincent Massol 23 Sep '09

23 Sep '09

Hi JV, I had kept them with the last released version since I wanted to control what we release (I think it's a good thing on a release branch). If you've made a change to a dep then please update the Release plan on the release page. Thanks -Vincent On Sep 23, 2009, at 12:51 PM, jvdrean (SVN) wrote: > Author: jvdrean > Date: 2009-09-23 12:51:08 +0200 (Wed, 23 Sep 2009) > New Revision: 23844 > > Modified: > enterprise/branches/xwiki-enterprise-2.0/pom.xml > Log: > [build] Updated dependencies > > > Modified: enterprise/branches/xwiki-enterprise-2.0/pom.xml > =================================================================== > --- enterprise/branches/xwiki-enterprise-2.0/pom.xml 2009-09-23 > 10:42:56 UTC (rev 23843) > +++ enterprise/branches/xwiki-enterprise-2.0/pom.xml 2009-09-23 > 10:51:08 UTC (rev 23844) > @@ -48,29 +48,29 @@ > </modules> > <properties> >  > - <platform.tool.xar-handler.version>1.9</platform.tool.xar- > handler.version> > - <platform.tool.xar-plugin.version>1.13</platform.tool.xar- > plugin.version> > - <platform.tool.configuration.version>1.32</ > platform.tool.configuration.version> > - <platform.tool.jetty.version>1.16</platform.tool.jetty.version> > - <platform.tool.rootwebapp.version>1.2</ > platform.tool.rootwebapp.version> > - <platform.tool.packager.version>1.13</ > platform.tool.packager.version> > + <platform.tool.xar-handler.version>1.10-SNAPSHOT</ > platform.tool.xar-handler.version> > + <platform.tool.xar-plugin.version>1.14-SNAPSHOT</ > platform.tool.xar-plugin.version> > + <platform.tool.configuration.version>1.33-SNAPSHOT</ > platform.tool.configuration.version> > + <platform.tool.jetty.version>1.17-SNAPSHOT</ > platform.tool.jetty.version> > + <platform.tool.rootwebapp.version>1.3-SNAPSHOT</ > platform.tool.rootwebapp.version> > + <platform.tool.packager.version>1.14-SNAPSHOT</ > platform.tool.packager.version> > <platform.core.version>2.0-SNAPSHOT</platform.core.version> > <platform.web.version>2.0-SNAPSHOT</platform.web.version> > - <platform.panels.version>1.24</platform.panels.version> > - <platform.administration.version>1.16</ > platform.administration.version> > - <platform.scheduler.version>1.11</platform.scheduler.version> > - <platform.activitystream.version>1.4</ > platform.activitystream.version> > - <platform.watchlist.version>1.19</platform.watchlist.version> > - <platform.blog.version>1.12</platform.blog.version> > - <platform.jodatime.version>1.3</platform.jodatime.version> > - <platform.statistics.version>1.5</platform.statistics.version> > - <platform.plugin.mailsender.version>1.12</ > platform.plugin.mailsender.version> > - <platform.plugin.lucene.version>1.10</ > platform.plugin.lucene.version> > - <platform.plugin.skinx.version>1.10</ > platform.plugin.skinx.version> > - <platform.officeimporter.version>1.11</ > platform.officeimporter.version> > - <platform.webdav.version>1.2</platform.webdav.version> > - <platform.tag.version>1.7</platform.tag.version> > - <platform.wikimacrobridge.version>1.2</ > platform.wikimacrobridge.version> > + <platform.panels.version>1.25-SNAPSHOT</platform.panels.version> > + <platform.administration.version>1.17-SNAPSHOT</ > platform.administration.version> > + <platform.scheduler.version>1.12-SNAPSHOT</ > platform.scheduler.version> > + <platform.activitystream.version>1.5-SNAPSHOT</ > platform.activitystream.version> > + <platform.watchlist.version>1.20-SNAPSHOT</ > platform.watchlist.version> > + <platform.blog.version>1.13-SNAPSHOT</platform.blog.version> > + <platform.jodatime.version>1.4-SNAPSHOT</ > platform.jodatime.version> > + <platform.statistics.version>1.6-SNAPSHOT</ > platform.statistics.version> > + <platform.plugin.mailsender.version>1.13-SNAPSHOT</ > platform.plugin.mailsender.version> > + <platform.plugin.lucene.version>1.11-SNAPSHOT</ > platform.plugin.lucene.version> > + <platform.plugin.skinx.version>1.11-SNAPSHOT</ > platform.plugin.skinx.version> > + <platform.officeimporter.version>1.12-SNAPSHOT</ > platform.officeimporter.version> > + <platform.webdav.version>1.3-SNAPSHOT</platform.webdav.version> > + <platform.tag.version>1.8-SNAPSHOT</platform.tag.version> > + <platform.wikimacrobridge.version>1.3-SNAPSHOT</ > platform.wikimacrobridge.version> > </properties> > <profiles> > <profile>

1 0

Re: [xwiki-devs] [xwiki-notifications] r23823 - platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler
by Sergiu Dumitriu 22 Sep '09

22 Sep '09

jvelociter (SVN) wrote: > Author: jvelociter > Date: 2009-09-22 16:05:56 +0200 (Tue, 22 Sep 2009) > New Revision: 23823 > > Added: > platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler/XWikiServletResponseStub.java > Modified: > platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler/SchedulerPlugin.java > Log: > XASCH-39 Stub the servlet response in the scheduler's thread context A response stub and a request stub are needed for all background threads. Thus, it would be better to move them in xwiki-core. -- Sergiu Dumitriu http://purl.org/net/sergiu/

3 2

22 Sep '09

tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-09-22 15:57:53 +0200 (Tue, 22 Sep 2009) > New Revision: 23822 > > Modified: > platform/xwiki-applications/trunk/application-manager/pom.xml > platform/xwiki-applications/trunk/calendar/pom.xml > platform/xwiki-applications/trunk/ircbot/pom.xml > platform/xwiki-applications/trunk/photoalbum/pom.xml > platform/xwiki-applications/trunk/scheduler/pom.xml > platform/xwiki-applications/trunk/selenium/pom.xml > platform/xwiki-applications/trunk/statistics/pom.xml > platform/xwiki-applications/trunk/tag/pom.xml > platform/xwiki-applications/trunk/watchlist/pom.xml > platform/xwiki-applications/trunk/webdav/pom.xml > platform/xwiki-applications/trunk/wiki-macro-bridge/pom.xml > platform/xwiki-applications/trunk/wiki-manager/pom.xml > platform/xwiki-applications/trunk/workstream/pom.xml > platform/xwiki-plugins/trunk/activitystream/pom.xml > platform/xwiki-plugins/trunk/adwords/pom.xml > platform/xwiki-plugins/trunk/alexa/pom.xml > platform/xwiki-plugins/trunk/application-manager/pom.xml > platform/xwiki-plugins/trunk/calendar/pom.xml > platform/xwiki-plugins/trunk/exoplatform/pom.xml > platform/xwiki-plugins/trunk/invitationmanager/pom.xml > platform/xwiki-plugins/trunk/jodatime/pom.xml > platform/xwiki-plugins/trunk/lucene/pom.xml > platform/xwiki-plugins/trunk/mailsender/pom.xml > platform/xwiki-plugins/trunk/scheduler/pom.xml > platform/xwiki-plugins/trunk/skinx/pom.xml > platform/xwiki-plugins/trunk/spacemanager/pom.xml > platform/xwiki-plugins/trunk/swizzle/pom.xml > platform/xwiki-plugins/trunk/tag/pom.xml > platform/xwiki-plugins/trunk/watchlist/pom.xml > platform/xwiki-plugins/trunk/wiki-manager/pom.xml > platform/xwiki-plugins/trunk/xml/pom.xml > Log: > Add jira url > > Modified: platform/xwiki-applications/trunk/application-manager/pom.xml > =================================================================== > --- platform/xwiki-applications/trunk/application-manager/pom.xml 2009-09-22 13:55:08 UTC (rev 23821) > +++ platform/xwiki-applications/trunk/application-manager/pom.xml 2009-09-22 13:57:53 UTC (rev 23822) > @@ -52,6 +52,10 @@ > <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/platform/xwiki-applications/tru…</developerConnection> > <url>http://svn.xwiki.org/svnroot/xwiki/platform/xwiki-applications/trunk/applic…</url> > </scm> > + <issueManagement> > + <system>jira</system> > + <url>http://jira.xwiki.org/jira/browse/XAAM</url> > + </issueManagement> You used tabs instead of spaces. -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0