Author: dan.j.allen Date: 2009-03-30 01:19:29 -0400 (Mon, 30 Mar 2009) New Revision: 10231 Modified: trunk/seam-gen/icefaces/view/layout/loginout.xhtml trunk/seam-gen/icefaces/view/layout/menu.xhtml trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl trunk/seam-gen/icefaces/view/layout/template.xhtml trunk/seam-gen/icefaces/view/login.xhtml trunk/seam-gen/view/layout/menu.xhtml trunk/seam-gen/view/layout/menu.xhtml.ftl Log: JBSEAM-3391 Modified: trunk/seam-gen/icefaces/view/layout/loginout.xhtml =================================================================== --- trunk/seam-gen/icefaces/view/layout/loginout.xhtml 2009-03-30 05:12:25 UTC (rev 10230) +++ trunk/seam-gen/icefaces/view/layout/loginout.xhtml 2009-03-30 05:19:29 UTC (rev 10231) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib"> - <h:outputText id="logoutWelcomeId" value="Welcome, #{identity.username}" rendered="#{identity.loggedIn}"/> + <h:outputText id="logoutWelcomeId" value="Welcome, #{credentials.username}" rendered="#{identity.loggedIn}"/> &#160;|&#160; <s:link view="/login.xhtml" id="logoutLoginId" value="Login" rendered="#{not identity.loggedIn}"/> <s:link view="/home.xhtml" id="logoutLogoutId" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/> Modified: trunk/seam-gen/icefaces/view/layout/menu.xhtml =================================================================== --- trunk/seam-gen/icefaces/view/layout/menu.xhtml 2009-03-30 05:12:25 UTC (rev 10230) +++ trunk/seam-gen/icefaces/view/layout/menu.xhtml 2009-03-30 05:19:29 UTC (rev 10231) @@ -17,7 +17,7 @@ </ice:panelGroup> <ice:panelGroup id="menuPanelGroupRight" > - <h:outputText id="menuWelcomeId" value="signed in as: #{identity.username}" rendered="#{identity.loggedIn}"/> + <h:outputText id="menuWelcomeId" value="signed in as: #{credentials.username}" rendered="#{identity.loggedIn}"/> <s:link id="menuLoginId" view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}" propagation="none"/> <s:link id="menuLogoutId" view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}" propagation="none"/> </ice:panelGroup> Modified: trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl =================================================================== --- trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2009-03-30 05:12:25 UTC (rev 10230) +++ trunk/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2009-03-30 05:19:29 UTC (rev 10231) @@ -24,7 +24,7 @@ <!-- @newMenuItem@ --> </ice:panelGroup> <ice:panelGroup id="rightMenuId"> - <h:outputText id="menuWelcomeId" value="signed in as: ${'#'}{identity.username}" rendered="${'#'}{identity.loggedIn}"/> + <h:outputText id="menuWelcomeId" value="signed in as: ${'#'}{credentials.username}" rendered="${'#'}{identity.loggedIn}"/> <s:link view="/login.xhtml" id="menuLoginId" value="Login" rendered="${'#'}{not identity.loggedIn}" propagation="none"/> <s:link view="/home.xhtml" id="menulogoutId" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}" propagation="none"/> </ice:panelGroup> Modified: trunk/seam-gen/icefaces/view/layout/template.xhtml =================================================================== --- trunk/seam-gen/icefaces/view/layout/template.xhtml 2009-03-30 05:12:25 UTC (rev 10230) +++ trunk/seam-gen/icefaces/view/layout/template.xhtml 2009-03-30 05:19:29 UTC (rev 10231) @@ -38,7 +38,7 @@ - Generated by icefaces-seam-gen <ice:panelGroup rendered="#{identity.loggedIn}"> #{_} - [#{identity.username}] + [#{credentials.username}] </ice:panelGroup> <ice:panelGroup rendered="#{init.debug}"> <br /> Modified: trunk/seam-gen/icefaces/view/login.xhtml =================================================================== --- trunk/seam-gen/icefaces/view/login.xhtml 2009-03-30 05:12:25 UTC (rev 10230) +++ trunk/seam-gen/icefaces/view/login.xhtml 2009-03-30 05:19:29 UTC (rev 10231) @@ -27,10 +27,10 @@ <ice:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value"> <h:outputLabel for="username">Username</h:outputLabel> <ice:inputText id="username" - value="#{identity.username}"/> + value="#{credentials.username}"/> <h:outputLabel for="password">Password</h:outputLabel> <ice:inputSecret id="password" - value="#{identity.password}"/> + value="#{credentials.password}"/> <h:outputLabel for="rememberMe">Remember me</h:outputLabel> <ice:selectBooleanCheckbox id="rememberMe" value="#{rememberMe.enabled}"/> Modified: trunk/seam-gen/view/layout/menu.xhtml =================================================================== --- trunk/seam-gen/view/layout/menu.xhtml 2009-03-30 05:12:25 UTC (rev 10230) +++ trunk/seam-gen/view/layout/menu.xhtml 2009-03-30 05:19:29 UTC (rev 10231) @@ -11,7 +11,7 @@ </rich:toolBarGroup> <!-- @newMenuItem@ --> <rich:toolBarGroup location="right"> - <h:outputText value="signed in as: #{identity.username}" rendered="#{identity.loggedIn}"/> + <h:outputText value="signed in as: #{credentials.username}" rendered="#{identity.loggedIn}"/> <s:link view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}" propagation="none"/> <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}" propagation="none"/> </rich:toolBarGroup> Modified: trunk/seam-gen/view/layout/menu.xhtml.ftl =================================================================== --- trunk/seam-gen/view/layout/menu.xhtml.ftl 2009-03-30 05:12:25 UTC (rev 10230) +++ trunk/seam-gen/view/layout/menu.xhtml.ftl 2009-03-30 05:19:29 UTC (rev 10231) @@ -17,7 +17,7 @@ </#foreach> <!-- @newMenuItem@ --> <rich:toolBarGroup location="right"> - <h:outputText value="signed in as: ${'#'}{identity.username}" rendered="${'#'}{identity.loggedIn}"/> + <h:outputText value="signed in as: ${'#'}{credentials.username}" rendered="${'#'}{identity.loggedIn}"/> <s:link view="/login.xhtml" value="Login" rendered="${'#'}{not identity.loggedIn}" propagation="none"/> <s:link view="/home.xhtml" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}" propagation="none"/> </rich:toolBarGroup>