[seam-commits] Seam SVN: r12022 - in branches/community/Seam_2_2: examples/jpa/resources-jboss/WEB-INF and 7 other directories.

Author: jharting Date: 2010-02-09 09:33:34 -0500 (Tue, 09 Feb 2010) New Revision: 12022 Modified: branches/community/Seam_2_2/examples/jpa/resources-glassfish/WEB-INF/pages.xml branches/community/Seam_2_2/examples/jpa/resources-jboss/WEB-INF/pages.xml branches/community/Seam_2_2/examples/jpa/resources-tomcat/WEB-INF/pages.xml branches/community/Seam_2_2/examples/jpa/resources-weblogic10/WEB-INF/pages.xml branches/community/Seam_2_2/examples/jpa/resources-weblogic92/WEB-INF/pages.xml branches/community/Seam_2_2/examples/jpa/resources-websphere61/WEB-INF/pages.xml branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/pages.xml branches/community/Seam_2_2/examples/jpa/view/home.xhtml branches/community/Seam_2_2/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties Log: JBSEAM-4533 JPA example Modified: branches/community/Seam_2_2/examples/jpa/resources-glassfish/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/resources-glassfish/WEB-INF/pages.xml 2010-02-09 14:33:34 UTC (rev 12022) @@ -8,8 +8,7 @@ <page view-id="/register.xhtml"> - <action if="#{validation.failed}" - execute="#{register.invalid}"/> + <action if="#{validation.failed}" execute="#{register.invalid}"/> <navigation> <rule if="#{register.registered}"> @@ -21,17 +20,14 @@ <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> </page> Modified: branches/community/Seam_2_2/examples/jpa/resources-jboss/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-jboss/WEB-INF/pages.xml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/resources-jboss/WEB-INF/pages.xml 2010-02-09 14:33:34 UTC (rev 12022) @@ -8,8 +8,7 @@ <page view-id="/register.xhtml"> - <action if="#{validation.failed}" - execute="#{register.invalid}"/> + <action if="#{validation.failed}" execute="#{register.invalid}"/> <navigation> <rule if="#{register.registered}"> @@ -21,17 +20,14 @@ <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> </page> Modified: branches/community/Seam_2_2/examples/jpa/resources-tomcat/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/resources-tomcat/WEB-INF/pages.xml 2010-02-09 14:33:34 UTC (rev 12022) @@ -8,8 +8,7 @@ <page view-id="/register.xhtml"> - <action if="#{validation.failed}" - execute="#{register.invalid}"/> + <action if="#{validation.failed}" execute="#{register.invalid}"/> <navigation> <rule if="#{register.registered}"> @@ -21,17 +20,14 @@ <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> </page> Modified: branches/community/Seam_2_2/examples/jpa/resources-weblogic10/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/resources-weblogic10/WEB-INF/pages.xml 2010-02-09 14:33:34 UTC (rev 12022) @@ -8,8 +8,7 @@ <page view-id="/register.xhtml"> - <action if="#{validation.failed}" - execute="#{register.invalid}"/> + <action if="#{validation.failed}" execute="#{register.invalid}"/> <navigation> <rule if="#{register.registered}"> @@ -21,17 +20,14 @@ <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> </page> Modified: branches/community/Seam_2_2/examples/jpa/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/resources-weblogic92/WEB-INF/pages.xml 2010-02-09 14:33:34 UTC (rev 12022) @@ -8,8 +8,7 @@ <page view-id="/register.xhtml"> - <action if="#{validation.failed}" - execute="#{register.invalid}"/> + <action if="#{validation.failed}" execute="#{register.invalid}"/> <navigation> <rule if="#{register.registered}"> @@ -21,17 +20,14 @@ <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> </page> Modified: branches/community/Seam_2_2/examples/jpa/resources-websphere61/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/resources-websphere61/WEB-INF/pages.xml 2010-02-09 14:33:34 UTC (rev 12022) @@ -8,8 +8,7 @@ <page view-id="/register.xhtml"> - <action if="#{validation.failed}" - execute="#{register.invalid}"/> + <action if="#{validation.failed}" execute="#{register.invalid}"/> <navigation> <rule if="#{register.registered}"> @@ -21,17 +20,14 @@ <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> </page> Modified: branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/pages.xml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/pages.xml 2010-02-09 14:33:34 UTC (rev 12022) @@ -8,8 +8,7 @@ <page view-id="/register.xhtml"> - <action if="#{validation.failed}" - execute="#{register.invalid}"/> + <action if="#{validation.failed}" execute="#{register.invalid}"/> <navigation> <rule if="#{register.registered}"> @@ -21,17 +20,14 @@ <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> </page> Modified: branches/community/Seam_2_2/examples/jpa/view/home.xhtml =================================================================== --- branches/community/Seam_2_2/examples/jpa/view/home.xhtml 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/examples/jpa/view/home.xhtml 2010-02-09 14:33:34 UTC (rev 12022) @@ -29,7 +29,7 @@ <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> </div> <div class="errors"><h:messages id="messages" globalOnly="true"/></div> - <div class="buttonBox"><h:commandButton id="login" action="#{identity.login}" value="Account Login"/></div> + <div class="buttonBox"><h:commandButton id="login" action="#{identity.quietLogin}" value="Account Login"/></div> <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div> <div class="subnotes"> Or use a demo account: Modified: branches/community/Seam_2_2/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties =================================================================== --- branches/community/Seam_2_2/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties 2010-02-09 12:45:34 UTC (rev 12021) +++ branches/community/Seam_2_2/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties 2010-02-09 14:33:34 UTC (rev 12022) @@ -28,7 +28,7 @@ LOGOUT id=logout PASSWORD_UPDATED_MESSAGE Password updated PASSWORD_REENTER_MESSAGE verify -PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id\='setpassword\:Message'] +PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] PASSWORD_LENGTH_MESSAGE length must be between PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify @@ -44,9 +44,9 @@ HOTEL_BED_FIELD id=booking:bedsDecorate:beds HOTEL_BED_FIELD_SELECT_CRITERIA value= HOTEL_CHECKIN_DATE_FIELD id=booking:checkinDateDecorate:checkinDateInputDate -HOTEL_CHECKIN_DATE_MESSAGE id=booking:Message +HOTEL_CHECKIN_DATE_MESSAGE xpath=//*[@id='booking:Message' or @id='booking:checkinDateDecorate:Message'] HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate -HOTEL_CHECKOUT_DATE_MESSAGE id=booking:Message +HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:Message' or @id='booking:checkoutDateDecorate:Message'] HOTEL_SMOKING_1 id=booking:smokingDecorate:smoking:0 HOTEL_SMOKING_2 id=booking:smokingDecorate:smoking:1 HOTEL_CREDIT_CARD id=booking:creditCardDecorate:creditCard