Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 82803 invoked from network); 21 Sep 2007 13:50:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Sep 2007 13:50:06 -0000 Received: (qmail 44627 invoked by uid 500); 21 Sep 2007 13:49:37 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 44582 invoked by uid 500); 21 Sep 2007 13:49:36 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 44563 invoked by uid 99); 21 Sep 2007 13:49:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Sep 2007 06:49:36 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Sep 2007 13:49:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7F07D1A9832; Fri, 21 Sep 2007 06:49:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Fri, 21 Sep 2007 13:49:22 -0000 To: scm@geronimo.apache.org From: pmcmahan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070921134922.7F07D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.myfaces.core myfaces-api - 1.2.0 + 1.2.1-SNAPSHOT org.apache.myfaces.core myfaces-impl - 1.2.0 + 1.2.1-SNAPSHOT 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 @@ - - - - - - - - + + + + + + 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()); } }