You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/02/09 06:55:11 UTC
svn commit: r1242224 - in /myfaces/tobago/branches/tobago-tree-table: ./
tobago-example/tobago-example-addressbook/
tobago-example/tobago-example-assembly/
tobago-example/tobago-example-blank/ tobago-example/tobago-example-data/
tobago-example/tobago-e...
Author: lofwyr
Date: Thu Feb 9 05:55:10 2012
New Revision: 1242224
URL: http://svn.apache.org/viewvc?rev=1242224&view=rev
Log:
merged from trunk
Modified:
myfaces/tobago/branches/tobago-tree-table/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/MultiSuffixSeleniumTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml
Propchange: myfaces/tobago/branches/tobago-tree-table/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 9 05:55:10 2012
@@ -1 +1 @@
-/myfaces/tobago/trunk:1226794-1241924
+/myfaces/tobago/trunk:1226794-1242223
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml Thu Feb 9 05:55:10 2012
@@ -24,7 +24,8 @@
</parent>
<artifactId>tobago-example-addressbook</artifactId>
<packaging>war</packaging>
- <name>Tobago Example Addressbook (Simple, but full functional application with persistence)</name>
+ <name>Tobago Example Addressbook</name>
+ <description>A simple, but full functional application with persistence.</description>
<build>
<finalName>tobago-example-addressbook</finalName>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml Thu Feb 9 05:55:10 2012
@@ -20,7 +20,7 @@
<artifactId>tobago-example-assembly</artifactId>
<packaging>pom</packaging>
<name>Tobago Example Assembly</name>
- <description>Tobago Example Assembly (Helps to build the Tobago releases)</description>
+ <description>Helps to build the Tobago releases,</description>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml Thu Feb 9 05:55:10 2012
@@ -24,7 +24,9 @@
</parent>
<artifactId>tobago-example-blank</artifactId>
<packaging>war</packaging>
- <name>Tobago Example Blank (A minimal Tobago application)</name>
+ <name>Tobago Example Blank</name>
+ <description>A minimal Tobago application.</description>
+
<build>
<finalName>tobago-example-blank</finalName>
</build>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml Thu Feb 9 05:55:10 2012
@@ -24,7 +24,8 @@
</parent>
<artifactId>tobago-example-data</artifactId>
<packaging>jar</packaging>
- <name>Tobago Example Data (to use in other examples)</name>
+ <name>Tobago Example Data</name>
+ <description>Data to use in the other examples.</description>
<dependencies>
<dependency>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml Thu Feb 9 05:55:10 2012
@@ -25,6 +25,8 @@
<artifactId>tobago-example-demo</artifactId>
<packaging>war</packaging>
<name>Tobago Example Demo</name>
+ <description>Demonstration and documentation application.</description>
+
<properties>
<openwebbeans.version>1.1.2</openwebbeans.version>
<myfaces-extcdi.version>1.0.1</myfaces-extcdi.version>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/MultiSuffixSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/MultiSuffixSeleniumTest.java?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/MultiSuffixSeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/MultiSuffixSeleniumTest.java Thu Feb 9 05:55:10 2012
@@ -36,10 +36,6 @@ public abstract class MultiSuffixSeleniu
getSelenium().open(createUrl(urlFragment + suffix));
}
- protected void sleep() throws InterruptedException {
- Thread.sleep(5000L);
- }
-
@Parameterized.Parameters
public static Collection<Object[]> findFormats() {
return Arrays.asList(
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java Thu Feb 9 05:55:10 2012
@@ -34,6 +34,7 @@ public class LinkAttributeSeleniumTest e
public void testInternalLinkWithSlash() {
open("/tc/button/link-attribute.");
getSelenium().click("page:button-internal-link-with-slash");
+ getSelenium().waitForPageToLoad("5000");
Assert.assertEquals(
getHtmlSource(),
"A simple page for the resource test (static).", getSelenium().getText("//html/body"));
@@ -43,6 +44,7 @@ public class LinkAttributeSeleniumTest e
public void testInternalLinkWithoutSlash() {
open("/tc/button/link-attribute.");
getSelenium().click("page:button-internal-link-without-slash");
+ getSelenium().waitForPageToLoad("5000");
Assert.assertEquals(
getHtmlSource(),
"A simple page for the resource test (static).", getSelenium().getText("//html/body"));
@@ -52,8 +54,7 @@ public class LinkAttributeSeleniumTest e
public void testExternalLink() throws InterruptedException {
open("/tc/button/link-attribute.");
getSelenium().click("page:button-external-link");
- // XXX This sleep call is not nice...
- sleep();
+ getSelenium().waitForPageToLoad("5000");
// go to the apache home page
Assert.assertTrue(
getHtmlSource(),
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java Thu Feb 9 05:55:10 2012
@@ -34,8 +34,7 @@ public class ResourceAttributeSeleniumTe
public void testHtmlResource() throws InterruptedException {
open("/tc/button/resource-attribute.");
getSelenium().click("page:button-html-resource");
- // XXX This sleep call is not nice...
- sleep();
+ getSelenium().waitForPageToLoad("5000");
Assert.assertEquals(getHtmlSource(),
"Eine einfache Seite für den Resourcen-Test (statisch).", getSelenium().getText("//html/body"));
}
@@ -44,8 +43,7 @@ public class ResourceAttributeSeleniumTe
public void testXhtmlResource() throws InterruptedException {
open("/tc/button/resource-attribute.");
getSelenium().click("page:button-xhtml-resource");
- // XXX This sleep call is not nice...
- sleep();
+ getSelenium().waitForPageToLoad("5000");
Assert.assertTrue(getHtmlSource(),
getSelenium().getText("//html/body").contains("Eine einfache Seite für den Resourcen-Test (dynamisch)."));
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml Thu Feb 9 05:55:10 2012
@@ -23,7 +23,8 @@
<version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-example</artifactId>
- <name>Tobago Theme Example (Show how to write an own theme)</name>
+ <name>Tobago Theme Example</name>
+ <description>Show how to write an own theme.</description>
<build>
<plugins>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml Thu Feb 9 05:55:10 2012
@@ -22,9 +22,10 @@
<artifactId>tobago-extension</artifactId>
<version>1.5.3-SNAPSHOT</version>
</parent>
+ <artifactId>tobago-deprecation</artifactId>
<packaging>jar</packaging>
<name>Tobago Deprecation</name>
- <artifactId>tobago-deprecation</artifactId>
+ <description>Helps to migrate from Tobago 1.0.x to 1.5.x. Should not be used in production.</description>
<dependencies>
<dependency>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml Thu Feb 9 05:55:10 2012
@@ -25,7 +25,7 @@
<artifactId>tobago-taglib-extension</artifactId>
<packaging>jar</packaging>
<name>Tobago Taglib Extension</name>
- <description>Tobago Taglib Extension contains the tobago extension tags (tx)</description>
+ <description>Contains the Tobago extension tags (tx).</description>
<build>
<plugins>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml Thu Feb 9 05:55:10 2012
@@ -26,7 +26,7 @@
<name>Tobago JSF Compatibility</name>
<description>
Tobago JSF 1.1-1.2 Compatibility Bridge
- (makes Tobago independent from differences between JSF 1.1 and JSF 1.2)</description>
+ (makes Tobago independent from differences between JSF 1.1 and JSF 1.2).</description>
<artifactId>tobago-jsf-compat</artifactId>
<build>
<plugins>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml Thu Feb 9 05:55:10 2012
@@ -25,7 +25,6 @@
<artifactId>tobago-tool-annotation</artifactId>
<packaging>jar</packaging>
<name>Tobago Tool Annotation</name>
- <description>Tobago Tool Annotation</description>
<dependencies>
<dependency>
@@ -54,4 +53,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml?rev=1242224&r1=1242223&r2=1242224&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml Thu Feb 9 05:55:10 2012
@@ -25,7 +25,6 @@
<artifactId>tobago-tool-apt</artifactId>
<packaging>jar</packaging>
<name>Tobago Tool Apt</name>
- <description>Tobago Tool Apt</description>
<dependencies>
<dependency>