April 2012 - kune-commits - lists.ourproject.org

r1848 - in trunk: . src/main/java/cc/kune/gallery src/main/java/cc/kune/gspace/client/armor src/test/java/cc/kune/core/server/integration
by Vicente J. Ruiz Jurado 13 Apr '12

13 Apr '12

Author: vjrj_ Date: 2012-04-13 16:08:44 +0200 (Fri, 13 Apr 2012) New Revision: 1848 Added: trunk/src/main/java/cc/kune/gallery/client/ trunk/src/main/java/cc/kune/gspace/client/armor/impl/ trunk/src/test/java/cc/kune/core/server/integration/selenium/ Modified: trunk/.classpath Log: minor changes pre-release Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-04-13 14:04:35 UTC (rev 1847) +++ trunk/.classpath 2012-04-13 14:08:44 UTC (rev 1848) @@ -81,7 +81,7 @@ <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtquery/gwtquery/1.1.0/gwtquery-1.1.0-2.1.0.jar" sourcepath="M2_REPO/com/googlecode/gwtquery/gwtquery/1.1.0/gwtquery-1.1.0-2.1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtrpccommlayer/0.0.1-SNAPSHOT/gwtrpccommlayer-0.0.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtrpccommlayer/0.0.1/gwtrpccommlayer-0.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat.jar" sourcepath="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> @@ -224,4 +224,5 @@ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path=".apt_generated" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> </classpath> \ No newline at end of file

1 0

r1847 - trunk
by Vicente J. Ruiz Jurado 13 Apr '12

13 Apr '12

Author: vjrj_ Date: 2012-04-13 16:04:35 +0200 (Fri, 13 Apr 2012) New Revision: 1847 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release kune-0.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 13:58:23 UTC (rev 1846) +++ trunk/pom.xml 2012-04-13 14:04:35 UTC (rev 1847) @@ -1,10 +1,9 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>cc.kune</groupId> <artifactId>kune</artifactId> <packaging>jar</packaging> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.0</version> <name>kune</name> <description>kune free/open/libre collaboration platform</description> <url>http://kune.ourproject.org</url> @@ -758,8 +757,8 @@ </developer> </developers> <scm> - <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> - <connection>scm:svn:http://scm.ourproject.org/svnroot/kune/trunk</connection> + <url>svn://scm.ourproject.org/svnroot/kune/tags/kune-0.1.0</url> + <connection>scm:svn:svn+ssh://[email protected]/svnroot/kune/tags/kune-0.1.0</connection> </scm> <build> <plugins> @@ -1103,15 +1102,15 @@ <pluginExecutions> <pluginExecution> <pluginExecutionFilter> - <groupId></groupId> - <artifactId></artifactId> - <versionRange></versionRange> + <groupId /> + <artifactId /> + <versionRange /> <goals> - <goal></goal> + <goal /> </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1124,7 +1123,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions>

1 0

r1846 - trunk
by Vicente J. Ruiz Jurado 13 Apr '12

13 Apr '12

Author: vjrj_ Date: 2012-04-13 15:58:23 +0200 (Fri, 13 Apr 2012) New Revision: 1846 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release kune-0.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 13:37:27 UTC (rev 1845) +++ trunk/pom.xml 2012-04-13 13:58:23 UTC (rev 1846) @@ -716,7 +716,7 @@ <dependency> <groupId>com.googlecode</groupId> <artifactId>gwtrpccommlayer</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.1</version> </dependency>

1 0

r1845 - in trunk/src/test/java/cc/kune/selenium: . login spaces
by Vicente J. Ruiz Jurado 13 Apr '12

13 Apr '12

Author: vjrj_ Date: 2012-04-13 15:37:27 +0200 (Fri, 13 Apr 2012) New Revision: 1845 Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java Log: minor changes in tests Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java 2012-04-13 13:02:37 UTC (rev 1844) +++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java 2012-04-13 13:37:27 UTC (rev 1845) @@ -92,7 +92,7 @@ groupSpace.newMenuBtn.click(); sleep(2000); // FIXME move content? - groupSpace.showTutorial(3, 4, -5, 4, 4, 2, 5, 3, 6, 7, 6, 4, 4, 5, 5, 3, 3, 4, 6, 4, 3); + groupSpace.showTutorial(3, 4, 5, 4, 4, 2, -5, 3, 6, 7, 6, 4, 4, 5, 5, 3, 3, 4, 6, 4, 3); // blogs groupSpace.blogTool.click(); Modified: trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java 2012-04-13 13:02:37 UTC (rev 1844) +++ trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java 2012-04-13 13:37:27 UTC (rev 1845) @@ -46,7 +46,7 @@ final File scrFile = ((TakesScreenshot) webdriver).getScreenshotAs(OutputType.FILE); try { FileUtils.copyFile(scrFile, new File(SeleniumConstants.SCREENSHOTS_DIR + "kune-" + filename - + ".png")); + + "-sele.png")); } catch (final IOException e) { LOG.info("Cannot take the screen shot", e); } Modified: trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java 2012-04-13 13:02:37 UTC (rev 1844) +++ trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java 2012-04-13 13:37:27 UTC (rev 1845) @@ -106,9 +106,9 @@ groupSpace.addNewBuddieTextBox.click(); groupSpace.addNewBuddieTextBox.sendKeys(buddy); groupSpace.addNewBuddieTextBox.sendKeys(Keys.ARROW_DOWN); + doScreenshot("social-net"); sleep(500); groupSpace.firstFromSuggestionBox.click(); - doScreenshot("social-net"); site.confirmationOk.click(); sleep(500); groupSpace.searchEntitiesOk.click(); Modified: trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-04-13 13:02:37 UTC (rev 1844) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-04-13 13:37:27 UTC (rev 1845) @@ -133,7 +133,7 @@ @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + TasksToolConstants.TOOL_NAME) public WebElement taskTool; - @FindBy(xpath = "//div[5]/div/div/div/div[2]/div/div") + @FindBy(id = SeleniumConstants.GWTDEV + TutorialViewer.CLOSE_BTN_ID) public WebElement tutorialCloseBtn; @FindBy(id = SeleniumConstants.GWTDEV + TutorialViewer.IFRAME_ID) public WebElement tutorialFrame; @@ -160,6 +160,7 @@ + "').contentWindow.sozi.player.moveToNext();"); } getWebDriver().switchTo().defaultContent(); + sleep(500); tutorialCloseBtn.click(); }

1 0

r1844 - trunk/img/screenshots
by Vicente J. Ruiz Jurado 13 Apr '12

13 Apr '12

Author: vjrj_ Date: 2012-04-13 15:02:37 +0200 (Fri, 13 Apr 2012) New Revision: 1844 Added: trunk/img/screenshots/kune-calendar-sele.png trunk/img/screenshots/kune-chat-sele.png trunk/img/screenshots/kune-groupOptions-sele.png trunk/img/screenshots/kune-home-stats-sele.png trunk/img/screenshots/kune-inbox-sele.png trunk/img/screenshots/kune-newgroup-sele.png trunk/img/screenshots/kune-newlist-sele.png trunk/img/screenshots/kune-register-sele.png trunk/img/screenshots/kune-social-net-sele.png trunk/img/screenshots/kune-socialNetOptions-sele.png trunk/img/screenshots/kune-tutorials-sele.png Removed: trunk/img/screenshots/kune-calendar.png trunk/img/screenshots/kune-chat.png trunk/img/screenshots/kune-groupOptions.png trunk/img/screenshots/kune-home-stats.png trunk/img/screenshots/kune-inbox.png trunk/img/screenshots/kune-newgroup.png trunk/img/screenshots/kune-newlist.png trunk/img/screenshots/kune-register.png trunk/img/screenshots/kune-social-net.png trunk/img/screenshots/kune-socialNetOptions.png Log: new screenshots in english Added: trunk/img/screenshots/kune-calendar-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-calendar-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-calendar.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-chat-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-chat-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-chat.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-groupOptions-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-groupOptions-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-groupOptions.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-home-stats-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-home-stats-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-home-stats.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-inbox-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-inbox-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-inbox.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-newgroup-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-newgroup-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-newgroup.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-newlist-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-newlist-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-newlist.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-register-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-register-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-register.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-social-net-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-social-net-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-social-net.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-socialNetOptions-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-socialNetOptions-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/img/screenshots/kune-socialNetOptions.png =================================================================== (Binary files differ) Added: trunk/img/screenshots/kune-tutorials-sele.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/kune-tutorials-sele.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r1843 - in trunk: debian src/main/java/cc/kune/wave/server/kspecific
by Vicente J. Ruiz Jurado 12 Apr '12

12 Apr '12

Author: vjrj_ Date: 2012-04-12 12:35:47 +0200 (Thu, 12 Apr 2012) New Revision: 1843 Modified: trunk/debian/changelog trunk/debian/files trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java Log: Fix wave multiple operations errors Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-12 01:13:37 UTC (rev 1842) +++ trunk/debian/changelog 2012-04-12 10:35:47 UTC (rev 1843) @@ -1,3 +1,9 @@ +kune (0.1.0+b14) unstable; urgency=low + + * Fix wave multiple operations errors + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Thu, 12 Apr 2012 12:33:54 +0200 + kune (0.1.0+b13) unstable; urgency=low * Minor changes for screencasts Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-04-12 01:13:37 UTC (rev 1842) +++ trunk/debian/files 2012-04-12 10:35:47 UTC (rev 1843) @@ -1 +1 @@ -kune_0.1.0+b12_all.deb java optional +kune_0.1.0+b13_all.deb java optional Modified: trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java 2012-04-12 01:13:37 UTC (rev 1842) +++ trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java 2012-04-12 10:35:47 UTC (rev 1843) @@ -38,6 +38,7 @@ import org.waveprotocol.box.server.robots.OperationContextImpl; import org.waveprotocol.box.server.robots.OperationServiceRegistry; import org.waveprotocol.box.server.robots.util.ConversationUtil; +import org.waveprotocol.box.server.robots.util.LoggingRequestListener; import org.waveprotocol.box.server.robots.util.OperationUtil; import org.waveprotocol.box.server.waveserver.WaveletProvider; import org.waveprotocol.box.server.waveserver.WaveletProvider.SubmitRequestListener; @@ -186,7 +187,7 @@ operationRequest.addParameter(Parameter.of(ParamsProperty.MODIFY_ACTION, new DocumentModifyAction( ModifyHow.INSERT, NO_VALUES, NO_ANNOTATION_KEY, elementsIn, NO_BUNDLED_ANNOTATIONS, false))); operationRequest.addParameter(Parameter.of(ParamsProperty.INDEX, 1)); - doOperation(author, opQueue, "add gadget"); + doOperations(author, opQueue, "add gadget"); } @Override @@ -206,11 +207,12 @@ // opQueue is added (try to // fix this in WAVE) LOG.debug("Adding as participant: " + newPartWithDomain); + opQueue.addParticipantToWavelet(wavelet, newPartWithDomain); added = true; } } - doOperation(whoAdd, opQueue, "add participant"); + doOperations(whoAdd, opQueue, "add participant"); return added; } @@ -298,7 +300,9 @@ final JsonRpcResponse response = context.getResponse(reqId); if (response != null) { if (response.isError()) { - onFailure(context.getResponse(reqId).getErrorMessage()); + final String errorMessage = processErrorMessage(context.getResponse(reqId).getErrorMessage()); + onFailure(errorMessage); + throw new DefaultException(errorMessage); } else { final Object responseWaveId = response.getData().get(ParamsProperty.WAVE_ID); final Object responseWaveletId = response.getData().get(ParamsProperty.WAVELET_ID); @@ -349,43 +353,18 @@ opQueue.removeParticipantFromWavelet(wavelet, partWithDomain); } } - doOperation(whoDel, opQueue, "del participant"); + doOperations(whoDel, opQueue, "del participant"); } - private void doOperation(final String author, final OperationQueue opQueue, final String logComment) { - // FIXME: do here a callback!!! + // final SubmitRequestListener listener + private void doOperations(final String author, final OperationQueue opQueue, final String logComment) { final OperationContextImpl context = new OperationContextImpl(waveletProvider, converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); - for (final OperationRequest request : opQueue.getPendingOperations()) { - // final OperationRequest request = opQueue.getPendingOperations().get(0); - OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); - final String reqId = request.getId(); - final JsonRpcResponse response = context.getResponse(reqId); - if (response != null && response.isError()) { - onFailure(context.getResponse(reqId).getErrorMessage()); - } - OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { - @Override - public void onFailure(final String arg0) { - KuneWaveServiceDefault.this.onFailure("Wave " + logComment + " failed, onFailure: " + arg0); - } - - @Override - public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { - LOG.info("Wave " + logComment + " success: " + arg1); - } - }); - } - } - - public void doOperations(final WaveRef waveName, final String author, final OperationQueue opQueue, - final SubmitRequestListener listener) { - final OperationContextImpl context = new OperationContextImpl(waveletProvider, - converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); for (final OperationRequest req : opQueue.getPendingOperations()) { OperationUtil.executeOperation(req, operationRegistry, context, participantUtils.of(author)); } - OperationUtil.submitDeltas(context, waveletProvider, listener); + OperationUtil.submitDeltas(context, waveletProvider, new LoggingRequestListener( + org.waveprotocol.wave.util.logging.Log.get(KuneWaveServiceDefault.class))); } private void doSubmit(final SimpleArgCallback<WaveRef> onCreate, final OperationContextImpl context, @@ -416,7 +395,9 @@ final String reqId = request.getId(); final JsonRpcResponse response = context.getResponse(reqId); if (response != null && response.isError()) { - onFailure(context.getResponse(reqId).getErrorMessage()); + final String errorMessage = processErrorMessage(context.getResponse(reqId).getErrorMessage()); + onFailure(errorMessage); + throw new DefaultException(errorMessage); } else { // Duplicate code from WaveService assert response != null; @@ -485,9 +466,12 @@ } private void onFailure(final String message) { + LOG.error(message); + } + + private String processErrorMessage(final String message) { final String errorMsg = TextUtils.notEmpty(message) ? message : "Wave operation failed"; - LOG.error(errorMsg); - throw new DefaultException(errorMsg); + return errorMsg; } @Override @@ -532,7 +516,7 @@ ParamsProperty.MODIFY_QUERY, new DocumentModifyQuery(ElementType.GADGET, ImmutableMap.of(Gadget.URL, gadgetUrl.toString()), -1))); - doOperation(author, opQueue, "set gadget property"); + doOperations(author, opQueue, "set gadget property"); break; } } @@ -544,7 +528,7 @@ final Wavelet wavelet = fetchWave(waveName, author); final OperationQueue opQueue = new OperationQueue(); opQueue.setTitleOfWavelet(wavelet, title); - doOperation(author, opQueue, "set title"); + doOperations(author, opQueue, "set title"); } private Set<String> toSet(final String[] array) {

1 0

r1842 - in trunk: . debian img/screenshots img/webtemplate script src/main/java/cc/kune/core/client/auth src/main/java/cc/kune/core/client/sitebar src/main/java/cc/kune/gallery src/main/java/cc/kune/gspace/client/armor src/main/java/cc/kune/gspace/client/viewers src/test/java/cc/kune/core/server/integration src/test/java/cc/kune/selenium src/test/java/cc/kune/selenium/login src/test/java/cc/kune/selenium/spaces
by Vicente J. Ruiz Jurado 12 Apr '12

12 Apr '12

Author: vjrj_ Date: 2012-04-12 03:13:37 +0200 (Thu, 12 Apr 2012) New Revision: 1842 Added: trunk/img/webtemplate/breadcrumb-ariadna.png trunk/img/webtemplate/breadcrumb-ariadna.svg trunk/src/test/java/cc/kune/selenium/spaces/GroupSeleniumTests.java Removed: trunk/src/main/java/cc/kune/gallery/client/ trunk/src/main/java/cc/kune/gspace/client/armor/impl/ trunk/src/test/java/cc/kune/core/server/integration/selenium/ trunk/src/test/java/cc/kune/selenium/spaces/NewGroupSeleniumTests.java Modified: trunk/.classpath trunk/debian/changelog trunk/debian/files trunk/img/screenshots/kune-calendar.png trunk/img/screenshots/kune-chat.png trunk/img/screenshots/kune-groupOptions.png trunk/img/screenshots/kune-home-stats.png trunk/img/screenshots/kune-inbox.png trunk/img/screenshots/kune-newgroup.png trunk/img/screenshots/kune-newlist.png trunk/img/screenshots/kune-register.png trunk/img/screenshots/kune-social-net.png trunk/img/screenshots/kune-socialNetOptions.png trunk/script/recordScreenCast.sh trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java trunk/src/test/java/cc/kune/selenium/SeleniumConf.java trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java Log: Screencast tests updated Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/.classpath 2012-04-12 01:13:37 UTC (rev 1842) @@ -19,7 +19,7 @@ <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> + <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.15/client-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.15/client-common-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.15/client-common-src-0.3.15.jar"/> @@ -33,6 +33,7 @@ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> @@ -41,14 +42,18 @@ <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto/0.3.15/crypto-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto-src/0.3.15/crypto-src-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar" sourcepath="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gxp/google-gxp/0.2.4-beta/google-gxp-0.2.4-beta.jar" sourcepath="M2_REPO/com/google/gxp/google-gxp/0.2.4-beta/google-gxp-0.2.4-beta-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/1.7.6/groovy-all-1.7.6.jar" sourcepath="M2_REPO/org/codehaus/groovy/groovy-all/1.7.6/groovy-all-1.7.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1.jar" sourcepath="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r09/guava-gwt-r09.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0/guice-3.0-sources.jar"/> @@ -97,18 +102,23 @@ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2.jar" sourcepath="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12.jar" sourcepath="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" sourcepath="M2_REPO/jdom/jdom/1.0/jdom-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jdom/jdom/1.1/jdom-1.1.jar" sourcepath="M2_REPO/org/jdom/jdom/1.1/jdom-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar" sourcepath="M2_REPO/net/java/dev/jna/jna/3.3.0/jna-3.3.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.2.0/jruby-complete-1.2.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/0.9.4/jruby-rack-0.9.4.jar"/> + <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar" sourcepath="M2_REPO/org/json/json/20080701/json-20080701-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2.jar" sourcepath="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/> + <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar" sourcepath="M2_REPO/junit/junit/4.10/junit-4.10-sources.jar"/> @@ -117,14 +127,45 @@ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/release/maven-release-manager/2.2.2/maven-release-manager-2.2.2.jar" sourcepath="M2_REPO/org/apache/maven/release/maven-release-manager/2.2.2/maven-release-manager-2.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-release-plugin/2.2.2/maven-release-plugin-2.2.2.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-release-plugin/2.2.2/maven-release-plugin-2.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-api/1.6/maven-scm-api-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-api/1.6/maven-scm-api-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-manager-plexus/1.6/maven-scm-manager-plexus-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-manager-plexus/1.6/maven-scm-manager-plexus-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-accurev/1.6/maven-scm-provider-accurev-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-accurev/1.6/maven-scm-provider-accurev-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-bazaar/1.6/maven-scm-provider-bazaar-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-bazaar/1.6/maven-scm-provider-bazaar-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-clearcase/1.6/maven-scm-provider-clearcase-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-clearcase/1.6/maven-scm-provider-clearcase-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.6/maven-scm-provider-cvs-commons-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.6/maven-scm-provider-cvs-commons-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-cvsexe/1.6/maven-scm-provider-cvsexe-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-cvsexe/1.6/maven-scm-provider-cvsexe-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-cvsjava/1.6/maven-scm-provider-cvsjava-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-cvsjava/1.6/maven-scm-provider-cvsjava-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-git-commons/1.6/maven-scm-provider-git-commons-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-git-commons/1.6/maven-scm-provider-git-commons-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-gitexe/1.6/maven-scm-provider-gitexe-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-gitexe/1.6/maven-scm-provider-gitexe-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-hg/1.6/maven-scm-provider-hg-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-hg/1.6/maven-scm-provider-hg-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-integrity/1.6/maven-scm-provider-integrity-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-integrity/1.6/maven-scm-provider-integrity-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-perforce/1.6/maven-scm-provider-perforce-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-perforce/1.6/maven-scm-provider-perforce-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-starteam/1.6/maven-scm-provider-starteam-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-starteam/1.6/maven-scm-provider-starteam-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-svn-commons/1.6/maven-scm-provider-svn-commons-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-svn-commons/1.6/maven-scm-provider-svn-commons-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-svnexe/1.6/maven-scm-provider-svnexe-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-svnexe/1.6/maven-scm-provider-svnexe-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-synergy/1.6/maven-scm-provider-synergy-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-synergy/1.6/maven-scm-provider-synergy-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-tfs/1.6/maven-scm-provider-tfs-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-tfs/1.6/maven-scm-provider-tfs-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/scm/maven-scm-provider-vss/1.6/maven-scm-provider-vss-1.6.jar" sourcepath="M2_REPO/org/apache/maven/scm/maven-scm-provider-vss/1.6/maven-scm-provider-vss-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.15/media-src-0.3.15.jar"/> + <classpathentry kind="var" path="M2_REPO/com/mks/api/mksapi-jar/4.10.9049/mksapi-jar-4.10.9049.jar" sourcepath="M2_REPO/com/mks/api/mksapi-jar/4.10.9049/mksapi-jar-4.10.9049-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model/0.3.15/model-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.15/model-src-0.3.15.jar"/> @@ -132,10 +173,15 @@ <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" sourcepath="M2_REPO/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" sourcepath="M2_REPO/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.15/proto-msg-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/regexp/regexp/1.3/regexp-1.3.jar" sourcepath="M2_REPO/regexp/regexp/1.3/regexp-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0-sources.jar"/> @@ -150,6 +196,7 @@ <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/slide/slide-webdavlib/2.1/slide-webdavlib-2.1.jar" sourcepath="M2_REPO/slide/slide-webdavlib/2.1/slide-webdavlib-2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.1.0/smack-3.1.0.jar"/> <classpathentry kind="var" path="M2_REPO/jivesoftware/smackx/3.1.0/smackx-3.1.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> @@ -161,13 +208,20 @@ <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util/0.3.15/util-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.15/util-src-0.3.15.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.15/waveinabox-server-0.3-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/de/zeigermann/xml/xml-im-exporter/1.1/xml-im-exporter-1.1.jar"/> <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path=".apt_generated" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> </classpath> \ No newline at end of file Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/debian/changelog 2012-04-12 01:13:37 UTC (rev 1842) @@ -1,3 +1,15 @@ +kune (0.1.0+b13) unstable; urgency=low + + * Minor changes for screencasts + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Thu, 12 Apr 2012 03:06:53 +0200 + +kune (0.1.0+b12) unstable; urgency=low + + * Tutorials improved. New screenshots. + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Wed, 11 Apr 2012 23:10:38 +0200 + kune (0.1.0+b11) unstable; urgency=low * Removed some compile errors with javac (not with eclipse) Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/debian/files 2012-04-12 01:13:37 UTC (rev 1842) @@ -1 +1 @@ -kune_0.1.0+b10_all.deb java optional +kune_0.1.0+b12_all.deb java optional Modified: trunk/img/screenshots/kune-calendar.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-chat.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-groupOptions.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-home-stats.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-inbox.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-newgroup.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-newlist.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-register.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-social-net.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-socialNetOptions.png =================================================================== (Binary files differ) Added: trunk/img/webtemplate/breadcrumb-ariadna.png =================================================================== (Binary files differ) Property changes on: trunk/img/webtemplate/breadcrumb-ariadna.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/webtemplate/breadcrumb-ariadna.svg =================================================================== --- trunk/img/webtemplate/breadcrumb-ariadna.svg (rev 0) +++ trunk/img/webtemplate/breadcrumb-ariadna.svg 2012-04-12 01:13:37 UTC (rev 1842) @@ -0,0 +1,332 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="210mm" + height="297mm" + id="svg2" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="breadcrumb-ariadna.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.4394532" + inkscape:cx="166.06751" + inkscape:cy="975.24791" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1078" + inkscape:window-height="919" + inkscape:window-x="0" + inkscape:window-y="972" + inkscape:window-maximized="0" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Capa 1" + inkscape:groupmode="layer" + id="layer1"> + <image + y="69.362183" + x="63" + id="image3082" + xlink:href="data:image/png;base64,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 +" + height="81" + width="484" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#acacac;fill-opacity:1;fill-rule:evenodd;stroke:#acacac;stroke-width:16.92336655;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3085" + sodipodi:sides="3" + sodipodi:cx="178.81528" + sodipodi:cy="59.387981" + sodipodi:r1="7.010592" + sodipodi:r2="3.505296" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 185.82587,59.387981 -10.51589,6.071351 0,-12.142701 z" + inkscape:transform-center-x="-0.29722887" + transform="matrix(0.1695906,0,0,0.32941597,164.67703,85.517612)" /> + <path + transform="matrix(0.1695906,0,0,0.32941597,163.28318,85.517612)" + inkscape:transform-center-x="-0.29722689" + d="m 185.82587,59.387981 -10.51589,6.071351 0,-12.142701 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="3.505296" + sodipodi:r1="7.010592" + sodipodi:cy="59.387981" + sodipodi:cx="178.81528" + sodipodi:sides="3" + id="path3087" + style="color:#000000;fill:#fffeff;fill-opacity:1;fill-rule:evenodd;stroke:#e6e5e5;stroke-width:16.92336655;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> + <path + transform="matrix(0.1695906,0,0,0.32941597,242.67703,85.517612)" + inkscape:transform-center-x="-0.29722887" + d="m 185.82587,59.387981 -10.51589,6.071351 0,-12.142701 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="3.505296" + sodipodi:r1="7.010592" + sodipodi:cy="59.387981" + sodipodi:cx="178.81528" + sodipodi:sides="3" + id="path3100" + style="color:#000000;fill:#acacac;fill-opacity:1;fill-rule:evenodd;stroke:#acacac;stroke-width:16.92336655;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#fffeff;fill-opacity:1;fill-rule:evenodd;stroke:#e6e5e5;stroke-width:16.92336655;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3102" + sodipodi:sides="3" + sodipodi:cx="178.81528" + sodipodi:cy="59.387981" + sodipodi:r1="7.010592" + sodipodi:r2="3.505296" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 185.82587,59.387981 -10.51589,6.071351 0,-12.142701 z" + inkscape:transform-center-x="-0.29722689" + transform="matrix(0.1695906,0,0,0.32941597,241.28318,85.517612)" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#acacac;fill-opacity:1;fill-rule:evenodd;stroke:#acacac;stroke-width:16.92336655;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3104" + sodipodi:sides="3" + sodipodi:cx="178.81528" + sodipodi:cy="59.387981" + sodipodi:r1="7.010592" + sodipodi:r2="3.505296" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 185.82587,59.387981 -10.51589,6.071351 0,-12.142701 z" + inkscape:transform-center-x="-0.29722887" + transform="matrix(0.1695906,0,0,0.32941597,353.67703,85.517612)" /> + <path + transform="matrix(0.1695906,0,0,0.32941597,352.28318,85.517612)" + inkscape:transform-center-x="-0.29722689" + d="m 185.82587,59.387981 -10.51589,6.071351 0,-12.142701 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="3.505296" + sodipodi:r1="7.010592" + sodipodi:cy="59.387981" + sodipodi:cx="178.81528" + sodipodi:sides="3" + id="path3106" + style="color:#000000;fill:#fffeff;fill-opacity:1;fill-rule:evenodd;stroke:#e6e5e5;stroke-width:16.92336655;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> + </g> +</svg> Modified: trunk/script/recordScreenCast.sh =================================================================== --- trunk/script/recordScreenCast.sh 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/script/recordScreenCast.sh 2012-04-12 01:13:37 UTC (rev 1842) @@ -16,5 +16,5 @@ if [[ $? -eq 0 ]] then - recordmydesktop -x 0 -y 83 --width $RWIDTH --height $RHEIGHT --fps 25 --no-sound -o docs/screencasts/kune-screencast.ogv + recordmydesktop -x 102 -y 83 --width $RWIDTH --height $RHEIGHT --fps 25 --no-sound -o docs/screencasts/kune-screencast.ogv fi Modified: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -47,10 +47,11 @@ */ @Override public native void clickFormLogin() /*-{ - $doc.getElementById("loginsubmit").click(); $doc.getElementById("login").submit(); }-*/; + // $doc.getElementById("loginsubmit").click(); + @Override public String getNickOrEmail() { return getElementValue(USERNAME); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -46,6 +46,7 @@ @Singleton public class MyGroupsMenu extends MenuDescriptor { public static final String MENU_ID = "k-sitebar-my-group"; + public static final String NEW_GROUP_MENUITEM_ID = "k-sitebar-my-group-newmenuitem"; private final Provider<ClientFileDownloadUtils> downloadProvider; private final GotoGroupAction gotoGroupAction; private final SitebarNewGroupAction newGroupAction; @@ -108,7 +109,7 @@ addPartipationToMenu(group); } new MenuSeparatorDescriptor(MyGroupsMenu.this); - new MenuItemDescriptor(MyGroupsMenu.this, newGroupAction); + new MenuItemDescriptor(MyGroupsMenu.this, newGroupAction).withId(NEW_GROUP_MENUITEM_ID); siteOptions.refreshActions(); } else { setVisible(false); Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -59,7 +59,9 @@ interface TutorialViewerUiBinder extends UiBinder<Widget, TutorialViewer> { } + public static final String CLOSE_BTN_ID = "k-tuto-view-close-btn"; private static final int FOOTBAR = 12; + public static final String IFRAME_ID = "k-tuto-iframe"; private static TutorialViewerUiBinder uiBinder = GWT.create(TutorialViewerUiBinder.class); @UiField CloseDialogButton closeBtn; @@ -79,12 +81,14 @@ this.session = session; this.gsArmor = gsArmor; initWidget(uiBinder.createAndBindUi(this)); + frame.ensureDebugId(IFRAME_ID); stateManager.onToolChanged(true, new ToolChangedHandler() { @Override public void onToolChanged(final ToolChangedEvent event) { setTool(event.getNewTool()); } }); + closeBtn.ensureDebugId(CLOSE_BTN_ID); closeBtn.addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -109,6 +109,7 @@ public void answerOnNextPrompt(final String answer) { final Alert alert = webdriver.switchTo().alert(); alert.sendKeys(answer); + sleep(2000); alert.accept(); } @@ -120,6 +121,7 @@ public void beforeSuite() { resize(); home(); + setPosition(100, 0); SeleniumUtils.initCursor(webdriver); SeleniumUtils.showCursor(webdriver); SeleniumUtils.showCursor(webdriver, login.getAnonMsg()); @@ -242,6 +244,10 @@ } } + public void setPosition(final int x, final int y) { + webdriver.manage().window().setPosition(new Point(x, y)); + } + public void showCursor(final int x, final int y) { SeleniumUtils.showCursor(webdriver, x, y); } Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -44,7 +44,12 @@ t("Here you can create groups and collaborate within them")); // showMsg(t("Let's create a new group")); // sleep(<1000); - site.newGroupBtn.click(); + if (site.newGroupBtn.isDisplayed()) { + site.newGroupBtn.click(); + } else { + // Several groups already + // For now we use #newgroup in the future MyGroup constant + } newGroup.create(sufix, shortname, longname, description, tags, groupType); @@ -69,6 +74,7 @@ showTitleSlide(t("Group space (collaboration space) III "), t("Let's see the different tools you have available")); + // docs showTooltip(groupSpace.firstFolderItem); sleep(1500); groupSpace.openFirtsContent(); @@ -86,26 +92,35 @@ groupSpace.newMenuBtn.click(); sleep(2000); // FIXME move content? + groupSpace.showTutorial(3, 4, -5, 4, 4, 2, 5, 3, 6, 7, 6, 4, 4, 5, 5, 3, 3, 4, 6, 4, 3); + // blogs groupSpace.blogTool.click(); - groupSpace.openFirtsContent(); - sleep(2000); - groupSpace.newContentBtn.click(); - sleep(1000); - groupSpace.goParentBtn.click(); + showTooltip(groupSpace.blogTool); + sleep(3000); + groupSpace.showTutorial(3, 4, 3, 3, 6, 5, 5, 3, 3); + // groupSpace.openFirtsContent(); + // sleep(2000); + // groupSpace.newContentBtn.click(); + // sleep(1000); + // groupSpace.goParentBtn.click(); + // chats groupSpace.chatTool.click(); showTooltip(groupSpace.chatTool); - sleep(2000); - groupSpace.openFirtsContent(); - sleep(2000); - groupSpace.openRoomBtn.click(); - sleep(2000); - chat.chatIcon.click(); + sleep(3000); + groupSpace.showTutorial(3, 6, 6, 4, 7, 3, 3); + // groupSpace.openFirtsContent(); + // sleep(2000); + // groupSpace.openRoomBtn.click(); + // sleep(2000); + // chat.chatIcon.click(); + // lists groupSpace.listTool.click(); showTooltip(groupSpace.listTool); sleep(2000); + groupSpace.showTutorial(3, 4, 5, 4, 5, 6, 5, 4, 5, 7, 3, 3); groupSpace.newContainerBtn.click(); sleep(1000); groupSpace.newListText.sendKeys(t("News")); @@ -115,44 +130,52 @@ groupSpace.listSubscribeBtn.click(); sleep(2000); doScreenshot("newlist"); - groupSpace.newContentBtn.click(); sleep(1000); groupSpace.newListPostText.sendKeys(t("Welcome to this list")); sleep(1000); groupSpace.newListPostCreateBtn.click(); - sleep(1000); + sleep(3000); groupSpace.goParentBtn.click(); // sleep(2000); site.userSpaceBtn.click(); showMsg(t("All new contents are shown also in your Inbox")); - sleep(2000); - // userSpace.getFirstWave().click(); - // sleep(1000); + sleep(3000); + userSpace.getFirstWave().click(); + sleep(3000); site.groupSpaceBtn.click(); + // events groupSpace.eventTool.click(); showTooltip(groupSpace.eventTool); sleep(2000); doScreenshot("calendar"); + groupSpace.showTutorial(3, 5, 6, 7, 3, 5, 3, 3, 3); // groupSpace.openFirtsContent(); // sleep(2000); + // tasks groupSpace.taskTool.click(); showTooltip(groupSpace.taskTool); sleep(2000); - groupSpace.openFirtsContent(); - sleep(2000); - doScreenshot("tasks"); - groupSpace.openFirtsContent(); - sleep(2000); + groupSpace.showTutorial(3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 3); + // groupSpace.openFirtsContent(); + // sleep(2000); + // doScreenshot("tasks"); + // groupSpace.openFirtsContent(); + // sleep(2000); + // wiki groupSpace.wikiTool.click(); showTooltip(groupSpace.wikiTool); sleep(2000); - groupSpace.openFirtsContent(); - sleep(3000); + groupSpace.showTutorial(3, 5, 3, 3, 3); + // groupSpace.openFirtsContent(); + // sleep(3000); + + // // barters + // groupSpace.showTutorial(3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3); } protected void login() { Modified: trunk/src/test/java/cc/kune/selenium/SeleniumConf.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -56,7 +56,7 @@ public static final Driver DRIVER = Driver.firefox; /* Configure this for use other lang, site, or driver */ - public static final Lang LANG = Lang.es; + public static final Lang LANG = Lang.en; public static final Site SITE = Site.demo; public static final int TIMEOUT = 25; Modified: trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/SeleniumUtils.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -87,7 +87,7 @@ showCursor(webdriver); } - private static JavascriptExecutor jsExec(final WebDriver webdriver) { + public static JavascriptExecutor jsExec(final WebDriver webdriver) { return (JavascriptExecutor) webdriver; } Modified: trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/login/LoginPageObject.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -34,11 +34,11 @@ private WebElement anonWelcome; @FindBy(id = SeleniumConstants.GWTDEV + SignInPanel.CREATE_ONE) protected WebElement createOneLink; - @FindBy(id = SignInForm.PASSWORD_FIELD_ID + SeleniumConstants.INPUT) + @FindBy(id = SignInForm.PASSWORD_FIELD_ID) private WebElement passwd; @FindBy(id = SeleniumConstants.GWTDEV + SignInPanel.SIGN_IN_BUTTON_ID) private WebElement signInButton; - @FindBy(id = SignInForm.USER_FIELD_ID + SeleniumConstants.INPUT) + @FindBy(id = SignInForm.USER_FIELD_ID) private WebElement user; public LoginPageObject() { Modified: trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -38,6 +38,7 @@ final String shortName = t(shortNameUntrans); final String longName = t(longNameUntrans); final String email = t(emailUntrans); + final String buddy = "luther"; SeleniumUtils.fastSpeed(false); // 15 chars, the limit, so we don't use shortName final String sufix = getTempString(); @@ -70,8 +71,16 @@ userSpace.getFirstWave().click(); sleep(2000); userSpace.getNewWave().click(); + + userSpace.getAddParcipant().click(); + sleep(1000); + answerOnNextPrompt(buddy); + sleep(3000); + showMsg(t("where you can compose personal messages...")); + sleep(1000); showMsg(t("but also create contents to publish later")); + sleep(1000); userSpace.rootBlipText().sendKeys(t("Congratulations for your report\n\n")); sleep(1000); userSpace.getCursive().click(); @@ -82,12 +91,9 @@ userSpace.rootBlipText().sendKeys(t("Best\n\nJane")); sleep(3000); userSpace.getRootEdit().click(); - userSpace.getAddParcipant().click(); - sleep(1000); - answerOnNextPrompt("admin"); + sleep(3000); + doScreenshot("inbox"); sleep(2000); - doScreenshot("inbox"); - sleep(3000); // group space showTitleSlide(t("Your personal public space"), t("here you can have your blog, etc")); @@ -98,7 +104,7 @@ sleep(1000); groupSpace.addBuddieBtn.click(); groupSpace.addNewBuddieTextBox.click(); - groupSpace.addNewBuddieTextBox.sendKeys("admin"); + groupSpace.addNewBuddieTextBox.sendKeys(buddy); groupSpace.addNewBuddieTextBox.sendKeys(Keys.ARROW_DOWN); sleep(500); groupSpace.firstFromSuggestionBox.click(); @@ -116,7 +122,7 @@ chat.show(); sleep(2000); - final XmppURI jid = XmppURI.jid("luther" + "@" + SeleniumConf.SITE.getDomain()); + final XmppURI jid = XmppURI.jid(buddy + "@" + SeleniumConf.SITE.getDomain()); final String jids = jid.toString(); // chat.getRosterItem("", jids).click(); Copied: trunk/src/test/java/cc/kune/selenium/spaces/GroupSeleniumTests.java (from rev 1836, trunk/src/test/java/cc/kune/selenium/spaces/NewGroupSeleniumTests.java) =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSeleniumTests.java (rev 0) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSeleniumTests.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -0,0 +1,69 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.selenium.spaces; + +import org.testng.annotations.Test; + +import cc.kune.core.client.state.SiteTokens; +import cc.kune.core.shared.dto.GroupType; +import cc.kune.selenium.KuneSeleniumTest; +import cc.kune.selenium.SeleniumConstants; +import cc.kune.selenium.SeleniumUtils; + +public class GroupSeleniumTests extends KuneSeleniumTest { + + @Test(dataProvider = "newGroups") + public void newGroupTests(final String shortname, final String longname, final String description, + final String tags, final GroupType groupType) { + SeleniumUtils.fastSpeed(false); + login.assertIsDisconnected(); + + login.signIn(SeleniumConstants.USER_SHORNAME, SeleniumConstants.USER_PASSWD); + login.assertIsConnectedAs(SeleniumConstants.USER_SHORNAME); + + final String sufix = getTempString(); + + gotoToken(SiteTokens.NEW_GROUP); + + groupCreation(shortname, longname, description, tags, groupType, sufix); + + logout(); + + login.assertIsDisconnected(); + } + + @Test + public void testTutorial() { + SeleniumUtils.fastSpeed(false); + login.assertIsDisconnected(); + + login.signIn(SeleniumConstants.USER_SHORNAME, SeleniumConstants.USER_PASSWD); + login.assertIsConnectedAs(SeleniumConstants.USER_SHORNAME); + + site.groupSpaceBtn.click(); + + groupSpace.docTool.click(); + groupSpace.showTutorial(4, 5, 4, 4, 2, 5, 3, 6, 7, 6, 4, 4, 5, 5, 3, 3, 4, 6, 4, 3); + + logout(); + login.assertIsDisconnected(); + } + +} Modified: trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -19,6 +19,7 @@ */ package cc.kune.selenium.spaces; +import org.openqa.selenium.Point; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; @@ -35,6 +36,7 @@ import cc.kune.gspace.client.actions.NewContainerBtn; import cc.kune.gspace.client.actions.NewContentBtn; import cc.kune.gspace.client.actions.NewMenuProvider; +import cc.kune.gspace.client.actions.TutorialBtn; import cc.kune.gspace.client.options.GroupOptionsPanel; import cc.kune.gspace.client.options.GroupOptionsPresenter; import cc.kune.gspace.client.options.license.EntityOptDefLicensePanel; @@ -43,6 +45,7 @@ import cc.kune.gspace.client.options.tools.EntityOptToolsPanel; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.viewers.FolderViewerAsTablePanel; +import cc.kune.gspace.client.viewers.TutorialViewer; import cc.kune.gspace.client.viewers.items.FolderItemWidget; import cc.kune.lists.client.actions.NewListAction; import cc.kune.lists.client.actions.NewListPostAction; @@ -62,17 +65,21 @@ public WebElement addNewBuddieTextBox; @FindBy(id = SeleniumConstants.GWTDEV + AddEntityToThisGroupAction.ADD_NEW_MEMBER_TEXTBOX) public WebElement addNewMemberTextBox; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + BlogsToolConstants.TOOL_NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + + BlogsToolConstants.TOOL_NAME) public WebElement blogTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ChatToolConstants.TOOL_NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + + ChatToolConstants.TOOL_NAME) public WebElement chatTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + DocsToolConstants.TOOL_NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + + DocsToolConstants.TOOL_NAME) public WebElement docTool; @FindBy(xpath = "//div[@id='gwt-debug-k-cnt-title-id']/div/span") public WebElement entityTitle; @FindBy(xpath = "//div[@id='gwt-debug-k-cnt-title-id']/div/input") public WebElement entityTitleTextarea; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + EventsToolConstants.TOOL_NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + + EventsToolConstants.TOOL_NAME) public WebElement eventTool; @FindBy(xpath = "//td/img") public WebElement firstAvatarOfGroup; @@ -98,7 +105,8 @@ public WebElement groupOptionsTools; @FindBy(id = SeleniumConstants.GWTDEV + SubscribeToListBtn.ID) public WebElement listSubscribeBtn; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ListsToolConstants.TOOL_NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + + ListsToolConstants.TOOL_NAME) public WebElement listTool; @FindBy(id = SeleniumConstants.GWTDEV + NewContainerBtn.BTN_ID) public WebElement newContainerBtn; @@ -118,15 +126,41 @@ public WebElement openRoomBtn; @FindBy(id = SeleniumConstants.GWTDEV + EntitySearchPanel.OK_ID) public WebElement searchEntitiesOk; + @FindBy(id = SeleniumConstants.GWTDEV + TutorialBtn.INFO_CONTAINER_ID) + public WebElement showTutorialBtn; @FindBy(xpath = "//div[3]/div/button") public WebElement socialNetOptions; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + TasksToolConstants.TOOL_NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + + TasksToolConstants.TOOL_NAME) public WebElement taskTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + WikiToolConstants.TOOL_NAME) + @FindBy(xpath = "//div[5]/div/div/div/div[2]/div/div") + public WebElement tutorialCloseBtn; + @FindBy(id = SeleniumConstants.GWTDEV + TutorialViewer.IFRAME_ID) + public WebElement tutorialFrame; + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + + WikiToolConstants.TOOL_NAME) public WebElement wikiTool; public void openFirtsContent() { SeleniumUtils.doubleClick(getWebDriver(), firstFolderItem); } + public void showTutorial(final int... slidesSegs) { + showTutorialBtn.click(); + final Point showLocation = showTutorialBtn.getLocation(); + SeleniumUtils.showCursor(getWebDriver(), showLocation.getX() - 50, showLocation.getY() + 50); + for (int segs : slidesSegs) { + if (segs < 0) { + SeleniumUtils.doScreenshot(getWebDriver(), "tutorials"); + segs = segs * -1; + } + sleep(segs * 1000); + SeleniumUtils.jsExec(getWebDriver()).executeScript( + "document.getElementById('" + SeleniumConstants.GWTDEV + TutorialViewer.IFRAME_ID + + "').contentWindow.sozi.player.moveToNext();"); + } + getWebDriver().switchTo().defaultContent(); + tutorialCloseBtn.click(); + } + } Deleted: trunk/src/test/java/cc/kune/selenium/spaces/NewGroupSeleniumTests.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/NewGroupSeleniumTests.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/spaces/NewGroupSeleniumTests.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -1,49 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.selenium.spaces; - -import org.testng.annotations.Test; - -import cc.kune.core.shared.dto.GroupType; -import cc.kune.selenium.KuneSeleniumTest; -import cc.kune.selenium.SeleniumConstants; -import cc.kune.selenium.SeleniumUtils; - -public class NewGroupSeleniumTests extends KuneSeleniumTest { - - @Test(dataProvider = "newGroups") - public void basicSignIn(final String shortname, final String longname, final String description, - final String tags, final GroupType groupType) { - SeleniumUtils.fastSpeed(false); - login.assertIsDisconnected(); - - login.signIn(SeleniumConstants.USER_SHORNAME, SeleniumConstants.USER_PASSWD); - login.assertIsConnectedAs(SeleniumConstants.USER_SHORNAME); - - final String sufix = getTempString(); - - groupCreation(shortname, longname, description, tags, groupType, sufix); - - logout(); - - login.assertIsDisconnected(); - } - -} Modified: trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -23,6 +23,7 @@ import org.openqa.selenium.support.FindBy; import cc.kune.core.client.notify.confirm.UserConfirmPanel; +import cc.kune.core.client.sitebar.MyGroupsMenu; import cc.kune.core.client.sitebar.SitebarNewGroupLink; import cc.kune.core.client.sitebar.search.SitebarSearchPanel; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; @@ -39,6 +40,10 @@ public WebElement groupSpaceBtn; @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.HOME_SPACE_ID) public WebElement homeSpaceBtn; + @FindBy(id = SeleniumConstants.GWTDEV + MyGroupsMenu.MENU_ID) + public WebElement myGroupMenu; + @FindBy(id = SeleniumConstants.GWTDEV + MyGroupsMenu.NEW_GROUP_MENUITEM_ID) + public WebElement myGroupMenuNewGroupItem; @FindBy(id = SeleniumConstants.GWTDEV + SitebarNewGroupLink.NEW_GROUP_BTN_ID) public WebElement newGroupBtn; @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.PUBLIC_SPACE_ID) Modified: trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java 2012-04-11 12:58:29 UTC (rev 1841) +++ trunk/src/test/java/cc/kune/selenium/spaces/UserSpacePageObject.java 2012-04-12 01:13:37 UTC (rev 1842) @@ -36,12 +36,6 @@ @FindBy(xpath = "//div[3]/div/div/div[2]/div/div/div[3]") private WebElement firstReplyTitlebar; - @FindBy(xpath = "//div[3]/div/div/span[2]") - private WebElement firstWave; - - @FindBy(xpath = "//div[2]/div[2]/div[4]") - private WebElement newWave; - @FindBy(xpath = "//div[10]/div/div/div/div[3]/div/div[2]") private WebElement replyRootBlip; @@ -70,7 +64,7 @@ } public WebElement getFirstWave() { - return findElement(By.xpath("//div[3]/div[4]/div")); + return findElement(By.xpath("//div[3]/div/div/span")); } public WebElement getNewWave() {

1 0

r1841 - trunk
by Vicente J. Ruiz Jurado 11 Apr '12

11 Apr '12

Author: vjrj_ Date: 2012-04-11 14:58:29 +0200 (Wed, 11 Apr 2012) New Revision: 1841 Modified: trunk/pom.xml Log: fixed maven error Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 12:37:35 UTC (rev 1840) +++ trunk/pom.xml 2012-04-11 12:58:29 UTC (rev 1841) @@ -452,13 +452,13 @@ <artifactId>liquibase-plugin</artifactId> <version>1.8.1.0</version> </dependency> - - - - - - - +  +  +  +  +  +  +   <dependency> <groupId>org.jukito</groupId> @@ -718,25 +718,18 @@ <artifactId>gwtrpccommlayer</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> -  -  -  -  -  -  - <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.2.2</version> - <type>maven-plugin</type> - <configuration> -  - <releaseProfiles>release</releaseProfiles> - <goals>assembly:assembly -P production</goals> - </configuration> - </dependency> +  +  +  +  +  +  + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.2.2</version> + <type>maven-plugin</type> + </dependency> </dependencies> <distributionManagement> <repository> @@ -1054,7 +1047,7 @@ </archive> </configuration> <executions> - <execution> + <execution> <id>common</id> <phase>package</phase> <goals> @@ -1305,6 +1298,15 @@ <artifactId>findbugs-maven-plugin</artifactId> <version>2.3.2</version> </plugin> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <version>2.2.2</version> + <configuration> +  + <releaseProfiles>release</releaseProfiles> + <goals>assembly:assembly -P production</goals> + </configuration> + </plugin> </plugins> </reporting> </project>

1 0

r1840 - in trunk: . debian src/main/java/cc/kune/core/public
by Vicente J. Ruiz Jurado 11 Apr '12

11 Apr '12

Author: vjrj_ Date: 2012-04-11 14:37:35 +0200 (Wed, 11 Apr 2012) New Revision: 1840 Added: trunk/README.wave-import Modified: trunk/CREDITS trunk/debian/docs trunk/pom.xml trunk/src/main/java/cc/kune/core/public/about.html Log: Changelog updated. README.wave-import Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2012-04-11 04:24:26 UTC (rev 1839) +++ trunk/CREDITS 2012-04-11 12:37:35 UTC (rev 1840) @@ -25,5 +25,6 @@ * Johnattan Rupire, William Austen Bradbury and Rana Hassan for their web contributions and translations * Bastien Guerry for his French translation and his ideas, feedback, support and inspiration +* Mónica Escudero for her Catalan translation * and <URL:http://ourproject.org> and again <URL:http://xsto.info> and <URL:http://iepala.es> for sharing with us their resources Added: trunk/README.wave-import =================================================================== --- trunk/README.wave-import (rev 0) +++ trunk/README.wave-import 2012-04-11 12:37:35 UTC (rev 1840) @@ -0,0 +1,49 @@ + +Import all the waves in which specified user is a participant. +Wave Id's and wavelet Id's remain same, except domains. +Domains of participants are renamed to Wiab server domain. +Attachments are not imported now. + +Get Google OAuth application Id: + + - Go to https://code.google.com/apis/console/. + - Create a new project. + - Click on "API Access" on the left, then "Create an OAuth2.0 client id". + - Enter a product name. Leave the logo empty. Click "Next". + - Application type: Installed application. + - Click "Create client ID". + +Make sure to you have compiled WIAB by running the following command: +ant dist + +Export waves from GWave to JSon files: + + Run + ./run-export.sh <ClientId> <ClientSecret> <ParticipantId> <ExportDir> [-i IncludeWavesList] [-e ExcludeWavesList] + Parameters are: + ClientId - Google application Id; + ClientSecret - Google application secret; + ParticipantId - Wave participant name, for example vasya(a)googlewave.com; + ExportDir - directory to write export files; + IncludeWavesList - optional, list of waves to include, + for example googlewave.com!w+9aLgzbTk0u googlewave.com!w+Cl2NTbgKCW; + ExcludeWavesList - optional, list of waves to exclude. + + Note: For Linux machines you might need to prepend the "!" with "\", i.e. + googlewave.com!w+9aLgzbTk0u -> googlewave.com\!w+9aLgzbTk0u + + Copy/paste URL from console to browser. Press Enter. + Copy/paste URL received code from browser to console. + +Import waves to WIAB: + + Enable the import waves feature in server.config + enable_import = true + + Run + ./run-import.sh <WaveServerImportUrl> <WaveServerDomain> <ExportDir> + Parameters are: + WaveServerImportUrl - URL of import service, for example http://localhost:9898/import; + WaveServerDomain - domain of WIAB server, for example local.net; + ExportDir - directory with exported waves. + Modified: trunk/debian/docs =================================================================== --- trunk/debian/docs 2012-04-11 04:24:26 UTC (rev 1839) +++ trunk/debian/docs 2012-04-11 12:37:35 UTC (rev 1840) @@ -5,4 +5,5 @@ TROUBLESHOOT DEV-GUIDE TODO -ChangeLog \ No newline at end of file +ChangeLog +README.wave-import \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 04:24:26 UTC (rev 1839) +++ trunk/pom.xml 2012-04-11 12:37:35 UTC (rev 1840) @@ -729,6 +729,13 @@ <artifactId>maven-release-plugin</artifactId> <version>2.2.2</version> <type>maven-plugin</type> + <configuration> +  + <releaseProfiles>release</releaseProfiles> + <goals>assembly:assembly -P production</goals> + </configuration> </dependency> </dependencies> <distributionManagement> Modified: trunk/src/main/java/cc/kune/core/public/about.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/about.html 2012-04-11 04:24:26 UTC (rev 1839) +++ trunk/src/main/java/cc/kune/core/public/about.html 2012-04-11 12:37:35 UTC (rev 1840) @@ -24,7 +24,7 @@ </img> </a> </span> -<p>Version 0.1.0-SNAPSHOT (r1836+c4)</p> +<p>Version 0.1.0-SNAPSHOT (r1836+c6)</p> <h1><a name="section_1">CREDITS</a></h1> <h2><a name="section_1_1">Authors</a></h2> @@ -50,6 +50,7 @@ </li><li>Johnattan Rupire, William Austen Bradbury and Rana Hassan for their web contributions and translations </li><li>Bastien Guerry for his French translation and his ideas, feedback, support and inspiration + </li><li>Mónica Escudero for her Catalan translation </li><li>and <a href="http://ourproject.org">http://ourproject.org</a> and again <a href="http://xsto.info">http://xsto.info</a> and <a href="http://iepala.es">http://iepala.es</a> for sharing with us their resources </li></ul>

1 0

r1839 - in trunk: . debian src/main/java/cc/kune/core/server/auth src/main/java/cc/kune/core/server/persist src/main/java/cc/kune/core/server/rack/filters/rest
by Vicente J. Ruiz Jurado 11 Apr '12

11 Apr '12

Author: vjrj_ Date: 2012-04-11 06:24:26 +0200 (Wed, 11 Apr 2012) New Revision: 1839 Modified: trunk/TODO trunk/debian/changelog trunk/pom.xml trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java Log: Removed some compile errors with javac (not with eclipse) Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/TODO 2012-04-11 04:24:26 UTC (rev 1839) @@ -99,6 +99,14 @@ | New folder | | | | | |------------+--------+---------+---------+-----------| +** mvn compile fails depending of java version while compiles in eclipse: +http://stackoverflow.com/a/2858811 +http://jenkins.361315.n4.nabble.com/jenkins-maven-build-requires-specific-jdk-1-6-version-td3931835.html +http://maven.40175.n5.nabble.com/Freaking-out-javac-works-maven-compiler-plugin-does-not-td126247.html +https://bugs.eclipse.org/bugs/show_bug.cgi?id=340506 +https://bugs.eclipse.org/bugs/show_bug.cgi?id=333011 +http://stackoverflow.com/questions/5633424/is-it-a-eclipse-or-maven-compiler-plugin-bug-the-generics-class-cast-issue +https://www.google.com/search?client=ubuntu&channel=fs&q=incompatible+types++maven+compile&ie=utf-8&oe=utf-8#hl=es&client=ubuntu&channel=fs&sclient=psy-ab&q=incompatible+types++maven+compile+eclipse&oq=incompatible+types++maven+compile+eclipse&aq=f&aqi=&aql=&gs_l=serp.3...1778611l1779979l0l1780183l8l5l0l0l0l0l232l232l2-1l1l0.frgbld.&pbx=1&bav=on.2,or.r_gc.r_pw.r_cp.r_qf.,cf.osb&fp=e35c25ea2c4a1e38 ** setui/root/port 80 [ ] http://wiki.eclipse.org/Jetty/Howto/Port80#Configuring_Jetty.27s_SetUID_Fea… [ ] https://github.com/disconnect/apache-websocket Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/debian/changelog 2012-04-11 04:24:26 UTC (rev 1839) @@ -1,3 +1,9 @@ +kune (0.1.0+b11) unstable; urgency=low + + * Removed some compile errors with javac (not with eclipse) + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Wed, 11 Apr 2012 06:21:37 +0200 + kune (0.1.0+b10) unstable; urgency=low * #tutorial hash, tutorial close, subviews (in the future for content Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/pom.xml 2012-04-11 04:24:26 UTC (rev 1839) @@ -724,6 +724,12 @@    + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.2.2</version> + <type>maven-plugin</type> + </dependency> </dependencies> <distributionManagement> <repository> @@ -753,6 +759,7 @@ </developers> <scm> <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> + <connection>scm:svn:http://scm.ourproject.org/svnroot/kune/trunk</connection> </scm> <build> <plugins> Modified: trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java 2012-04-11 04:24:26 UTC (rev 1839) @@ -39,15 +39,17 @@ @BindingAnnotation @Retention(RetentionPolicy.RUNTIME) public @interface Authorizated { + // Why full package? + // http://code.google.com/p/projectlombok/issues/detail?id=121 - AccessRol accessRolRequired() default AccessRol.Viewer; + AccessRol accessRolRequired() default cc.kune.core.shared.domain.AccessRol.Viewer; /** * If the action is over a "group", "tool", "container" or over the content. * * @return */ - ActionLevel actionLevel() default ActionLevel.content; + ActionLevel actionLevel() default cc.kune.core.server.auth.ActionLevel.content; boolean mustCheckMembership() default true; Modified: trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java 2012-04-11 04:24:26 UTC (rev 1839) @@ -44,5 +44,5 @@ * A list of exceptions to rollback on, if thrown by the transactional method. * These exceptions are propagated correctly after a rollback. */ - Class<? extends Exception>[] rollbackOn() default RuntimeException.class; + Class<? extends Exception>[] rollbackOn() default java.lang.RuntimeException.class; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java 2012-04-11 04:24:26 UTC (rev 1839) @@ -27,7 +27,9 @@ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface REST { - String format() default RESTMethod.FORMAT_JSON; + // Why full package? + // http://code.google.com/p/projectlombok/issues/detail?id=121 + String format() default cc.kune.core.server.rack.filters.rest.RESTMethod.FORMAT_JSON; - String[] params(); + String[] params(); }

1 0