Author: craigmcc Date: Tue Jan 24 19:38:42 2006 New Revision: 372087 URL: http://svn.apache.org/viewcvs?rev=372087&view=rev Log: Cosmetic changes only, except for a couple of places where we eliminate direct dependencies on Commons BeanUtils.
Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/ApplicationListener.java struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/BaseViewController.java struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Index.java struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Logon.java struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/MainMenu.java struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Registration.java struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/State.java struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Subscription.java struts/shale/trunk/mailreader/src/web/WEB-INF/database.xml struts/shale/trunk/mailreader/src/web/WEB-INF/faces-config.xml struts/shale/trunk/mailreader/src/web/WEB-INF/web.xml Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/ApplicationListener.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/ApplicationListener.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/ApplicationListener.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/ApplicationListener.java Tue Jan 24 19:38:42 2006 @@ -12,6 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; @@ -49,14 +51,12 @@ * container. This is for demonstration purposes only - you should * <strong>NOT</strong> assume that files written here will survive a restart * of your servlet container.</p> - * - * $Id$ */ public final class ApplicationListener implements ServletContextListener { - // ----------------------------------------------------- Manifest Constants + // ------------------------------------------------------ Manifest Constants /** @@ -73,7 +73,7 @@ public static final String PROTOCOLS_KEY = "protocols"; - // ----------------------------------------------------- Instance Variables + // ------------------------------------------------------ Instance Variables /** Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/BaseViewController.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/BaseViewController.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/BaseViewController.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/BaseViewController.java Tue Jan 24 19:38:42 2006 @@ -12,6 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; @@ -24,8 +26,6 @@ /** * <p>Convenience abstract base <code>ViewController</code> * for the Mail Reader example application.</p> - * - * $Id$ */ public abstract class BaseViewController extends AbstractViewController { Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Index.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Index.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Index.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Index.java Tue Jan 24 19:38:42 2006 @@ -12,14 +12,14 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; /** * <p><code>ViewController</code> for the <code>index</code> page.</p> - * - * $Id$ */ public class Index extends BaseViewController { Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Logon.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Logon.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Logon.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Logon.java Tue Jan 24 19:38:42 2006 @@ -12,6 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; @@ -25,8 +27,6 @@ /** * <p><code>ViewController</code> for the <code>logon</code> page.</p> - * - * $Id$ */ public class Logon extends BaseViewController { @@ -57,41 +57,41 @@ /** - * @return Returns the password. - */ - public String getPassword() { - return this.password; - } - - - /** - * @param password The password to set. - */ - public void setPassword(String password) { - this.password = password; - } - - - /** - * @return Returns the username. - */ - public String getUsername() { - return this.username; - } - - - /** - * @param username The username to set. - */ - public void setUsername(String username) { - this.username = username; - } + * @return Returns the password. + */ + public String getPassword() { + return this.password; + } + + + /** + * @param password The password to set. + */ + public void setPassword(String password) { + this.password = password; + } + + + /** + * @return Returns the username. + */ + public String getUsername() { + return this.username; + } + + + /** + * @param username The username to set. + */ + public void setUsername(String username) { + this.username = username; + } // ---------------------------------------------------------- Event Handlers - /** + /** * <p>Authenticate this user and proceed based on the results.</p> */ public String logon() { Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/MainMenu.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/MainMenu.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/MainMenu.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/MainMenu.java Tue Jan 24 19:38:42 2006 @@ -12,17 +12,16 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; -import org.apache.commons.beanutils.BeanUtils; import org.apache.struts.apps.mailreader.dao.User; /** * <p><code>ViewController</code> for the <code>index</code> page.</p> - * - * $Id$ */ public class MainMenu extends BaseViewController { @@ -41,13 +40,14 @@ getState().setMode("EDIT"); Registration registration = (Registration)getBean("registration"); - try { - User user = getState().getUser(); - BeanUtils.copyProperties(registration, user); - } catch (Exception e) { - // display something - e.printStackTrace(); - } + User user = getState().getUser(); + registration.setFromAddress(user.getFromAddress()); + registration.setFullName(user.getFullName()); + registration.setPassword(user.getPassword()); + registration.setPassword2(user.getPassword()); + registration.setReplyToAddress(user.getReplyToAddress()); + registration.setSubscriptions(user.getSubscriptions()); + registration.setUsername(user.getUsername()); return "registration"; } Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Registration.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Registration.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Registration.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Registration.java Tue Jan 24 19:38:42 2006 @@ -12,6 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; @@ -27,8 +29,6 @@ /** * <p><code>ViewController</code> for the <code>registration</code> page.</p> - * - * $Id$ */ public class Registration extends BaseViewController { @@ -47,9 +47,51 @@ /** - * <p>The logon username for this user.</p> + * <p>The from address of this user.</p> */ - private String username = null; + private String fromAddress = null; + + /** + * @return Returns the fromAddress. + */ + public String getFromAddress() { + return this.fromAddress; + } + + /** + * @param fromAddress The fromAddress to set. + */ + public void setFromAddress(String fromAddress) { + this.fromAddress = fromAddress; + } + + + /** + * <p>The full name of this user.</p> + */ + private String fullName = null; + + /** + * @return Returns the fullName. + */ + public String getFullName() { + return this.fullName; + } + + /** + * @param fullName The fullName to set. + */ + public void setFullName(String fullName) { + this.fullName = fullName; + } + + + + + + + + /** * <p>The login password for this user.</p> @@ -57,19 +99,39 @@ private String password = null; /** + * @return Returns the password. + */ + public String getPassword() { + return this.password; + } + + /** + * @param password The password to set. + */ + public void setPassword(String password) { + this.password = password; + } + + + /** * <p>The confirmation password for this user.</p> */ private String password2 = null; /** - * <p>The full name of this user.</p> + * @return Returns the password2. */ - private String fullName = null; + public String getPassword2() { + return this.password2; + } /** - * <p>The from address of this user.</p> + * @param password2 The password2 to set. */ - private String fromAddress = null; + public void setPassword2(String password2) { + this.password2 = password2; + } + /** * <p>The reply to address of this user.</p> @@ -77,117 +139,35 @@ private String replyToAddress = null; /** + * @return Returns the replyToAddress. + */ + public String getReplyToAddress() { + return this.replyToAddress; + } + + /** + * @param replyToAddress The replyToAddress to set. + */ + public void setReplyToAddress(String replyToAddress) { + this.replyToAddress = replyToAddress; + } + + + /** * <p>The set of subscriptions for the currently logged in user. */ private Subscription[] subscriptions = null; - - - /** - * @return Returns the fromAddress. - */ - public String getFromAddress() { - return this.fromAddress; - } - - - /** - * @param fromAddress The fromAddress to set. - */ - public void setFromAddress(String fromAddress) { - this.fromAddress = fromAddress; - } - - - /** - * @return Returns the fullName. - */ - public String getFullName() { - return this.fullName; - } - - - /** - * @param fullName The fullName to set. - */ - public void setFullName(String fullName) { - this.fullName = fullName; - } - - - /** - * @return Returns the password. - */ - public String getPassword() { - return this.password; - } - - - /** - * @param password The password to set. - */ - public void setPassword(String password) { - this.password = password; - } - - - /** - * @return Returns the password2. - */ - public String getPassword2() { - return this.password2; - } - - - /** - * @param password2 The password2 to set. - */ - public void setPassword2(String password2) { - this.password2 = password2; - } - - - /** - * @return Returns the replyToAddress. - */ - public String getReplyToAddress() { - return this.replyToAddress; - } - - - /** - * @param replyToAddress The replyToAddress to set. - */ - public void setReplyToAddress(String replyToAddress) { - this.replyToAddress = replyToAddress; - } - - - /** - * @return Returns the username. - */ - public String getUsername() { - return this.username; - } - - - /** - * @param username The username to set. - */ - public void setUsername(String username) { - this.username = username; - } - - - /** - * @return Returns the subscriptions. - */ - public Subscription[] getSubscriptions() { - return this.subscriptions; - } - - /** - * @param subscriptions The subscriptions to set. - */ + + /** + * @return Returns the subscriptions. + */ + public Subscription[] getSubscriptions() { + return this.subscriptions; + } + + /** + * @param subscriptions The subscriptions to set. + */ public void setSubscriptions(Subscription subscriptions[]) { if (log.isTraceEnabled()) { if (subscriptions == null) { @@ -200,6 +180,26 @@ } + /** + * <p>The logon username for this user.</p> + */ + private String username = null; + + /** + * @return Returns the username. + */ + public String getUsername() { + return this.username; + } + + /** + * @param username The username to set. + */ + public void setUsername(String username) { + this.username = username; + } + + // ---------------------------------------------------------- Event Handlers @@ -414,7 +414,6 @@ setSubscriptions(null); } - } Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/State.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/State.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/State.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/State.java Tue Jan 24 19:38:42 2006 @@ -12,6 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; @@ -22,71 +24,71 @@ /** * <p>In the absence of a <code>DialogController</code>, provide some * properties that can be used to save our state information.</p> - * - * $Id$ */ public class State { // -------------------------------------------------------------- Properties - + /** * <p>Host name used to select which subscription to process.</p> */ private String host = null; - + + /** + * @return Returns the host. + */ + public String getHost() { + return this.host; + } + + /** + * @param host The host to set. + */ + public void setHost(String host) { + this.host = host; + } + + /** * <p>Transaction processing mode.</p> */ private String mode = null; - + + /** + * @return Returns the mode. + */ + public String getMode() { + return this.mode; + } + + /** + * @param mode The mode to set. + */ + public void setMode(String mode) { + this.mode = mode; + } + + /** * <p>The currently logged on <code>User</code>.</p> */ private User user = null; - /** - * @return Returns the host. - */ - public String getHost() { - return this.host; - } - - /** - * @param host The host to set. - */ - public void setHost(String host) { - this.host = host; - } - - /** - * @return Returns the mode. - */ - public String getMode() { - return this.mode; - } - - /** - * @param mode The mode to set. - */ - public void setMode(String mode) { - this.mode = mode; - } - - /** - * @return Returns the user. - */ - public User getUser() { - return this.user; - } - - /** - * @param user The user to set. - */ - public void setUser(User user) { - this.user = user; - } + /** + * @return Returns the user. + */ + public User getUser() { + return this.user; + } + + /** + * @param user The user to set. + */ + public void setUser(User user) { + this.user = user; + } } Modified: struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Subscription.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Subscription.java?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Subscription.java (original) +++ struts/shale/trunk/mailreader/src/java/org/apache/shale/examples/mailreader/Subscription.java Tue Jan 24 19:38:42 2006 @@ -12,13 +12,13 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * $Id$ */ package org.apache.shale.examples.mailreader; import javax.faces.application.FacesMessage; - -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.apps.mailreader.dao.User; @@ -26,8 +26,6 @@ /** * <p><code>ViewController</code> for the <code>subscription</code> page.</p> - * - * $Id$ */ public class Subscription extends BaseViewController { @@ -46,14 +44,44 @@ /** + * <p>The autoConnect state for this subscription.</p> + */ + private boolean autoConnect = false; + + /** + * @return Returns the autoConnect. + */ + public boolean isAutoConnect() { + return this.autoConnect; + } + + /** + * @param autoConnect The autoConnect to set. + */ + public void setAutoConnect(boolean autoConnect) { + this.autoConnect = autoConnect; + } + + + /** * <p>The host for this subscription.</p> */ private String host = null; /** - * <p>The logon username for this subscription.</p> + * @return Returns the host. */ - private String username = null; + public String getHost() { + return this.host; + } + + /** + * @param host The host to set. + */ + public void setHost(String host) { + this.host = host; + } + /** * <p>The login password for this subscription.</p> @@ -61,99 +89,63 @@ private String password = null; /** + * @return Returns the password. + */ + public String getPassword() { + return this.password; + } + + /** + * @param password The password to set. + */ + public void setPassword(String password) { + this.password = password; + } + + + /** * <p>The type for this subscription.</p> */ private String type = null; /** - * <p>The autoConnect state for this subscription.</p> + * @return Returns the type. */ - private boolean autoConnect = false; + public String getType() { + return this.type; + } - + /** + * @param type The type to set. + */ + public void setType(String type) { + this.type = type; + } + + + /** + * <p>The logon username for this subscription.</p> + */ + private String username = null; - /** - * @return Returns the autoConnect. - */ - public boolean isAutoConnect() { - return this.autoConnect; - } - - - /** - * @param autoConnect The autoConnect to set. - */ - public void setAutoConnect(boolean autoConnect) { - this.autoConnect = autoConnect; - } - - - /** - * @return Returns the host. - */ - public String getHost() { - return this.host; - } - - - /** - * @param host The host to set. - */ - public void setHost(String host) { - this.host = host; - } - - - /** - * @return Returns the password. - */ - public String getPassword() { - return this.password; - } - - - /** - * @param password The password to set. - */ - public void setPassword(String password) { - this.password = password; - } - - - /** - * @return Returns the type. - */ - public String getType() { - return this.type; - } - - - /** - * @param type The type to set. - */ - public void setType(String type) { - this.type = type; - } - - - /** - * @return Returns the username. - */ - public String getUsername() { - return this.username; - } - - - /** - * @param username The username to set. - */ - public void setUsername(String username) { - this.username = username; - } + /** + * @return Returns the username. + */ + public String getUsername() { + return this.username; + } + + /** + * @param username The username to set. + */ + public void setUsername(String username) { + this.username = username; + } // ---------------------------------------------------------- Event Handlers + /** * <p>Return to the appropriate page depending on the current mode.</p> */ @@ -180,7 +172,7 @@ boolean ok = true; User user = state.getUser(); org.apache.struts.apps.mailreader.dao.Subscription subscription = - user.findSubscription(state.getHost()); + user.findSubscription(state.getHost()); if ("CREATE".equals(mode)) { @@ -188,21 +180,22 @@ if (user.findSubscription(host) != null) { // FIXME - localization getFacesContext().addMessage("subscription:host", - new FacesMessage("That hostname is already defined")); + new FacesMessage("That hostname is already defined")); return null; } // Create a new subscription subscription = user.createSubscription(host); Registration registration = (Registration)getBean("registration"); - try { - user = getState().getUser(); - BeanUtils.copyProperties(registration, user); - } catch (Exception e) { - // display something - e.printStackTrace(); - } - + user = getState().getUser(); + registration.setFromAddress(user.getFromAddress()); + registration.setFullName(user.getFullName()); + registration.setPassword(user.getPassword()); + registration.setPassword2(user.getPassword()); + registration.setReplyToAddress(user.getReplyToAddress()); + registration.setSubscriptions(user.getSubscriptions()); + registration.setUsername(user.getUsername()); + } else if ("DELETE".equals(mode)) { user.removeSubscription(subscription); @@ -210,7 +203,7 @@ database.save(); } catch (Exception e) { getFacesContext().addMessage(null, - new FacesMessage(e.getMessage())); + new FacesMessage(e.getMessage())); log.error("Database save exception", e); return null; } @@ -222,7 +215,7 @@ ; // No special action required } - + // Copy the remaining properties subscription.setUsername(username); subscription.setPassword(password); @@ -234,7 +227,7 @@ database.save(); } catch (Exception e) { getFacesContext().addMessage(null, - new FacesMessage(e.getMessage())); + new FacesMessage(e.getMessage())); log.error("Database save exception", e); return null; } @@ -259,14 +252,14 @@ // If we are not in DELETE or EDIT mode, there is nothing to do if (!"DELETE".equals(state.getMode()) && - !"EDIT".equals(state.getMode())) { + !"EDIT".equals(state.getMode())) { return; } // The first time in, prepopulate our input field values User user = state.getUser(); org.apache.struts.apps.mailreader.dao.Subscription subscription = - user.findSubscription(state.getHost()); + user.findSubscription(state.getHost()); if (!isPostBack()) { setHost(subscription.getHost()); setUsername(subscription.getUsername()); @@ -276,5 +269,6 @@ } } + } Modified: struts/shale/trunk/mailreader/src/web/WEB-INF/database.xml URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/web/WEB-INF/database.xml?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/web/WEB-INF/database.xml (original) +++ struts/shale/trunk/mailreader/src/web/WEB-INF/database.xml Tue Jan 24 19:38:42 2006 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. + $Id$ --> Modified: struts/shale/trunk/mailreader/src/web/WEB-INF/faces-config.xml URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/web/WEB-INF/faces-config.xml?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/web/WEB-INF/faces-config.xml (original) +++ struts/shale/trunk/mailreader/src/web/WEB-INF/faces-config.xml Tue Jan 24 19:38:42 2006 @@ -22,77 +22,25 @@ See the License for the specific language governing permissions and limitations under the License. + $Id$ --> <faces-config> - <!-- Backing Bean for index.jsp --> - <managed-bean> - <managed-bean-name>index</managed-bean-name> - <managed-bean-class> - org.apache.shale.examples.mailreader.Index - </managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - - - <!-- Backing Bean for logon.jsp --> - <managed-bean> - <managed-bean-name>logon</managed-bean-name> - <managed-bean-class> - org.apache.shale.examples.mailreader.Logon - </managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - - - <!-- Backing Bean for mainMenu.jsp --> - <managed-bean> - <managed-bean-name>mainMenu</managed-bean-name> - <managed-bean-class> - org.apache.shale.examples.mailreader.MainMenu - </managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> + <!-- ============================== /index.jsp =========================== --> - <!-- Backing Bean for registration.jsp --> <managed-bean> - <managed-bean-name>registration</managed-bean-name> - <managed-bean-class> - org.apache.shale.examples.mailreader.Registration - </managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - - - <!-- State saving bean --> - <managed-bean> - <managed-bean-name>state</managed-bean-name> - <managed-bean-class> - org.apache.shale.examples.mailreader.State - </managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>mode</property-name> - <value>EDIT</value> - </managed-property> - </managed-bean> - - - <!-- Backing Bean for subscription.jsp --> - <managed-bean> - <managed-bean-name>subscription</managed-bean-name> + <managed-bean-name>index</managed-bean-name> <managed-bean-class> - org.apache.shale.examples.mailreader.Subscription + org.apache.shale.examples.mailreader.Index </managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - <!-- Navigation Rules for index.jsp --> <navigation-rule> <from-view-id>/index.jsp</from-view-id> <navigation-case> @@ -106,7 +54,18 @@ </navigation-rule> - <!-- Navigation Rules for logon.jsp --> + <!-- ============================== /logon.jsp =========================== --> + + + <managed-bean> + <managed-bean-name>logon</managed-bean-name> + <managed-bean-class> + org.apache.shale.examples.mailreader.Logon + </managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + + <navigation-rule> <from-view-id>/logon.jsp</from-view-id> <navigation-case> @@ -116,7 +75,18 @@ </navigation-rule> - <!-- Navigation Rules for mainMenu.jsp --> + <!-- ============================ /mainMenu.jsp ========================== --> + + + <managed-bean> + <managed-bean-name>mainMenu</managed-bean-name> + <managed-bean-class> + org.apache.shale.examples.mailreader.MainMenu + </managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + + <navigation-rule> <from-view-id>/mainMenu.jsp</from-view-id> <navigation-case> @@ -130,7 +100,18 @@ </navigation-rule> - <!-- Navigation Rules for registration.jsp --> + <!-- =========================== /registration.jsp ======================= --> + + + <managed-bean> + <managed-bean-name>registration</managed-bean-name> + <managed-bean-class> + org.apache.shale.examples.mailreader.Registration + </managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + + <navigation-rule> <from-view-id>/registration.jsp</from-view-id> <navigation-case> @@ -148,7 +129,18 @@ </navigation-rule> - <!-- Navigation Rules for subscription.jsp --> + <!-- =========================== /subscription.jsp ======================= --> + + + <managed-bean> + <managed-bean-name>subscription</managed-bean-name> + <managed-bean-class> + org.apache.shale.examples.mailreader.Subscription + </managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + + <navigation-rule> <from-view-id>/subscription.jsp</from-view-id> <navigation-case> @@ -164,6 +156,23 @@ <to-view-id>/index.jsp</to-view-id> </navigation-case> </navigation-rule> + + + <!-- =========================== Other Managed Beans ===================== --> + + + <managed-bean> + <description>Session scope bean maintaining state information.</description> + <managed-bean-name>state</managed-bean-name> + <managed-bean-class> + org.apache.shale.examples.mailreader.State + </managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>mode</property-name> + <value>EDIT</value> + </managed-property> + </managed-bean> </faces-config> Modified: struts/shale/trunk/mailreader/src/web/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/struts/shale/trunk/mailreader/src/web/WEB-INF/web.xml?rev=372087&r1=372086&r2=372087&view=diff ============================================================================== --- struts/shale/trunk/mailreader/src/web/WEB-INF/web.xml (original) +++ struts/shale/trunk/mailreader/src/web/WEB-INF/web.xml Tue Jan 24 19:38:42 2006 @@ -16,6 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. + $Id$ --> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]