craigmcc 2004/03/07 18:40:57
Modified: contrib/struts-faces/web/example2 layout.jsp loggedoff.jsp
loggedon.jsp logon.jsp mainMenu.jsp
registration.jsp subscription.jsp
contrib/struts-faces/web/example2/WEB-INF struts-config.xml
tiles-defs.xml web.xml
Log:
First round fixup of the example2 (Tiles based) example application.
Works at least through the display of the "Edit Registration" page.
Revision Changes Path
1.2 +2 -1 jakarta-struts/contrib/struts-faces/web/example2/layout.jsp
Index: layout.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/web/example2/layout.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- layout.jsp 31 Dec 2003 07:17:48 -0000 1.1
+++ layout.jsp 8 Mar 2004 02:40:57 -0000 1.2
@@ -6,7 +6,8 @@
<%@ taglib prefix="t" uri="/WEB-INF/struts-tiles.tld" %>
<f:view>
- <s:html locale="true">
+ <s:loadMessages var="messages"/>
+ <s:html locale="true">
<head>
<title><s:message key="layout.title"/></title>
<s:stylesheet path="/stylesheet.css"/>
1.2 +13 -13 jakarta-struts/contrib/struts-faces/web/example2/loggedoff.jsp
Index: loggedoff.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/web/example2/loggedoff.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- loggedoff.jsp 31 Dec 2003 07:17:49 -0000 1.1
+++ loggedoff.jsp 8 Mar 2004 02:40:57 -0000 1.2
@@ -3,17 +3,17 @@
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://jakarta.apache.org/struts/tags-faces"; %>
<%@ taglib prefix="t" uri="/WEB-INF/struts-tiles.tld" %>
-<h:form id="loggedoff">
- <h:panel_grid columns="1">
- <h:command_link id="register"
- action="#{loggedOff.register}"
- immediate="true">
- <s:message key="loggedoff.register"/>
- </h:command_link>
- <h:command_link id="logon"
- action="#{loggedOff.logon}"
- immediate="true">
- <s:message key="loggedoff.logon"/>
- </h:command_link>
- </h:panel_grid>
+<h:form id="loggedoff">
+ <h:panelGrid columns="1">
+ <h:commandLink id="register"
+ action="#{loggedOff.register}"
+ immediate="true">
+ <s:message key="loggedoff.register"/>
+ </h:commandLink>
+ <h:commandLink id="logon"
+ action="#{loggedOff.logon}"
+ immediate="true">
+ <s:message key="loggedoff.logon"/>
+ </h:commandLink>
+ </h:panelGrid>
</h:form>
1.2 +8 -8 jakarta-struts/contrib/struts-faces/web/example2/loggedon.jsp
Index: loggedon.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/web/example2/loggedon.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- loggedon.jsp 31 Dec 2003 07:17:49 -0000 1.1
+++ loggedon.jsp 8 Mar 2004 02:40:57 -0000 1.2
@@ -3,12 +3,12 @@
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://jakarta.apache.org/struts/tags-faces"; %>
<%@ taglib prefix="t" uri="/WEB-INF/struts-tiles.tld" %>
-<h:form id="loggedon">
- <h:panel_grid columns="1">
- <h:command_link id="logoff"
- action="#{loggedOn.logoff}"
- immediate="true">
- <s:message key="loggedon.logoff"/>
- </h:command_link>
- </h:panel_grid>
+<h:form id="loggedon">
+ <h:panelGrid columns="1">
+ <h:commandLink id="logoff"
+ action="#{loggedOn.logoff}"
+ immediate="true">
+ <s:message key="loggedon.logoff"/>
+ </h:commandLink>
+ </h:panelGrid>
</h:form>
1.2 +38 -35 jakarta-struts/contrib/struts-faces/web/example2/logon.jsp
Index: logon.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/web/example2/logon.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logon.jsp 31 Dec 2003 07:17:49 -0000 1.1
+++ logon.jsp 8 Mar 2004 02:40:57 -0000 1.2
@@ -5,53 +5,56 @@
<s:errors/>
-<s:form action="/logon" focus="username"
- onsubmit="return validateLogonForm(this);">
-
- <h:panel_grid
- columns="2"
- styleClass="form-background"
- headerClass="form-header"
- columnClasses="form-prompt,form-field"
- footerClass="form-footer">
+<s:form action="/logon"
+ focus="username"
+ onsubmit="return validateLogonForm(this);">
+
+ <h:panelGrid columns="2"
+ styleClass="form-background"
+ headerClass="form-header"
+ columnClasses="form-prompt,form-field"
+ footerClass="form-footer">
<%-- Grid header element --%>
- <f:facet name="header">
- <s:message key="logon.header"/>
+ <f:facet name="header">
+ <s:message key="logon.header"/>
</f:facet>
<%-- Grid data elements --%>
- <h:output_label for="username">
- <s:message key="prompt.username"/>
- </h:output_label>
-
- <h:input_text id="username" size="16"
- value="#{logonForm.map.username}"/>
-
- <h:output_label for="password">
- <s:message key="prompt.password"/>
- </h:output_label>
-
- <h:input_secret id="password" size="16"
- value="#{logonForm.map.password}"/>
-
- <h:command_button id="submit" type="SUBMIT"
- styleClass="command-single"
- value="Log On"/>
-
- <h:command_button id="reset" type="RESET"
- styleClass="command-single"
- value="Reset"/>
+ <h:outputLabel for="username">
+ <s:message key="prompt.username"/>
+ </h:outputLabel>
+
+ <h:inputText id="username"
+ size="16"
+ value="#{logonForm.username}"/>
+
+ <h:outputLabel for="password">
+ <s:message key="prompt.password"/>
+ </h:outputLabel>
+
+ <h:inputSecret id="password" size="16"
+ value="#{logonForm.password}"/>
+
+ <h:commandButton id="submit"
+ type="SUBMIT"
+ styleClass="command-single"
+ value="Log On"/>
+
+ <h:commandButton id="reset"
+ type="RESET"
+ styleClass="command-single"
+ value="Reset"/>
<%-- Grid footer element --%>
- <f:facet name="footer">
- <s:message key="logon.footer"/>
+ <f:facet name="footer">
+ <s:message key="logon.footer"/>
</f:facet>
- </h:panel_grid>
+ </h:panelGrid>
<s:javascript formName="logonForm"
dynamicJavascript="true"
1.2 +19 -29 jakarta-struts/contrib/struts-faces/web/example2/mainMenu.jsp
Index: mainMenu.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/web/example2/mainMenu.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mainMenu.jsp 31 Dec 2003 07:17:49 -0000 1.1
+++ mainMenu.jsp 8 Mar 2004 02:40:57 -0000 1.2
@@ -4,32 +4,22 @@
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://jakarta.apache.org/struts/tags-faces"; %>
-<f:view>
-<s:html locale="true">
-<head>
- <title>
- <s:message key="mainMenu.title"/>
- </title>
- <s:base/>
- <s:stylesheet path="/stylesheet.css"/>
-</head>
-<body bgcolor="white">
-
-<h3>
- <s:message key="mainMenu.heading"/>
- <em><c:out value="${user.username}"/></em>
-</h3>
-<ul>
- <li><h:output_link value="editRegistration.do">
- <f:parameter name="action"
- value="Edit"/>
- <s:message key="mainMenu.registration"/>
- </h:output_link></li>
- <li><h:output_link value="logoff.do">
- <s:message key="mainMenu.logoff"/>
- </h:output_link></li>
-</ul>
-
-</body>
-</s:html>
-</f:view>
+<h:panelGrid columns="1">
+
+ <f:facet name="header">
+ <h:outputText value="#{messages['mainMenu.heading']} #{user.username}"/>
+ </f:facet>
+
+ <h:outputLink value="editRegistration.do">
+ <f:param name="action"
+ value="Edit"/>
+ <h:outputText value="#{messages['mainMenu.registration']}"/>
+ </h:outputLink>
+
+ <h:outputLink value="logoff.do">
+ <h:outputText value="#{messages['mainMenu.logoff']}"/>
+ </h:outputLink>
+
+</h:panelGrid>
+
+
1.2 +151 -138
jakarta-struts/contrib/struts-faces/web/example2/registration.jsp
Index: registration.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/web/example2/registration.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- registration.jsp 31 Dec 2003 07:17:49 -0000 1.1
+++ registration.jsp 8 Mar 2004 02:40:57 -0000 1.2
@@ -27,115 +27,128 @@
<s:errors/>
-<s:form action="/saveRegistration" focus="username"
- onsubmit="return validateRegistrationForm(this);">
-
- <h:input_hidden id="action" value="#{registrationForm.action}"/>
-
- <h:panel_grid
- columns="2"
- styleClass="form-background"
- headerClass="form-header"
- columnClasses="form-prompt,form-field">
+<s:form action="/saveRegistration"
+ focus="username"
+ onsubmit="return validateRegistrationForm(this);">
+
+ <h:inputHidden id="action"
+ value="#{registrationForm.action}"/>
+
+ <h:panelGrid columns="2"
+ styleClass="form-background"
+ headerClass="form-header"
+ columnClasses="form-prompt,form-field">
<%-- Grid header element --%>
<f:facet name="header">
- <h:panel_group>
+ <h:panelGroup>
<c:choose>
- <c:when test="${registrationForm.action == 'Create'}">
- <s:message key="registration.header.create"/>
+ <c:when test="${registrationForm.action == 'Create'}">
+ <s:message
+ key="registration.header.create"/>
</c:when>
- <c:when test="${registrationForm.action == 'Edit'}">
- <s:message key="registration.header.edit"/>
+ <c:when test="${registrationForm.action == 'Edit'}">
+ <s:message
+ key="registration.header.edit"/>
</c:when>
<c:otherwise>
- <h:output_text id="unknownActionTitle" value="UNKNOWN ACTION"/>
+ <h:outputText
+ id="unknownActionTitle"
+ value="UNKNOWN ACTION"/>
</c:otherwise>
</c:choose>
- </h:panel_group>
+ </h:panelGroup>
</f:facet>
<%-- Grid data elements --%>
- <h:output_label for="username">
- <s:message key="prompt.username"/>
- </h:output_label>
+ <h:outputLabel for="username">
+ <s:message key="prompt.username"/>
+ </h:outputLabel>
- <h:panel_group>
+ <h:panelGroup>
<c:choose>
- <c:when test="${registrationForm.action == 'Create'}">
- <h:input_text id="username" size="16"
- value="#{registrationForm.username}"/>
+ <c:when test="${registrationForm.action == 'Create'}">
+ <h:inputText id="username"
+ size="16"
+ value="#{registrationForm.username}"/>
</c:when>
- <c:when test="${registrationForm.action == 'Edit'}">
- <h:panel_group id="usernameGroup">
- <s:write filter="true"
- value="#{registrationForm.username}"/>
- <h:input_hidden id="username"
+ <c:when test="${registrationForm.action == 'Edit'}">
+ <h:panelGroup
+ id="usernameGroup">
+ <s:write
+ filter="true"
+ value="#{registrationForm.username}"/>
+ <h:inputHidden
+ id="username"
value="#{registrationForm.username}"/>
- </h:panel_group>
+ </h:panelGroup>
</c:when>
<c:otherwise>
- <h:output_text id="unknownActionMessage" value="UNKNOWN ACTION"/>
+ <h:outputText
+ id="unknownActionMessage"
+ value="UNKNOWN ACTION"/>
</c:otherwise>
</c:choose>
- </h:panel_group>
+ </h:panelGroup>
- <h:output_label for="password">
- <s:message key="prompt.password"/>
- </h:output_label>
-
- <h:input_text id="password"
- size="16"
- value="#{registrationForm.password}"/>
-
- <h:output_label for="password2">
- <s:message key="prompt.password2"/>
- </h:output_label>
-
- <h:input_text id="password2"
- size="16"
- value="#{registrationForm.password2}"/>
-
- <h:output_label for="fullName">
- <s:message key="prompt.fullName"/>
- </h:output_label>
-
- <h:input_text id="fullName"
- size="50"
- value="#{registrationForm.fullName}"/>
-
- <h:output_label for="fromAddress">
- <s:message key="prompt.fromAddress"/>
- </h:output_label>
-
- <h:input_text id="fromAddress"
- size="50"
- value="#{registrationForm.fromAddress}"/>
-
- <h:output_label for="replyToAddress">
- <s:message key="prompt.replyToAddress"/>
- </h:output_label>
-
- <h:input_text id="replyToAddress"
- size="50"
- value="#{registrationForm.replyToAddress}"/>
-
- <h:command_button id="submit" type="SUBMIT"
- styleClass="command-single"
- value="Save"/> <%-- FIXME - i18n --%>
-
- <h:panel_group>
- <h:command_button id="reset" type="RESET"
- styleClass="command-multiple"
- value="Reset"/> <%-- FIXME - i18n --%>
- <h:command_button id="cancel" type="SUBMIT"
- styleClass="command-multiple"
- value="Cancel"/> <%-- FIXME - i18n --%>
- </h:panel_group>
+ <h:outputLabel for="password">
+ <s:message key="prompt.password"/>
+ </h:outputLabel>
+
+ <h:inputText id="password"
+ size="16"
+ value="#{registrationForm.password}"/>
+
+ <h:outputLabel for="password2">
+ <s:message key="prompt.password2"/>
+ </h:outputLabel>
+
+ <h:inputText id="password2"
+ size="16"
+ value="#{registrationForm.password2}"/>
+
+ <h:outputLabel for="fullName">
+ <s:message key="prompt.fullName"/>
+ </h:outputLabel>
+
+ <h:inputText id="fullName"
+ size="50"
+ value="#{registrationForm.fullName}"/>
+
+ <h:outputLabel for="fromAddress">
+ <s:message key="prompt.fromAddress"/>
+ </h:outputLabel>
+
+ <h:inputText id="fromAddress"
+ size="50"
+ value="#{registrationForm.fromAddress}"/>
+
+ <h:outputLabel for="replyToAddress">
+ <s:message key="prompt.replyToAddress"/>
+ </h:outputLabel>
+
+ <h:inputText id="replyToAddress"
+ size="50"
+ value="#{registrationForm.replyToAddress}"/>
+
+ <h:commandButton id="submit"
+ type="SUBMIT"
+ styleClass="command-single"
+ value="Save"/> <%-- FIXME - i18n --%>
+
+ <h:panelGroup>
+ <h:commandButton id="reset"
+ type="RESET"
+ styleClass="command-multiple"
+ value="Reset"/> <%-- FIXME - i18n --%>
+ <h:commandButton id="cancel" type="SUBMIT"
+ styleClass="command-multiple"
+ value="Cancel"/> <%-- FIXME - i18n --%>
+ </h:panelGroup>
- </h:panel_grid>
+ </h:panelGrid>
<s:javascript formName="registrationForm"
dynamicJavascript="true"
@@ -146,76 +159,76 @@
<c:if test="${registrationForm.action == 'Edit'}">
-<h:form id="subscriptions">
+<h:form id="subscriptions">
- <h:data_table id="table"
- columnClasses="list-column-host,list-column-user,list-column-type,
- list-column-auto,list-column-action"
- headerClass="list-header"
- styleClass="list-background"
- rowClasses="list-row-even,list-row-odd"
- value="#{user.subscriptions}"
- var="subscription">
-
- <h:column id="hostColumn">
- <f:facet name="header">
- <s:message id="hostHeader"
- key="heading.host"/>
+ <h:dataTable id="table"
+ columnClasses="list-column-host,list-column-user,list-column-type,
+ list-column-auto,list-column-action"
+ headerClass="list-header"
+ styleClass="list-background"
+ rowClasses="list-row-even,list-row-odd"
+ value="#{user.subscriptions}"
+ var="subscription">
+
+ <h:column id="hostColumn">
+ <f:facet name="header">
+ <s:message id="hostHeader"
+ key="heading.host"/>
</f:facet>
- <h:output_text id="subhost"
- value="#{subscription.host}"/>
+ <h:outputText id="subhost"
+ value="#{subscription.host}"/>
</h:column>
- <h:column id="usernameColumn">
- <f:facet name="header">
- <s:message id="usernameHeader"
- key="heading.user"/>
+ <h:column id="usernameColumn">
+ <f:facet name="header">
+ <s:message id="usernameHeader"
+ key="heading.user"/>
</f:facet>
- <h:output_text id="subusername"
- value="#{subscription.username}"/>
+ <h:outputText id="subusername"
+ value="#{subscription.username}"/>
</h:column>
- <h:column id="typeColumn">
- <f:facet name="header">
- <s:message id="typeHeader"
- key="heading.type"/>
+ <h:column id="typeColumn">
+ <f:facet name="header">
+ <s:message id="typeHeader"
+ key="heading.type"/>
</f:facet>
- <h:output_text id="subtype"
- value="#{subscription.type}"/>
+ <h:outputText id="subtype"
+ value="#{subscription.type}"/>
</h:column>
- <h:column id="autoConnectColumn">
- <f:facet name="header">
- <s:message id="autoConnectHeader"
- key="heading.autoConnect"/>
+ <h:column id="autoConnectColumn">
+ <f:facet name="header">
+ <s:message id="autoConnectHeader"
+ key="heading.autoConnect"/>
</f:facet>
- <h:output_text id="subauto"
- value="#{subscription.autoConnect}"/>
+ <h:outputText id="subauto"
+ value="#{subscription.autoConnect}"/>
</h:column>
- <h:column id="actionColumn">
- <f:facet name="header">
- <s:message id="actionHeader"
- key="heading.action"/>
+ <h:column id="actionColumn">
+ <f:facet name="header">
+ <s:message id="actionHeader"
+ key="heading.action"/>
</f:facet>
- <h:command_button id="delete"
- styleClass="command-multiple"
- immediate="true"
- action="#{registrationBacking.delete}"
- value="#{registrationBacking.deleteLabel}"/>
- <h:command_button id="edit"
- styleClass="command-multiple"
- immediate="true"
- action="#{registrationBacking.edit}"
- value="#{registrationBacking.editLabel}"/>
+ <h:commandButton id="delete"
+ styleClass="command-multiple"
+ immediate="true"
+ action="#{registrationBacking.delete}"
+ value="#{registrationBacking.deleteLabel}"/>
+ <h:commandButton id="edit"
+ styleClass="command-multiple"
+ immediate="true"
+ action="#{registrationBacking.edit}"
+ value="#{registrationBacking.editLabel}"/>
</h:column>
- </h:data_table>
+ </h:dataTable>
- <h:command_button id="create"
- immediate="true"
- action="#{registrationBacking.create}"
- value="Add New"/>
+ <h:commandButton id="create"
+ immediate="true"
+ action="#{registrationBacking.create}"
+ value="Add New"/>
</h:form>
1.2 +103 -84
jakarta-struts/contrib/struts-faces/web/example2/subscription.jsp
Index: subscription.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/web/example2/subscription.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subscription.jsp 31 Dec 2003 07:17:49 -0000 1.1
+++ subscription.jsp 8 Mar 2004 02:40:57 -0000 1.2
@@ -7,6 +7,7 @@
<%-- FIXME <a:checkLogon/> --%>
+<%--
<f:view>
<s:html locale="true">
<head>
@@ -28,130 +29,148 @@
<s:stylesheet path="/stylesheet.css"/>
</head>
<body bgcolor="white">
+--%>
<s:errors/>
-<s:form action="/saveSubscription" focus="host">
+<s:form action="/saveSubscription"
+ focus="host">
- <h:input_hidden id="action" value="#{subscriptionForm.action}"/>
+ <h:inputHidden id="action"
+ value="#{subscriptionForm.action}"/>
- <h:panel_grid
- columns="2"
- styleClass="form-background"
- headerClass="form-header"
- columnClasses="form-prompt,form-field">
+ <h:panelGrid columns="2"
+ styleClass="form-background"
+ headerClass="form-header"
+ columnClasses="form-prompt,form-field">
<%-- Grid header element --%>
- <f:facet name="header">
- <h:panel_group>
+ <f:facet name="header">
+ <h:panelGroup>
<c:choose>
- <c:when test="${subscriptionForm.action == 'Create'}">
+ <c:when test="${subscriptionForm.action == 'Create'}">
<s:message id="headerCreate" key="subscription.title.create"/>
</c:when>
- <c:when test="${subscriptionForm.action == 'Delete'}">
+ <c:when test="${subscriptionForm.action == 'Delete'}">
<s:message id="headerDelete" key="subscription.title.delete"/>
</c:when>
- <c:when test="${subscriptionForm.action == 'Edit'}">
+ <c:when test="${subscriptionForm.action == 'Edit'}">
<s:message id="headerEdit" key="subscription.title.edit"/>
</c:when>
<c:otherwise>
- <h:output_text id="headerUnknown" value="UNKNOWN ACTION"/>
+ <h:outputText
+ id="headerUnknown"
+ value="UNKNOWN ACTION"/>
</c:otherwise>
</c:choose>
- </h:panel_group>
+ </h:panelGroup>
</f:facet>
<%-- Grid data elements --%>
- <h:output_label for="user">
- <s:message key="prompt.username"/>
- </h:output_label>
-
- <s:write id="user" filter="true"
- value="#{user.username}"/>
-
- <h:output_label for="host">
- <s:message key="prompt.mailHostname"/>
- </h:output_label>
+ <h:outputLabel for="user">
+ <s:message key="prompt.username"/>
+ </h:outputLabel>
+
+ <s:write id="user"
+ filter="true"
+ value="#{user.username}"/>
+
+ <h:outputLabel for="host">
+ <s:message key="prompt.mailHostname"/>
+ </h:outputLabel>
<c:choose>
- <c:when test="${subscriptionForm.action == 'Create'}">
- <h:input_text id="host" size="50"
- value="#{subscriptionForm.host}"/>
+ <c:when test="${subscriptionForm.action == 'Create'}">
+ <h:inputText id="host"
+ size="50"
+ value="#{subscriptionForm.host}"/>
</c:when>
<c:otherwise>
- <h:panel_group id="hostGroup">
- <s:write id="hostDisplay" filter="true"
- value="#{subscriptionForm.host}"/>
- <h:input_hidden id="host" value="#{subscriptionForm.host}"/>
- </h:panel_group>
+ <h:panelGroup id="hostGroup">
+ <s:write id="hostDisplay"
+ filter="true"
+ value="#{subscriptionForm.host}"/>
+ <h:inputHidden
+ id="host"
+ value="#{subscriptionForm.host}"/>
+ </h:panelGroup>
</c:otherwise>
</c:choose>
- <h:output_label for="username">
- <s:message key="prompt.mailUsername"/>
- </h:output_label>
-
- <h:input_text id="username"
- size="50"
- value="#{subscriptionForm.username}"/>
-
- <h:output_label for="password">
- <s:message key="prompt.mailPassword"/>
- </h:output_label>
-
- <h:input_text id="password"
- size="50"
- value="#{subscriptionForm.password}"/>
-
- <h:output_label for="type">
- <s:message key="prompt.mailServerType"/>
- </h:output_label>
-
- <h:selectone_menu id="type"
- value="#{subscriptionForm.type}">
- <f:selectitem itemValue="imap" itemLabel="IMAP Protocol"/>
- <f:selectitem itemValue="pop3" itemLabel="POP3 Protocol"/>
- </h:selectone_menu>
-
- <h:output_label for="autoConnect">
- <s:message key="prompt.autoConnect"/>
- </h:output_label>
-
- <h:selectboolean_checkbox id="autoConnect"
- value="#{subscriptionForm.autoConnect}"/>
+ <h:outputLabel for="username">
+ <s:message key="prompt.mailUsername"/>
+ </h:outputLabel>
+
+ <h:inputText id="username"
+ size="50"
+ value="#{subscriptionForm.username}"/>
+
+ <h:outputLabel for="password">
+ <s:message key="prompt.mailPassword"/>
+ </h:outputLabel>
+
+ <h:inputText id="password"
+ size="50"
+ value="#{subscriptionForm.password}"/>
+
+ <h:outputLabel for="type">
+ <s:message key="prompt.mailServerType"/>
+ </h:outputLabel>
+
+ <h:selectOneMenu id="type"
+ value="#{subscriptionForm.type}">
+ <f:selectItem
+ itemValue="imap"
+ itemLabel="IMAP Protocol"/>
+ <f:selectItem
+ itemValue="pop3"
+ itemLabel="POP3 Protocol"/>
+ </h:selectOneMenu>
+
+ <h:outputLabel for="autoConnect">
+ <s:message key="prompt.autoConnect"/>
+ </h:outputLabel>
+
+ <h:selectBooleanCheckbox
+ id="autoConnect"
+ value="#{subscriptionForm.autoConnect}"/>
<c:choose>
- <c:when test="${subscriptionForm.action == 'Delete'}">
- <h:command_button id="confirm"
- type="SUBMIT"
- styleClass="command-single"
- value="Confirm"/> <%-- FIXME - i18n --%>
+ <c:when test="${subscriptionForm.action == 'Delete'}">
+ <h:commandButton
+ id="confirm"
+ type="SUBMIT"
+ styleClass="command-single"
+ value="Confirm"/> <%-- FIXME - i18n --%>
</c:when>
<c:otherwise>
- <h:command_button id="save"
- type="SUBMIT"
- styleClass="command-single"
- value="Save"/> <%-- FIXME - i18n --%>
+ <h:commandButton
+ id="save"
+ type="SUBMIT"
+ styleClass="command-single"
+ value="Save"/> <%-- FIXME - i18n --%>
</c:otherwise>
</c:choose>
- <h:panel_group id="reset_and_cancel">
- <h:command_button id="reset"
- type="RESET"
- styleClass="command-multiple"
- value="Reset"/> <%-- FIXME - i18n --%>
- <h:command_button id="cancel"
- type="SUBMIT"
- styleClass="command-multiple"
- value="Cancel"/> <%-- FIXME - i18n --%>
- </h:panel_group>
+ <h:panelGroup id="reset_and_cancel">
+ <h:commandButton id="reset"
+ type="RESET"
+ styleClass="command-multiple"
+ value="Reset"/> <%-- FIXME - i18n --%>
+ <h:commandButton id="cancel"
+ type="SUBMIT"
+ styleClass="command-multiple"
+ value="Cancel"/> <%-- FIXME - i18n --%>
+ </h:panelGroup>
- </h:panel_grid>
+ </h:panelGrid>
</s:form>
+<%--
</body>
</s:html>
</f:view>
+--%>
1.3 +9 -9
jakarta-struts/contrib/struts-faces/web/example2/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/web/example2/WEB-INF/struts-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-config.xml 8 Mar 2004 01:13:01 -0000 1.2
+++ struts-config.xml 8 Mar 2004 02:40:57 -0000 1.3
@@ -66,10 +66,10 @@
<!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
<forward name="logoff" path="/logoff.do"/>
- <forward name="logon" path="/faces/logon.jsp"/>
- <forward name="registration" path="/faces/registration.jsp"/>
- <forward name="subscription" path="/faces/subscription.jsp"/>
- <forward name="success" path="/faces/mainMenu.jsp"/>
+ <forward name="logon" path="/logon.faces"/>
+ <forward name="registration" path=".registration"/>
+ <forward name="subscription" path=".subscription"/>
+ <forward name="success" path=".mainMenu"/>
</global-forwards>
@@ -87,7 +87,7 @@
scope="request"
validate="false">
<forward name="register" path=".register"/>
- <forward name="success" path="/faces/registration.jsp"/>
+ <forward name="success" path=".registration"/>
</action>
<!-- Edit mail subscription -->
@@ -96,8 +96,8 @@
attribute="subscriptionForm"
scope="request"
validate="false">
- <forward name="failure" path="/faces/mainMenu.jsp"/>
- <forward name="success" path="/faces/subscription.jsp"/>
+ <forward name="failure" path=".mainMenu"/>
+ <forward name="success" path=".registration"/>
</action>
<!-- Process a user logoff -->
@@ -115,7 +115,7 @@
<exception
key="expired.password"
type="org.apache.struts.webapp.example2.ExpiredPasswordException"
- path="/changePassword.jsp"/>
+ path="/changePassword.faces"/>
</action>
<!-- Save user registration -->
@@ -131,7 +131,7 @@
name="subscriptionForm"
scope="request"
input="subscription">
- <forward name="success" path="/faces/mainMenu.jsp"/>
+ <forward name="success" path="/editRegistration.do?action=Edit"/>
</action>
<!-- Display the "walking tour" documentation -->
1.2 +28 -14
jakarta-struts/contrib/struts-faces/web/example2/WEB-INF/tiles-defs.xml
Index: tiles-defs.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/web/example2/WEB-INF/tiles-defs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiles-defs.xml 31 Dec 2003 07:17:49 -0000 1.1
+++ tiles-defs.xml 8 Mar 2004 02:40:57 -0000 1.2
@@ -8,35 +8,49 @@
<!-- ========== LAYOUTS ========== -->
<!-- Base Layout -->
- <definition name=".base" page="/faces/layout.jsp">
- <put name="header" value="/header.jsp"/>
- <put name="footer" value="/footer.jsp"/>
- <put name="menu" value="/blank.jsp"/>
- <put name="body" value="/blank.jsp"/>
+ <definition name=".base" page="/layout.faces">
+ <put name="header" value="/header.jsp"/>
+ <put name="footer" value="/footer.jsp"/>
+ <put name="menu" value="/blank.jsp"/>
+ <put name="body" value="/blank.jsp"/>
</definition>
<!-- Logged Off Layout -->
- <definition name=".loggedoff" extends=".base">
- <put name="menu" value="/loggedoff.jsp"/>
+ <definition name=".loggedoff" extends=".base">
+ <put name="menu" value="/loggedoff.jsp"/>
</definition>
<!-- Logged On Layout -->
- <definition name=".loggedon" extends=".base">
- <put name="menu" value="/loggedon.jsp"/>
+ <definition name=".loggedon" extends=".base">
+ <put name="menu" value="/loggedon.jsp"/>
</definition>
<!-- ========== PAGES ========== -->
- <definition name=".logon" extends=".loggedoff">
- <put name="body" value="/logon.jsp"/>
+ <definition name=".logon" extends=".loggedoff">
+ <put name="body" value="/logon.jsp"/>
</definition>
- <definition name=".register" extends=".loggedoff">
- <put name="body" value="/registration.jsp"/>
+ <definition name=".mainMenu" extends=".loggedon">
+ <put name="body" value="/mainMenu.jsp"/>
</definition>
- <definition name=".welcome" extends=".loggedoff">
+ <definition name=".register" extends=".loggedoff">
+ <put name="body" value="/registration.jsp"/>
+ </definition>
+
+ <definition name=".registration"
+ extends=".loggedon">
+ <put name="body" value="/registration.jsp"/>
+ </definition>
+
+ <definition name=".subscription"
+ extends=".loggedon">
+ <put name="body" value="/subscription.jsp"/>
+ </definition>
+
+ <definition name=".welcome" extends=".loggedoff">
</definition>
1.2 +1 -1 jakarta-struts/contrib/struts-faces/web/example2/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/web/example2/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 31 Dec 2003 07:17:49 -0000 1.1
+++ web.xml 8 Mar 2004 02:40:57 -0000 1.2
@@ -39,7 +39,7 @@
<!-- JavaServer Faces Servlet Mapping -->
<servlet-mapping>
<servlet-name>faces</servlet-name>
- <url-pattern>/faces/*</url-pattern>
+ <url-pattern>*.faces</url-pattern>
</servlet-mapping>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
