You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/03/20 03:19:38 UTC
svn commit: r387108 [1/2] - in /struts/sandbox/trunk/action2/apps:
cookbook/src/java/ cookbook/src/java/cookbook2/
cookbook/src/java/cookbook2/actiontag/ cookbook/src/java/cookbook2/pojo/
cookbook/src/test/cookbook2/actiontag/ cookbook/src/webapp/ cook...
Author: husted
Date: Sun Mar 19 18:19:35 2006
New Revision: 387108
URL: http://svn.apache.org/viewcvs?rev=387108&view=rev
Log:
Action2 Apps
* Reformat code only.
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Home-config.xml
struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Select.java
struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Simple-config.xml
struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Languages.java
struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Result.java
struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/pojo/Result.java
struts/sandbox/trunk/action2/apps/cookbook/src/java/xwork.xml
struts/sandbox/trunk/action2/apps/cookbook/src/test/cookbook2/actiontag/LanguagesTest.java
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/css/cookbook.css
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-index.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-result.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-home.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-open.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-view.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/index.html
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Input.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Result.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/colors.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/index.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/languages.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Input.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Result.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/index.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Input.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Input.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Result.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon-validation.xml
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon.java
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/css/mailreader.css
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/index.html
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Home-config.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Home-config.xml?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Home-config.xml (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Home-config.xml Sun Mar 19 18:19:35 2006
@@ -2,7 +2,7 @@
<xwork>
- <package name="Home" extends="webwork-default" >
+ <package name="Home" extends="webwork-default">
<action name="Home">
<result>/Home.jsp</result>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Select.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Select.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Select.java (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Select.java Sun Mar 19 18:19:35 2006
@@ -5,12 +5,12 @@
import com.opensymphony.xwork.Validateable;
import com.opensymphony.xwork.util.OgnlValueStack;
+import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.io.File;
public class Select extends ActionSupport implements Validateable {
@@ -42,48 +42,46 @@
* The constructor pre-populates the controsl for us.
*/
public Select() {
- favouriteLanguages.add(new Language("EnglishKey", "English Language"));
- favouriteLanguages.add(new Language("FrenchKey", "French Language"));
- favouriteLanguages.add(new Language("SpanishKey", "Spanish Language"));
-
- VehicalType car = new VehicalType("CarKey", "Car");
- VehicalType motorcycle = new VehicalType("MotorcycleKey", "Motorcycle");
- vehicalTypeList.add(car);
- vehicalTypeList.add(motorcycle);
-
- List cars = new ArrayList();
- cars.add(new VehicalSpecific("MercedesKey", "Mercedes"));
- cars.add(new VehicalSpecific("HondaKey", "Honda"));
- cars.add(new VehicalSpecific("FordKey", "Ford"));
-
- List motorcycles = new ArrayList();
- motorcycles.add(new VehicalSpecific("SuzukiKey", "Suzuki"));
- motorcycles.add(new VehicalSpecific("YamahaKey", "Yamaha"));
+ favouriteLanguages.add(new Language("EnglishKey", "English Language"));
+ favouriteLanguages.add(new Language("FrenchKey", "French Language"));
+ favouriteLanguages.add(new Language("SpanishKey", "Spanish Language"));
+
+ VehicalType car = new VehicalType("CarKey", "Car");
+ VehicalType motorcycle = new VehicalType("MotorcycleKey", "Motorcycle");
+ vehicalTypeList.add(car);
+ vehicalTypeList.add(motorcycle);
+
+ List cars = new ArrayList();
+ cars.add(new VehicalSpecific("MercedesKey", "Mercedes"));
+ cars.add(new VehicalSpecific("HondaKey", "Honda"));
+ cars.add(new VehicalSpecific("FordKey", "Ford"));
+
+ List motorcycles = new ArrayList();
+ motorcycles.add(new VehicalSpecific("SuzukiKey", "Suzuki"));
+ motorcycles.add(new VehicalSpecific("YamahaKey", "Yamaha"));
- vehicalSpecificMap.put(car, cars);
- vehicalSpecificMap.put(motorcycle, motorcycles);
+ vehicalSpecificMap.put(car, cars);
+ vehicalSpecificMap.put(motorcycle, motorcycles);
}
/**
* Prepare form for display.
*
- * <p>
- * In this example, all the work is done in the constructor.
- * Other cases may need to consult data access logic to populate the controls.
- * </p>
+ * <p> In this example, all the work is done in the constructor. Other cases may need to consult data access logic
+ * to populate the controls. </p>
+ *
* @return Result
*/
public String setup() {
- return SUCCESS;
+ return SUCCESS;
}
/**
* Execute the "Select" action.
*
- * <p>
- * In this example, we are simply displaying the input.
- * Other cases may need to consult business or data access logic.
- * </p>
+ * <p> In this example, we are simply displaying the input. Other cases may need to consult business or data access
+ * logic. </p>
+ *
* @return Result
* @throws Exception on any error
*/
@@ -94,51 +92,53 @@
// -- Methods that populate controls from data prepared in the constructor --
public List getLeftSideCartoonCharacters() {
- return leftSideCartoonCharacters;
+ return leftSideCartoonCharacters;
}
+
public void setLeftSideCartoonCharacters(List leftSideCartoonCharacters) {
- this.leftSideCartoonCharacters = leftSideCartoonCharacters;
+ this.leftSideCartoonCharacters = leftSideCartoonCharacters;
}
public List getRightSideCartoonCharacters() {
- return rightSideCartoonCharacters;
+ return rightSideCartoonCharacters;
}
+
public void setRightSideCartoonCharacters(List rightSideCartoonCharacters) {
- this.rightSideCartoonCharacters = rightSideCartoonCharacters;
+ this.rightSideCartoonCharacters = rightSideCartoonCharacters;
}
public String getFavouriteVehicalType() {
- return favouriteVehicalType;
+ return favouriteVehicalType;
}
public void setFavouriteVehicalType(String favouriteVehicalType) {
- this.favouriteVehicalType = favouriteVehicalType;
+ this.favouriteVehicalType = favouriteVehicalType;
}
public String getFavouriteVehicalSpecific() {
- return favouriteVehicalSpecific;
+ return favouriteVehicalSpecific;
}
public void setFavouriteVehicalSpecific(String favouriteVehicalSpecific) {
- this.favouriteVehicalSpecific = favouriteVehicalSpecific;
+ this.favouriteVehicalSpecific = favouriteVehicalSpecific;
}
public List getVehicalTypeList() {
- return vehicalTypeList;
+ return vehicalTypeList;
}
public List getVehicalSpecificList() {
- OgnlValueStack stack = ServletActionContext.getValueStack(ServletActionContext.getRequest());
- VehicalType vehicalType = (VehicalType) stack.findValue("top");
- System.out.println("vehicalType.getKey()"+vehicalType.getKey());
- return (List) vehicalSpecificMap.get(vehicalType);
+ OgnlValueStack stack = ServletActionContext.getValueStack(ServletActionContext.getRequest());
+ VehicalType vehicalType = (VehicalType) stack.findValue("top");
+ System.out.println("vehicalType.getKey()" + vehicalType.getKey());
+ return (List) vehicalSpecificMap.get(vehicalType);
}
public List getFavouriteLanguages() {
- return favouriteLanguages;
+ return favouriteLanguages;
}
public String getName() {
@@ -218,90 +218,101 @@
}
public void setFavouriteLanguage(String favouriteLanguage) {
- this.favouriteLanguage = favouriteLanguage;
+ this.favouriteLanguage = favouriteLanguage;
}
public String getFavouriteLanguage() {
- return favouriteLanguage;
+ return favouriteLanguage;
}
public void setThoughts(String thoughts) {
- this.thoughts = thoughts;
+ this.thoughts = thoughts;
}
public String getThoughts() {
- return this.thoughts;
+ return this.thoughts;
}
// -- inner classes --
public static class Language {
- String description;
- String key;
+ String description;
+ String key;
- public Language(String key, String description) {
- this.key = key;
- this.description = description;
- }
-
- public String getKey() {
- return key;
- }
- public String getDescription() {
- return description;
- }
+ public Language(String key, String description) {
+ this.key = key;
+ this.description = description;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public String getDescription() {
+ return description;
+ }
}
public static class VehicalType {
- String key;
- String description;
- public VehicalType(String key, String description) {
- this.key = key;
- this.description = description;
- }
-
- public String getKey() { return this.key; }
- public String getDescription() { return this.description; }
-
- public boolean equals(Object obj) {
- if (! (obj instanceof VehicalType)) {
- return false;
- }
- else {
- return key.equals(((VehicalType)obj).getKey());
- }
- }
-
- public int hashCode() {
- return key.hashCode();
- }
+ String key;
+ String description;
+
+ public VehicalType(String key, String description) {
+ this.key = key;
+ this.description = description;
+ }
+
+ public String getKey() {
+ return this.key;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public boolean equals(Object obj) {
+ if (! (obj instanceof VehicalType)) {
+ return false;
+ } else {
+ return key.equals(((VehicalType) obj).getKey());
+ }
+ }
+
+ public int hashCode() {
+ return key.hashCode();
+ }
}
public static class VehicalSpecific {
- String key;
- String description;
- public VehicalSpecific(String key, String description) {
- this.key = key;
- this.description = description;
- }
-
- public String getKey() { return this.key; }
- public String getDescription() { return this.description; }
-
- public boolean equals(Object obj) {
- if (! (obj instanceof VehicalSpecific)) {
- return false;
- }
- else {
- return key.equals(((VehicalSpecific)obj).getKey());
- }
- }
-
- public int hashCode() {
- return key.hashCode();
- }
+ String key;
+ String description;
+
+ public VehicalSpecific(String key, String description) {
+ this.key = key;
+ this.description = description;
+ }
+
+ public String getKey() {
+ return this.key;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public boolean equals(Object obj) {
+ if (! (obj instanceof VehicalSpecific)) {
+ return false;
+ } else {
+ return key.equals(((VehicalSpecific) obj).getKey());
+ }
+ }
+
+ public int hashCode() {
+ return key.hashCode();
+ }
}
}
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Simple-config.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Simple-config.xml?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Simple-config.xml (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/Simple-config.xml Sun Mar 19 18:19:35 2006
@@ -2,7 +2,7 @@
<xwork>
- <package name="Simple" namespace="/Simple" extends="webwork-default" >
+ <package name="Simple" namespace="/Simple" extends="webwork-default">
<action name="Open" class="cookbook2.Simple">
<result>/pages/Simple/Result.jsp</result>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Languages.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Languages.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Languages.java (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Languages.java Sun Mar 19 18:19:35 2006
@@ -1,17 +1,17 @@
package cookbook2.actiontag;
import com.opensymphony.xwork.ActionSupport;
+import cookbook2.Select;
import java.util.ArrayList;
import java.util.List;
-import cookbook2.Select;
public class Languages extends ActionSupport {
List favoriteLanguages = new ArrayList();
public List getFavoriteLanguages() {
- return favoriteLanguages;
+ return favoriteLanguages;
}
public String execute() {
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Result.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Result.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Result.java (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/actiontag/Result.java Sun Mar 19 18:19:35 2006
@@ -7,11 +7,11 @@
String favoriteLanguage;
public void setFavoriteLanguage(String favouriteLanguage) {
- this.favoriteLanguage = favouriteLanguage;
+ this.favoriteLanguage = favouriteLanguage;
}
public String getFavoriteLanguage() {
- return favoriteLanguage;
+ return favoriteLanguage;
}
String favoriteColor;
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/pojo/Result.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/pojo/Result.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/pojo/Result.java (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/java/cookbook2/pojo/Result.java Sun Mar 19 18:19:35 2006
@@ -1,7 +1,7 @@
package cookbook2.pojo;
-import com.opensymphony.xwork.ModelDriven;
import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork.ModelDriven;
public class Result extends ActionSupport implements ModelDriven {
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/java/xwork.xml?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/java/xwork.xml Sun Mar 19 18:19:35 2006
@@ -14,6 +14,6 @@
<include file="cookbook2/Select-config.xml"/>
- <include file="cookbook2/actiontag/ActionTag-config.xml" />
+ <include file="cookbook2/actiontag/ActionTag-config.xml"/>
</xwork>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/test/cookbook2/actiontag/LanguagesTest.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/test/cookbook2/actiontag/LanguagesTest.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/test/cookbook2/actiontag/LanguagesTest.java (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/test/cookbook2/actiontag/LanguagesTest.java Sun Mar 19 18:19:35 2006
@@ -1,9 +1,9 @@
package cookbook2.actiontag;
+import cookbook2.Select;
import junit.framework.TestCase;
-import java.util.List;
-import cookbook2.Select;
+import java.util.List;
public class LanguagesTest extends TestCase {
@@ -18,17 +18,17 @@
public void testContents() throws Exception {
List list = action.getFavoriteLanguages();
- assertNotNull("List is null!",list);
- assertTrue("List is not empty",list.size()==0);
+ assertNotNull("List is null!", list);
+ assertTrue("List is not empty", list.size() == 0);
action.execute();
List list2 = action.getFavoriteLanguages();
- assertNotNull("List is null!",list2);
- assertTrue("List is empty!",list.size()>0);
+ assertNotNull("List is null!", list2);
+ assertTrue("List is empty!", list.size() > 0);
Select.Language entry = (Select.Language) list.get(0);
- assertNotNull("Entry is null",entry);
- assertTrue("Entry is empty",entry.getDescription().length()>0);
+ assertNotNull("Entry is null", entry);
+ assertTrue("Entry is empty", entry.getDescription().length() > 0);
}
}
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp Sun Mar 19 18:19:35 2006
@@ -1,162 +1,166 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Struts Action 2 Cookbook</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>Struts Action 2 Cookbook</title>
-<link href="<ww:url value="/css/cookbook.css"/>" rel="stylesheet" type="text/css" />
+ <link href="<ww:url value="/css/cookbook.css"/>" rel="stylesheet" type="text/css"/>
</head>
+
<body>
<h2>Struts Action 2 Cookbook -- Examples with Code</h2>
+
<p>
This is a collection of working examples which demonstrate how to code
some common web application use cases.
</p>
+
<p>
To navigate your way through the examples, the following icons will help:
</p>
-<table border="0" cellspacing="5" width="85%" >
+<table border="0" cellspacing="5" width="85%">
+ <tr valign="top">
+ <td width="30"><ww:include value="/icon-open.jsp"/></td>
+ <td>Execute the example</td>
+ </tr>
+ <tr valign="top">
+ <td><ww:include value="/icon-view.jsp"/></td>
+ <td>View the source code for the example</td>
+ </tr>
<tr valign="top">
- <td width="30"><ww:include value="/icon-open.jsp" /></td>
- <td>Execute the example</td>
+ <td width="30"><ww:include value="/icon-home.jsp"/></td>
+ <td>Return to this screen</td>
</tr>
- <tr valign="top">
- <td><ww:include value="/icon-view.jsp" /></td>
- <td>View the source code for the example</td>
- </tr>
- <tr valign="top">
- <td width="30"><ww:include value="/icon-home.jsp" /></td>
- <td>Return to this screen</td>
- </tr>
</table>
-<br />
+<br/>
<table width="85%" border="0" cellpadding="2" cellspacing="5">
- <tr valign="top">
- <td>Hello World</td>
- <td>
+<tr valign="top">
+ <td>Hello World</td>
+ <td>
- <ww:url id="Hello_Open" action="Open" namespace="/Hello" />
- <ww:a href="%{Hello_Open}">
- <ww:include value="/icon-open.jsp" />
- </ww:a>
- <ww:a href="%{Hello_Open}">Execute</ww:a>
-
- </td>
- <td>
-
- <ww:url id="Hello_View" action="View" namespace="/Hello" />
- <ww:a href="%{Hello_View}">
- <ww:include value="/icon-view.jsp" />
- </ww:a>
- <ww:a href="%{Hello_View}">
- View Source
- </ww:a>
+ <ww:url id="Hello_Open" action="Open" namespace="/Hello"/>
+ <ww:a href="%{Hello_Open}">
+ <ww:include value="/icon-open.jsp"/>
+ </ww:a>
+ <ww:a href="%{Hello_Open}">Execute</ww:a>
- </td>
- </tr>
+ </td>
+ <td>
+
+ <ww:url id="Hello_View" action="View" namespace="/Hello"/>
+ <ww:a href="%{Hello_View}">
+ <ww:include value="/icon-view.jsp"/>
+ </ww:a>
+ <ww:a href="%{Hello_View}">
+ View Source
+ </ww:a>
+ </td>
+</tr>
- <tr valign="top">
+
+<tr valign="top">
<td>Simple Input Form using Action Properties</td>
<td>
- <ww:url id="Simple_Open" action="Open!input" namespace="/Simple" />
+ <ww:url id="Simple_Open" action="Open!input" namespace="/Simple"/>
<ww:a href="%{Simple_Open}">
- <ww:include value="/icon-open.jsp" />
+ <ww:include value="/icon-open.jsp"/>
</ww:a>
<ww:a href="%{Simple_Open}">Execute</ww:a>
- </td>
+ </td>
<td>
- <ww:url id="Simple_View" action="View" namespace="/Simple" />
+ <ww:url id="Simple_View" action="View" namespace="/Simple"/>
<ww:a href="%{Simple_View}">
- <ww:include value="/icon-view.jsp" />
+ <ww:include value="/icon-view.jsp"/>
</ww:a>
<ww:a href="%{Simple_View}">
View Source
</ww:a>
</td>
- </tr>
+</tr>
- <tr valign="top">
+<tr valign="top">
<td>Input Form using a POJO</td>
- <td>
+ <td>
- <ww:url id="Pojo_Open" action="Open!input" namespace="/Pojo" />
- <ww:a href="%{Pojo_Open}">
- <ww:include value="/icon-open.jsp" />
- </ww:a>
- <ww:a href="%{Pojo_Open}">Execute</ww:a>
-
- </td>
- <td>
-
- <ww:url id="Pojo_View" action="View" namespace="/Pojo" />
- <ww:a href="%{Pojo_View}">
- <ww:include value="/icon-view.jsp" />
- </ww:a>
- <ww:a href="%{Pojo_View}">
- View Source
- </ww:a>
-
- </td>
- </tr>
-
- <tr valign="top">
- <td>Complex Input Form using Select Controls</td>
- <td>
-
- <ww:url id="Select_Open" action="Open!input" namespace="/Select" />
- <ww:a href="%{Select_Open}">
- <ww:include value="/icon-open.jsp" />
- </ww:a>
- <ww:a href="%{Select_Open}">Execute</ww:a>
-
- </td>
- <td>
-
- <ww:url id="Select_View" action="View" namespace="/Select" />
- <ww:a href="%{Select_View}">
- <ww:include value="/icon-view.jsp" />
- </ww:a>
- <ww:a href="%{Select_View}">
- View Source
- </ww:a>
+ <ww:url id="Pojo_Open" action="Open!input" namespace="/Pojo"/>
+ <ww:a href="%{Pojo_Open}">
+ <ww:include value="/icon-open.jsp"/>
+ </ww:a>
+ <ww:a href="%{Pojo_Open}">Execute</ww:a>
- </td>
- </tr>
+ </td>
+ <td>
- <tr valign="top">
- <td>Action as Page Controllers</td>
- <td>
+ <ww:url id="Pojo_View" action="View" namespace="/Pojo"/>
+ <ww:a href="%{Pojo_View}">
+ <ww:include value="/icon-view.jsp"/>
+ </ww:a>
+ <ww:a href="%{Pojo_View}">
+ View Source
+ </ww:a>
+
+ </td>
+</tr>
+
+<tr valign="top">
+ <td>Complex Input Form using Select Controls</td>
+ <td>
+
+ <ww:url id="Select_Open" action="Open!input" namespace="/Select"/>
+ <ww:a href="%{Select_Open}">
+ <ww:include value="/icon-open.jsp"/>
+ </ww:a>
+ <ww:a href="%{Select_Open}">Execute</ww:a>
- <ww:url id="ActionTag_Open" action="Open!input" namespace="/ActionTag" />
- <ww:a href="%{ActionTag_Open}">
- <ww:include value="/icon-open.jsp" />
- </ww:a>
- <ww:a href="%{ActionTag_Open}">Execute</ww:a>
-
- </td>
- <td>
-
- <ww:url id="ActionTag_View" action="View" namespace="/ActionTag" />
- <ww:a href="%{ActionTag_View}">
- <ww:include value="/icon-view.jsp" />
- </ww:a>
- <ww:a href="%{ActionTag_View}">
- View Source
- </ww:a>
+ </td>
+ <td>
- </td>
- </tr>
+ <ww:url id="Select_View" action="View" namespace="/Select"/>
+ <ww:a href="%{Select_View}">
+ <ww:include value="/icon-view.jsp"/>
+ </ww:a>
+ <ww:a href="%{Select_View}">
+ View Source
+ </ww:a>
+
+ </td>
+</tr>
+
+<tr valign="top">
+ <td>Action as Page Controllers</td>
+ <td>
+
+ <ww:url id="ActionTag_Open" action="Open!input" namespace="/ActionTag"/>
+ <ww:a href="%{ActionTag_Open}">
+ <ww:include value="/icon-open.jsp"/>
+ </ww:a>
+ <ww:a href="%{ActionTag_Open}">Execute</ww:a>
+
+ </td>
+ <td>
+
+ <ww:url id="ActionTag_View" action="View" namespace="/ActionTag"/>
+ <ww:a href="%{ActionTag_View}">
+ <ww:include value="/icon-view.jsp"/>
+ </ww:a>
+ <ww:a href="%{ActionTag_View}">
+ View Source
+ </ww:a>
+
+ </td>
+</tr>
</table>
-<p><img src="<ww:url value="/images/valid-xhtml10.png"/>" alt="Valid XHTML 1.0!" height="31" width="88" /></p>
+<p><img src="<ww:url value="/images/valid-xhtml10.png"/>" alt="Valid XHTML 1.0!" height="31" width="88"/></p>
</body>
</html>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/css/cookbook.css
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/css/cookbook.css?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/css/cookbook.css (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/css/cookbook.css Sun Mar 19 18:19:35 2006
@@ -1,22 +1,68 @@
body {
- margin: 2% 10%;
- font: 12px/1.4 Verdana, Geneva, Arial, Helvetica, sans-serif;
+ margin: 2% 10%;
+ font: 12px / 1.4 Verdana, Geneva, Arial, Helvetica, sans-serif;
}
-h1 { font-size: 20px; }
-h2 { font-size: 16px; margin: 3em 0 0.5em; }
-h3 { font-size: 14px; margin: 2em 0 0.5em; }
-h4 { font-size: 12px; }
-h5 { font-size: 11px; }
-h6 { font-size: 10px; }
-
-hr { color: #999999; height: 1px; }
-
-img { border: none; }
-th { text-align: left; }
-
-.error { color: #FF0000; }
-.icon { float: right; margin: 5px; }
-.intro { font-size: 14px; line-height: 1.6; font-weight: bold;}
-.label { font-weight: bold; width: 260px; }
-.result { width: 100%; background: #eef; }
+h1 {
+ font-size: 20px;
+}
+
+h2 {
+ font-size: 16px;
+ margin: 3em 0 0.5em;
+}
+
+h3 {
+ font-size: 14px;
+ margin: 2em 0 0.5em;
+}
+
+h4 {
+ font-size: 12px;
+}
+
+h5 {
+ font-size: 11px;
+}
+
+h6 {
+ font-size: 10px;
+}
+
+hr {
+ color: #999999;
+ height: 1px;
+}
+
+img {
+ border: none;
+}
+
+th {
+ text-align: left;
+}
+
+.error {
+ color: #FF0000;
+}
+
+.icon {
+ float: right;
+ margin: 5px;
+}
+
+.intro {
+ font-size: 14px;
+ line-height: 1.6;
+ font-weight: bold;
+}
+
+.label {
+ font-weight: bold;
+ width: 260px;
+}
+
+.result {
+ width: 100%;
+ background: #eef;
+}
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-index.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-index.jsp Sun Mar 19 18:19:35 2006
@@ -1,10 +1,12 @@
-<%@taglib uri="/webwork" prefix="ww" %>
- <p>
- <a href="<ww:url action="Home" />">
- <img src="<ww:url value="/images/return.gif"/>" alt="Home" height="24" width="24" hspace="4" border="0" align="top" class="icon" />
- </a>
- <a href="<ww:url action="Open!input" />">
- <img src="<ww:url value="/images/execute.gif"/>" alt="Open" height="24" width="24" hspace="4" border="0" align="top" class="icon" />
- </a>
- </p>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<p>
+ <a href="<ww:url action="Home" />">
+ <img src="<ww:url value="/images/return.gif"/>" alt="Home" height="24" width="24" hspace="4" border="0"
+ align="top" class="icon"/>
+ </a>
+ <a href="<ww:url action="Open!input" />">
+ <img src="<ww:url value="/images/execute.gif"/>" alt="Open" height="24" width="24" hspace="4" border="0"
+ align="top" class="icon"/>
+ </a>
+</p>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-result.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/header-result.jsp Sun Mar 19 18:19:35 2006
@@ -1,11 +1,12 @@
-<%@taglib uri="/webwork" prefix="ww" %>
- <p>
- <a href="<ww:url action="Home" />">
- <img src="<ww:url value="/images/return.gif"/>" alt="Home" height="24" width="24" hspace="4" border="0" align="top" class="icon" />
- </a>
- <a href="<ww:url action="View" />">
- <img src="<ww:url value="/images/code.gif"/>"
- alt="Open" height="24" width="24" hspace="4"
- border="0" align="top" class="icon" />
- </a>
- </p>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<p>
+ <a href="<ww:url action="Home" />">
+ <img src="<ww:url value="/images/return.gif"/>" alt="Home" height="24" width="24" hspace="4" border="0"
+ align="top" class="icon"/>
+ </a>
+ <a href="<ww:url action="View" />">
+ <img src="<ww:url value="/images/code.gif"/>"
+ alt="Open" height="24" width="24" hspace="4"
+ border="0" align="top" class="icon"/>
+ </a>
+</p>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-home.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-home.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-home.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-home.jsp Sun Mar 19 18:19:35 2006
@@ -1,2 +1,3 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<img src="<ww:url value="/images/return.gif"/>" alt="Home" height="24" width="24" hspace="4" border="0" align="top" class="inline" />
\ No newline at end of file
+<%@ taglib uri="/webwork" prefix="ww" %>
+<img src="<ww:url value="/images/return.gif"/>" alt="Home" height="24" width="24" hspace="4" border="0" align="top"
+ class="inline"/>
\ No newline at end of file
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-open.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-open.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-open.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-open.jsp Sun Mar 19 18:19:35 2006
@@ -1,2 +1,3 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<img src="<ww:url value="/images/execute.gif"/>" alt="Open" height="24" width="24" hspace="4" border="0" align="top" class="inline" />
+<%@ taglib uri="/webwork" prefix="ww" %>
+<img src="<ww:url value="/images/execute.gif"/>" alt="Open" height="24" width="24" hspace="4" border="0" align="top"
+ class="inline"/>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-view.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-view.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-view.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/icon-view.jsp Sun Mar 19 18:19:35 2006
@@ -1,2 +1,3 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<img src="<ww:url value="/images/code.gif"/>" alt="View" border="0" height="24" width="24" hspace="4" align="top" class="inline" />
+<%@ taglib uri="/webwork" prefix="ww" %>
+<img src="<ww:url value="/images/code.gif"/>" alt="View" border="0" height="24" width="24" hspace="4" align="top"
+ class="inline"/>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/index.html
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/index.html?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/index.html (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/index.html Sun Mar 19 18:19:35 2006
@@ -1,8 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<META HTTP-EQUIV="Refresh" CONTENT="0;URL=Home.jsp">
+ <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Home.jsp">
</head>
+
<body>
<p>Loading ...</p>
</body>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Input.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Input.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Input.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Input.jsp Sun Mar 19 18:19:35 2006
@@ -1,29 +1,30 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
<head>
-<title>CookBook - Action as Page Controller</title>
-<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
+ <title>CookBook - Action as Page Controller</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
</head>
+
<body>
<ww:include value="/header-result.jsp"/>
<h1>Action as Page Controller</h1>
- <p>
- The controls on this page is each populated by its own action
- and formatted on its own server page fragment.
- Accordingly, each control could be re-used on any number of pages.
- </p>
+<p>
+ The controls on this page is each populated by its own action
+ and formatted on its own server page fragment.
+ Accordingly, each control could be re-used on any number of pages.
+</p>
<ww:form method="POST">
- <ww:action name="languages" namespace="/ActionTag" executeResult="true" />
+ <ww:action name="languages" namespace="/ActionTag" executeResult="true"/>
- <ww:action name="colors" namespace="/ActionTag" executeResult="true" />
+ <ww:action name="colors" namespace="/ActionTag" executeResult="true"/>
- <ww:submit />
+ <ww:submit/>
</ww:form>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Result.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/Result.jsp Sun Mar 19 18:19:35 2006
@@ -1,18 +1,19 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
- <head>
- <title>Cookbook - Action as Page Controller</title>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
- </head>
- <body>
- <ww:include value="/header-result.jsp"/>
+<head>
+ <title>Cookbook - Action as Page Controller</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
+</head>
- <h1>Input Result</h1>
+<body>
+<ww:include value="/header-result.jsp"/>
- <table>
- <ww:label label="Favorite Language" name="favoriteLanguage" />
- <ww:label label="Favorite Color" name="favoriteColor" />
- </table>
+<h1>Input Result</h1>
- </body>
+<table>
+ <ww:label label="Favorite Language" name="favoriteLanguage"/>
+ <ww:label label="Favorite Color" name="favoriteColor"/>
+</table>
+
+</body>
</html>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/colors.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/colors.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/colors.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/colors.jsp Sun Mar 19 18:19:35 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<ww:select
tooltip="Choose Your Favourite Color"
label="Favorite Color"
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/index.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/index.jsp Sun Mar 19 18:19:35 2006
@@ -1,11 +1,13 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Source Code for Action as Page Controller</title>
-<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>Source Code for Action as Page Controller</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
</head>
+
<body>
<ww:include value="/header-index.jsp"/>
@@ -44,6 +46,7 @@
</li></ul>
<h2>Other source files</h2>
+
<p>None</p>
</body>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/languages.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/languages.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/languages.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/ActionTag/languages.jsp Sun Mar 19 18:19:35 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<ww:select
tooltip="Choose Your Favorite Language"
label="Favorite Language"
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp Sun Mar 19 18:19:35 2006
@@ -1,13 +1,14 @@
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/webwork" prefix="ww" %>
<html>
- <head>
- <title>Cookbook - Hello World</title>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
- </head>
- <body>
- <ww:include value="/header-result.jsp"/>
+<head>
+ <title>Cookbook - Hello World</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
+</head>
- <h1>Don't panic! Struts is mostly harmless ...</h1>
+<body>
+<ww:include value="/header-result.jsp"/>
- </body>
+<h1>Don't panic! Struts is mostly harmless ...</h1>
+
+</body>
</html>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp Sun Mar 19 18:19:35 2006
@@ -1,10 +1,12 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<title>Source Code for Hello World</title>
-<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
+ <title>Source Code for Hello World</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
</head>
+
<body>
<ww:include value="/header-index.jsp"/>
@@ -18,6 +20,7 @@
</li></ul>
<h2>Actions</h2>
+
<p>None</p>
<h2>Configuration files</h2>
@@ -26,6 +29,7 @@
</li></ul>
<h2>Other source files</h2>
+
<p>None</p>
</body>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Input.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Input.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Input.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Input.jsp Sun Mar 19 18:19:35 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
<head>
<title>Cookbook - Input Form using a POJO</title>
@@ -9,41 +9,41 @@
<ww:form method="POST">
<ww:textfield
- label="First Name"
- name="firstname"
- tooltip="Enter your first name here" />
+ label="First Name"
+ name="firstname"
+ tooltip="Enter your first name here"/>
<ww:textfield
- label="Last Name"
- name="lastname"
- tooltip="Enter your last name here" />
+ label="Last Name"
+ name="lastname"
+ tooltip="Enter your last name here"/>
<ww:textfield
- label="Telephone"
- name="extension"
- tooltip="Enter your office telephone number here" />
+ label="Telephone"
+ name="extension"
+ tooltip="Enter your office telephone number here"/>
<ww:textfield
- label="Email Address"
- name="username"
- tooltip="Enter your email address here" />
+ label="Email Address"
+ name="username"
+ tooltip="Enter your email address here"/>
<ww:datepicker
- tooltip="Select your hire date"
- label="Hire Date"
- name="hired"/>
+ tooltip="Select your hire date"
+ label="Hire Date"
+ name="hired"/>
<ww:textfield
- label="Hours"
- name="hours"
- tooltip="Enter the number of hours you are scheduled to work" />
+ label="Hours"
+ name="hours"
+ tooltip="Enter the number of hours you are scheduled to work"/>
<ww:checkbox
- label="Editor?"
- name="editor"
+ label="Editor?"
+ name="editor"
tooltip="Are you authorized to edit directory entries?"/>
- <ww:submit />
+ <ww:submit/>
</ww:form>
</body>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Result.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/Result.jsp Sun Mar 19 18:19:35 2006
@@ -1,21 +1,22 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
- <head>
- <title>Cookbook - Input Form using a POJO</title>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
- </head>
- <body>
- <ww:include value="/header-result.jsp"/>
+<head>
+ <title>Cookbook - Input Form using a POJO</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
+</head>
- <h1>Input Result</h1>
- <table>
- <ww:label label="First Name" name="firstname" />
- <ww:label label="Last Name" name="lastname" />
- <ww:label label="Telephone" name="extension" />
- <ww:label label="User Name" name="username" />
- <ww:label label="Hired" name="hired" />
- <ww:label label="Hours" name="hours" />
- <ww:label label="Editor?" name="editor" />
- </table>
- </body>
+<body>
+<ww:include value="/header-result.jsp"/>
+
+<h1>Input Result</h1>
+<table>
+ <ww:label label="First Name" name="firstname"/>
+ <ww:label label="Last Name" name="lastname"/>
+ <ww:label label="Telephone" name="extension"/>
+ <ww:label label="User Name" name="username"/>
+ <ww:label label="Hired" name="hired"/>
+ <ww:label label="Hours" name="hours"/>
+ <ww:label label="Editor?" name="editor"/>
+</table>
+</body>
</html>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/index.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Pojo/index.jsp Sun Mar 19 18:19:35 2006
@@ -1,11 +1,13 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Source Code for Input Form using a POJO</title>
-<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>Source Code for Input Form using a POJO</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
</head>
+
<body>
<ww:include value="/header-index.jsp"/>
@@ -31,6 +33,7 @@
</li></ul>
<h2>Other source files</h2>
+
<p>None</p>
</body>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Input.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Input.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Input.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Input.jsp Sun Mar 19 18:19:35 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
<head>
<title>Cookbook - Complex Input Form using Select Controls</title>
@@ -8,106 +8,106 @@
<body>
<ww:form method="POST">
- <ww:textfield
- label="Name"
- name="name"
- tooltip="Enter your Name here" />
-
- <ww:datepicker
- tooltip="Select Your Birthday"
- label="Birthday"
- name="birthday"/>
-
- <ww:textarea
- tooltip="Enter your Biography"
- label="Biograph"
- name="bio"
- cols="20"
- rows="3"/>
-
- <ww:select
- tooltip="Choose Your Favourite Color"
- label="Favorite Color"
- list="{'Red', 'Blue', 'Green'}"
- name="favoriteColor"
- emptyOption="true"
- headerKey="None"
- headerValue="None"/>
-
- <ww:select
- tooltip="Choose Your Favourite Language"
- label="Favourite Language"
- list="favouriteLanguages"
- name="favouriteLanguage"
- listKey="key"
- listValue="description"
- emptyOption="true"
- headerKey="None"
- headerValue="None"/>
-
- <ww:checkboxlist
- tooltip="Choose your Friends"
- label="Friends"
- list="{'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
- name="friends"/>
-
- <ww:checkbox
- tooltip="Confirmed that your are Over 18"
- label="Age 18+"
- name="legalAge"/>
-
- <ww:doubleselect
- tooltip="Choose Your State"
- label="State"
- name="region" list="{'North', 'South'}"
- value="'South'"
- doubleValue="'Florida'"
- doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}"
- doubleName="state"
- headerKey="-1"
- headerValue="---------- Please Select ----------"
- emptyOption="true" />
-
- <ww:doubleselect
- tooltip="Choose your Vehicle"
- label="Favourite Vehical"
- name="favouriteVehicalType"
- list="vehicalTypeList"
- listKey="key"
- listValue="description"
- value="'MotorcycleKey'"
- doubleValue="'YamahaKey'"
- doubleList="vehicalSpecificList"
- doubleListKey="key"
- doubleListValue="description"
- doubleName="favouriteVehicalSpecific" headerKey="-1"
- headerValue="---------- Please Select ----------"
- emptyOption="true" />
-
- <ww:file
- tooltip="Upload Your Picture"
- label="Picture"
- name="picture" />
-
- <ww:optiontransferselect
- tooltip="Select Your Favourite Cartoon Characters"
- label="Favourite Cartoons Characters"
- name="leftSideCartoonCharacters"
- leftTitle="Left Title"
- rightTitle="Right Title"
- list="{'Popeye', 'He-Man', 'Spiderman'}"
- multiple="true"
- headerKey="headerKey"
- headerValue="--- Please Select ---"
- emptyOption="true"
- doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
- doubleName="rightSideCartoonCharacters"
- doubleHeaderKey="doubleHeaderKey"
- doubleHeaderValue="--- Please Select ---"
- doubleEmptyOption="true"
- doubleMultiple="true" />
+<ww:textfield
+ label="Name"
+ name="name"
+ tooltip="Enter your Name here"/>
+
+<ww:datepicker
+ tooltip="Select Your Birthday"
+ label="Birthday"
+ name="birthday"/>
+
+<ww:textarea
+ tooltip="Enter your Biography"
+ label="Biograph"
+ name="bio"
+ cols="20"
+ rows="3"/>
+
+<ww:select
+ tooltip="Choose Your Favourite Color"
+ label="Favorite Color"
+ list="{'Red', 'Blue', 'Green'}"
+ name="favoriteColor"
+ emptyOption="true"
+ headerKey="None"
+ headerValue="None"/>
+
+<ww:select
+ tooltip="Choose Your Favourite Language"
+ label="Favourite Language"
+ list="favouriteLanguages"
+ name="favouriteLanguage"
+ listKey="key"
+ listValue="description"
+ emptyOption="true"
+ headerKey="None"
+ headerValue="None"/>
+
+<ww:checkboxlist
+ tooltip="Choose your Friends"
+ label="Friends"
+ list="{'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+ name="friends"/>
+
+<ww:checkbox
+ tooltip="Confirmed that your are Over 18"
+ label="Age 18+"
+ name="legalAge"/>
+
+<ww:doubleselect
+ tooltip="Choose Your State"
+ label="State"
+ name="region" list="{'North', 'South'}"
+ value="'South'"
+ doubleValue="'Florida'"
+ doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}"
+ doubleName="state"
+ headerKey="-1"
+ headerValue="---------- Please Select ----------"
+ emptyOption="true"/>
+
+<ww:doubleselect
+ tooltip="Choose your Vehicle"
+ label="Favourite Vehical"
+ name="favouriteVehicalType"
+ list="vehicalTypeList"
+ listKey="key"
+ listValue="description"
+ value="'MotorcycleKey'"
+ doubleValue="'YamahaKey'"
+ doubleList="vehicalSpecificList"
+ doubleListKey="key"
+ doubleListValue="description"
+ doubleName="favouriteVehicalSpecific" headerKey="-1"
+ headerValue="---------- Please Select ----------"
+ emptyOption="true"/>
+
+<ww:file
+ tooltip="Upload Your Picture"
+ label="Picture"
+ name="picture"/>
+
+<ww:optiontransferselect
+ tooltip="Select Your Favourite Cartoon Characters"
+ label="Favourite Cartoons Characters"
+ name="leftSideCartoonCharacters"
+ leftTitle="Left Title"
+ rightTitle="Right Title"
+ list="{'Popeye', 'He-Man', 'Spiderman'}"
+ multiple="true"
+ headerKey="headerKey"
+ headerValue="--- Please Select ---"
+ emptyOption="true"
+ doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
+ doubleName="rightSideCartoonCharacters"
+ doubleHeaderKey="doubleHeaderKey"
+ doubleHeaderValue="--- Please Select ---"
+ doubleEmptyOption="true"
+ doubleMultiple="true"/>
- <ww:submit onclick="alert('Don't Panic! (Just press OK to continue)');" />
+<ww:submit onclick="alert('Don't Panic! (Just press OK to continue)');"/>
</ww:form>
</body>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp Sun Mar 19 18:19:35 2006
@@ -1,43 +1,44 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
- <head>
- <title>Cookbook - Complex Input Form using Select Controls</title>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
- </head>
- <body>
- <ww:include value="/header-result.jsp"/>
+<head>
+ <title>Cookbook - Complex Input Form using Select Controls</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
+</head>
- <h1>Input Result</h1>
- <table>
- <ww:label label="Name" name="name" />
- <ww:label label="Birthday" name="birthday" />
- <ww:label label="Biography" name="bio" />
- <ww:label label="Favourite Color" name="favouriteColor" />
- <ww:label label="Friends" name="friends" />
- <ww:label label="Legal Age" name="legalAge" />
- <ww:label label="Region" name="region" />
- <ww:label label="State" name="state" />
- <ww:label label="Picture" name="picture" />
- <ww:label label="Favourite Language" name="favouriteLanguage" />
- <ww:label label="Favourite Vehical Type" name="favouriteVehicalType" />
- <ww:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific" />
- <tr>
- <td>Favourite Cartoon Characters (Left):</td>
- <td>
- <ww:iterator value="leftSideCartoonCharacters" status="stat">
- <ww:property value="%{#stat.count}" />.<ww:property value="top" />
- </ww:iterator>
- </td>
- </tr>
- <tr>
- <td>Favourite Cartoon Characters (Right):</td>
- <td>
- <ww:iterator value="rightSideCartoonCharacters" status="stat">
- <ww:property value="%{#stat.count}" />.<ww:property value="top" />
- </ww:iterator>
- </td>
- </tr>
- </table>
+<body>
+<ww:include value="/header-result.jsp"/>
- </body>
+<h1>Input Result</h1>
+<table>
+ <ww:label label="Name" name="name"/>
+ <ww:label label="Birthday" name="birthday"/>
+ <ww:label label="Biography" name="bio"/>
+ <ww:label label="Favourite Color" name="favouriteColor"/>
+ <ww:label label="Friends" name="friends"/>
+ <ww:label label="Legal Age" name="legalAge"/>
+ <ww:label label="Region" name="region"/>
+ <ww:label label="State" name="state"/>
+ <ww:label label="Picture" name="picture"/>
+ <ww:label label="Favourite Language" name="favouriteLanguage"/>
+ <ww:label label="Favourite Vehical Type" name="favouriteVehicalType"/>
+ <ww:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific"/>
+ <tr>
+ <td>Favourite Cartoon Characters (Left):</td>
+ <td>
+ <ww:iterator value="leftSideCartoonCharacters" status="stat">
+ <ww:property value="%{#stat.count}"/>.<ww:property value="top"/>
+ </ww:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Favourite Cartoon Characters (Right):</td>
+ <td>
+ <ww:iterator value="rightSideCartoonCharacters" status="stat">
+ <ww:property value="%{#stat.count}"/>.<ww:property value="top"/>
+ </ww:iterator>
+ </td>
+ </tr>
+</table>
+
+</body>
</html>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp Sun Mar 19 18:19:35 2006
@@ -1,11 +1,13 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Source Code for Complex Input Form using Select Controls</title>
-<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>Source Code for Complex Input Form using Select Controls</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
</head>
+
<body>
<ww:include value="/header-index.jsp"/>
@@ -31,6 +33,7 @@
</li></ul>
<h2>Other source files</h2>
+
<p>None</p>
</body>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Input.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Input.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Input.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Input.jsp Sun Mar 19 18:19:35 2006
@@ -1,13 +1,14 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
- <head>
- <title>Cookbook - Simple Input Form using Action Properties</title>
- <ww:head/>
- </head>
- <body>
- <ww:form method="POST">
- <ww:textfield label="Please enter your name" name="name" />
- <ww:submit />
- </ww:form>
- </body>
+<head>
+ <title>Cookbook - Simple Input Form using Action Properties</title>
+ <ww:head/>
+</head>
+
+<body>
+<ww:form method="POST">
+ <ww:textfield label="Please enter your name" name="name"/>
+ <ww:submit/>
+</ww:form>
+</body>
</html>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Result.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/Result.jsp Sun Mar 19 18:19:35 2006
@@ -1,14 +1,15 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/webwork" %>
<html>
- <head>
- <title>Cookbook - Simple Input Form using Action Properties</title>
- </head>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
- <body>
- <ww:include value="/header-result.jsp"/>
+<head>
+ <title>Cookbook - Simple Input Form using Action Properties</title>
+</head>
+<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
- <h1>Don't panic <ww:property value="name" />!
- Struts is mostly harmless ...</h1>
+<body>
+<ww:include value="/header-result.jsp"/>
- </body>
+<h1>Don't panic <ww:property value="name"/>!
+ Struts is mostly harmless ...</h1>
+
+</body>
</html>
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp Sun Mar 19 18:19:35 2006
@@ -1,11 +1,13 @@
-<%@taglib uri="/webwork" prefix="ww" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Source Code for Simple Input Form using Action Properties</title>
-<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>Source Code for Simple Input Form using Action Properties</title>
+ <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />">
</head>
+
<body>
<ww:include value="/header-index.jsp"/>
@@ -33,6 +35,7 @@
</li></ul>
<h2>Other source files</h2>
+
<p>None</p>
</body>
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java Sun Mar 19 18:19:35 2006
@@ -18,34 +18,28 @@
package mailreader2;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
-
/**
- * <p><code>ServletContextListener</code> that initializes and finalizes the
- * persistent storage of User and Subscription information for the Struts
- * Demonstration Application, using an in-memory database backed by an
- * XML file.</p>
- *
- * <p><strong>IMPLEMENTATION WARNING</strong> - If this web application is run
- * from a WAR file, or in another environment where reading and writing of the
- * web application resource is impossible, the initial contents will be copied
- * to a file in the web application temporary directory provided by the
- * 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>
+ * <p><code>ServletContextListener</code> that initializes and finalizes the persistent storage of User and Subscription
+ * information for the Struts Demonstration Application, using an in-memory database backed by an XML file.</p>
+ *
+ * <p><strong>IMPLEMENTATION WARNING</strong> - If this web application is run from a WAR file, or in another
+ * environment where reading and writing of the web application resource is impossible, the initial contents will be
+ * copied to a file in the web application temporary directory provided by the 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>
*
* <p>This class was borrowed from the Shale Mailreader. Changes were:</p>
*
@@ -60,24 +54,21 @@
public final class ApplicationListener implements ServletContextListener {
-
// ------------------------------------------------------ Manifest Constants
/**
- * <p>Appication scope attribute key under which the in-memory
- * version of our database is stored.</p>
+ * <p>Appication scope attribute key under which the in-memory version of our database is stored.</p>
*/
public static final String DATABASE_KEY = "database";
/**
- * <p>Application scope attribute key under which the valid
- * selection items for the protocol property is stored.</p>
+ * <p>Application scope attribute key under which the valid selection items for the protocol property is
+ * stored.</p>
*/
public static final String PROTOCOLS_KEY = "protocols";
-
// ------------------------------------------------------ Instance Variables
@@ -98,13 +89,11 @@
*/
private Log log = LogFactory.getLog(this.getClass());
-
// ------------------------------------------------------------- Properties
/**
- * The web application resource path of our persistent database
- * storage file.
+ * The web application resource path of our persistent database storage file.
*/
private String pathname = "/WEB-INF/classes/database.xml";
@@ -116,13 +105,11 @@
this.pathname = pathname;
}
-
// ------------------------------------------ ServletContextListener Methods
/**
- * <p>Gracefully shut down this database, releasing any resources
- * that were allocated at initialization.</p>
+ * <p>Gracefully shut down this database, releasing any resources that were allocated at initialization.</p>
*
* @param event ServletContextEvent to process
*/
@@ -138,7 +125,7 @@
}
}
- context.removeAttribute(DATABASE_KEY);
+ context.removeAttribute(DATABASE_KEY);
context.removeAttribute(PROTOCOLS_KEY);
database = null;
context = null;
@@ -150,12 +137,11 @@
* <p>Initialize and load our initial database from persistent storage.</p>
*
* @param event The context initialization event
- *
*/
public void contextInitialized(ServletContextEvent event) {
log.info("Initializing memory database plug in from '" +
- pathname + "'");
+ pathname + "'");
// Remember our associated ServletContext
this.context = event.getServletContext();
@@ -172,29 +158,27 @@
} catch (Exception e) {
log.error("Opening memory database", e);
throw new IllegalStateException("Cannot load database from '" +
- pathname + "': " + e);
+ pathname + "': " + e);
}
context.setAttribute(DATABASE_KEY, database);
// Cache the selection items for protocols
- String[][] protocols = new String[][]{
- {"imap", "IMAP Protocol"},
- {"pop3", "POP3 Protocol"}
+ String[][] protocols = new String[][] {
+ { "imap", "IMAP Protocol" },
+ { "pop3", "POP3 Protocol" }
};
context.setAttribute(PROTOCOLS_KEY, protocols);
}
-
// -------------------------------------------------------- Private Methods
/**
- * Calculate and return an absolute pathname to the XML file to contain
- * our persistent storage information.
+ * Calculate and return an absolute pathname to the XML file to contain our persistent storage information.
*
- * @exception Exception if an input/output error occurs
+ * @throws Exception if an input/output error occurs
*/
private String calculatePath() throws Exception {
@@ -206,7 +190,7 @@
// Does a copy of this file already exist in our temporary directory
File dir = (File)
- context.getAttribute("javax.servlet.context.tempdir");
+ context.getAttribute("javax.servlet.context.tempdir");
File file = new File(dir, "struts-example-database.xml");
if (file.exists()) {
return (file.getAbsolutePath());
@@ -214,10 +198,10 @@
// Copy the static resource to a temporary file and return its path
InputStream is =
- context.getResourceAsStream(pathname);
+ context.getResourceAsStream(pathname);
BufferedInputStream bis = new BufferedInputStream(is, 1024);
FileOutputStream os =
- new FileOutputStream(file);
+ new FileOutputStream(file);
BufferedOutputStream bos = new BufferedOutputStream(os, 1024);
byte buffer[] = new byte[1024];
while (true) {
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java Sun Mar 19 18:19:35 2006
@@ -19,9 +19,7 @@
package mailreader2;
/**
- * <p>
- * Manifest constants for the MailReader application.
- * </p>
+ * <p> Manifest constants for the MailReader application. </p>
*
* @version $Rev: 360442 $ $Date: 2005-12-31 15:10:04 -0500 (Sat, 31 Dec 2005) $
*/
@@ -31,107 +29,77 @@
// --- Tokens ----
/**
- * <p>
- * The token representing a "create" task.
- * </p>
+ * <p> The token representing a "create" task. </p>
*/
public static final String CREATE = "Create";
/**
- * <p>
- * The application scope attribute under which our user database
- * is stored.
- * </p>
+ * <p> The application scope attribute under which our user database is stored. </p>
*/
public static final String DATABASE_KEY = "database";
/**
- * <p>
- * The token representing a "edit" task.
- * </p>
+ * <p> The token representing a "edit" task. </p>
*/
public static final String DELETE = "Delete";
/**
- * <p>
- * The token representing a "edit" task.
- * </p>
+ * <p> The token representing a "edit" task. </p>
*/
public static final String EDIT = "Edit";
/**
- * <p>
- * The request attributes key under the WelcomeAction stores an ArrayList
- * of error messages, if required resources are missing.
- * </p>
+ * <p> The request attributes key under the WelcomeAction stores an ArrayList of error messages, if required
+ * resources are missing. </p>
*/
public static final String ERROR_KEY = "ERROR";
/**
- * <p>
- * The token representing a "failure" result for this application.
- * </p>
+ * <p> The token representing a "failure" result for this application. </p>
*/
public static final String FAILURE = "Failure";
/**
- * <p>
- * The token representing a "logon" result for this application.
- * </p>
+ * <p> The token representing a "logon" result for this application. </p>
*/
public static final String LOGON = "Logon";
/**
- * <p>
- * The package name for this application.
- * </p>
+ * <p> The package name for this application. </p>
*/
public static final String PACKAGE = "org.apache.struts.apps.mailreader";
/**
- * <p>
- * The token representing a "save" task.
- * </p>
+ * <p> The token representing a "save" task. </p>
*/
public static final String SAVE = "Save";
/**
- * <p>
- * The session scope attribute under which the Subscription object
- * currently selected by our logged-in User is stored.
- * </p>
+ * <p> The session scope attribute under which the Subscription object currently selected by our logged-in User is
+ * stored. </p>
*/
public static final String SUBSCRIPTION_KEY = "subscription";
/**
- * <p>
- * The token representing a "success" result for this application.
- * </p>
+ * <p> The token representing a "success" result for this application. </p>
*/
public static final String SUCCESS = "Success";
/**
- * <p>
- * The session scope attribute under which the User object
- * for the currently logged in user is stored.
- * </p>
+ * <p> The session scope attribute under which the User object for the currently logged in user is stored. </p>
*/
public static final String USER_KEY = "user";
// ---- Error Messages ----
/**
- * <p>
- * A static message in case database resource is not loaded.
- * <p>
+ * <p> A static message in case database resource is not loaded. <p>
*/
public static final String ERROR_DATABASE_NOT_LOADED =
"ERROR: User database not loaded -- check servlet container logs for error messages.";
/**
- * <p>
- * A static message in case message resource is not loaded.
- * </p>
+ * <p> A static message in case message resource is not loaded. </p>
*/
public static final String ERROR_MESSAGES_NOT_LOADED =
"ERROR: Message resources not loaded -- check servlet container logs for error messages.";
@@ -139,95 +107,69 @@
// ---- Error Tokens ----
/**
- * <p>
- * The resource key for an error with the transactional token.
- * </p>
+ * <p> The resource key for an error with the transactional token. </p>
*/
public static final String MSG_TRANSACTION_TOKEN = "error.transaction.token";
// ---- Log Messages ----
/**
- * <p>
- * The message to log when cancelling a transaction.
- * </p>
+ * <p> The message to log when cancelling a transaction. </p>
*/
public static final String LOG_CANCEL = " Transaction cancelled: ";
/**
- * <p>
- * The message to log when forwarding to a result.
- * </p>
+ * <p> The message to log when forwarding to a result. </p>
*/
public static final String LOG_RESULT = " Forwarding to result: ";
/**
- * <p>
- * The message to log when forwarding to a 'failure' result.
- * <p>
+ * <p> The message to log when forwarding to a 'failure' result. <p>
*/
public static final String LOG_FAILURE = LOG_RESULT + FAILURE;
/**
- * <p>
- * The message to log when forwarding to a 'logon' result.
- * </p>
+ * <p> The message to log when forwarding to a 'logon' result. </p>
*/
public static final String LOG_LOGON = LOG_RESULT + LOGON;
/**
- * <p>
- * The message to log when populating a form.
- * </p>
+ * <p> The message to log when populating a form. </p>
*/
public static final String LOG_POPULATE_FORM = " Populating form from: ";
/**
- * <p>
- * The message to log when populating a subscription.
- * </p>
+ * <p> The message to log when populating a subscription. </p>
*/
public static final String LOG_POPULATE_SUBSCRIPTION = " Populating subscription: ";
/**
- * <p>
- * The message to log when populating a user.
- * </p>
+ * <p> The message to log when populating a user. </p>
*/
public static final String LOG_POPULATE_USER = " Populating user: ";
/**
- * <p>
- * The message to log when forwarding to a 'success' result.
- * </p>
+ * <p> The message to log when forwarding to a 'success' result. </p>
*/
public static final String LOG_PROCESSING = " Processing: ";
/**
- * <p>
- * The message to log when forwarding to a 'success' result.
- * </p>
+ * <p> The message to log when forwarding to a 'success' result. </p>
*/
public static final String LOG_SUCCESS = LOG_RESULT + SUCCESS;
/**
- * <p>
- * The message to log when setting a transactional token.
- * </p>
+ * <p> The message to log when setting a transactional token. </p>
*/
public static final String LOG_TOKEN = " Setting transactional control token";
/**
- * <p>
- * The message to log when checking a transactional token.
- * </p>
+ * <p> The message to log when checking a transactional token. </p>
*/
public static final String LOG_TOKEN_CHECK = " Checking transactional control token";
/**
- * <p>
- * Message to log if saving a user fails.
- * </p>
+ * <p> Message to log if saving a user fails. </p>
*/
public static final String LOG_DATABASE_SAVE_ERROR = " Unexpected error when saving User: ";
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon-validation.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon-validation.xml?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon-validation.xml (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon-validation.xml Sun Mar 19 18:19:35 2006
@@ -8,7 +8,7 @@
</field>
<field name="password">
<field-validator type="requiredstring">
- <message key="error.password.required" />
+ <message key="error.password.required"/>
</field-validator>
</field>
</validators>
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon.java?rev=387108&r1=387107&r2=387108&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon.java (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Logon.java Sun Mar 19 18:19:35 2006
@@ -17,13 +17,11 @@
*/
package mailreader2;
-import org.apache.struts.apps.mailreader.dao.User;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
+import org.apache.struts.apps.mailreader.dao.User;
/**
- * <p>
- * Validate a user logon.
- * </p>
+ * <p> Validate a user logon. </p>
*
* @version $Rev: 360442 $ $Date: 2005-12-31 15:10:04 -0500 (Sat, 31 Dec 2005) $
*/
@@ -72,20 +70,20 @@
}
/**
- * <p>
- * Use "username" and "password" fields to retrieve a User
- * object from the database. If credentials are not valid, or database
- * has disappeared, post error messages and forward to input.
- * </p>
- *
+ * <p> Use "username" and "password" fields to retrieve a User object from the database. If credentials are not
+ * valid, or database has disappeared, post error messages and forward to input. </p>
*/
public String execute() throws ExpiredPasswordException {
- User user = findUser(getUsername(),getPassword());
-
- if (user!=null) setUser(user);
+ User user = findUser(getUsername(), getPassword());
- if (this.hasErrors()) return INPUT;
+ if (user != null) {
+ setUser(user);
+ }
+
+ if (this.hasErrors()) {
+ return INPUT;
+ }
return SUCCESS;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org