You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/09/21 15:49:22 UTC
svn commit: r578104 - in /geronimo/server/trunk: pom.xml
testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp
testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
Author: pmcmahan
Date: Fri Sep 21 06:49:21 2007
New Revision: 578104
URL: http://svn.apache.org/viewvc?rev=578104&view=rev
Log:
upgrade myfaces to 1.2.1-SNAPSHOT. fix broken selenium testcase in test-myfaces.
Modified:
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp
geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=578104&r1=578103&r2=578104&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Sep 21 06:49:21 2007
@@ -1273,13 +1273,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
<!--Axis2 modules dependencies-->
Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp?rev=578104&r1=578103&r2=578104&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/webapp/helloWorld.jsp Fri Sep 21 06:49:21 2007
@@ -25,14 +25,12 @@
<body>
<f:view>
<h:form id="form">
- <h:panelGrid id="grid" columns="2">
- <h:outputText id="output1" value="#{helloWorldBacking.testDouble} Please enter your name"/>
- <h:inputText id="input1" value="#{helloWorldBacking.name}" required="true"/>
- <h:outputText value="#{helloWorldBacking.greeting}"/>
- <h:commandButton id="button1" value="press me" action="#{helloWorldBacking.send}"/>
- <h:commandLink value="Update greeting" actionListener="#{helloWorldBacking.updateGreeting}"/>
- <h:message id="message1" for="input1"/>
- </h:panelGrid>
+ <h:outputText id="output1" value="#{helloWorldBacking.testDouble} Please enter your name"/>
+ <h:inputText id="input1" value="#{helloWorldBacking.name}" required="true"/>
+ <h:outputText value="#{helloWorldBacking.greeting}"/>
+ <h:commandButton id="button1" value="press me" action="#{helloWorldBacking.send}"/>
+ <h:commandLink value="Update greeting" actionListener="#{helloWorldBacking.updateGreeting}"/>
+ <h:message id="message1" for="input1"/>
</h:form>
</f:view>
</body>
Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java?rev=578104&r1=578103&r2=578104&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java Fri Sep 21 06:49:21 2007
@@ -30,7 +30,7 @@
public void testManagedBean() throws Exception {
selenium.open("/myfaces");
selenium.waitForPageToLoad("30000");
- assertEquals("0.99 Please enter your name Hello Update greeting", selenium.getBodyText());
+ assertEquals("0.99 Please enter your nameHelloUpdate greeting", selenium.getBodyText());
}
}