struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1400220 [4/9] - in /struts/struts2/trunk/apps/showcase: ./ src/main/java/org/apache/struts2/showcase/ src/main/java/org/apache/struts2/showcase/action/ src/main/java/org/apache/struts2/showcase/actionchaining/ src/main/java/org/apache/stru...
Date Fri, 19 Oct 2012 18:49:48 GMT
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java Fri Oct 19 18:49:39 2012
@@ -20,32 +20,27 @@
  */
 package org.apache.struts2.showcase.integration;
 
+import org.apache.struts.action.*;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-
 public class SaveGangsterAction extends Action {
 
-    /* (non-Javadoc)
-     * @see org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-        // Some code to save the gangster to the db as necessary
-        GangsterForm gform = (GangsterForm) form;
-        ActionMessages messages = new ActionMessages();
-        messages.add("msg", new ActionMessage("Gangster "+gform.getName()+" added successfully"));
-        addMessages(request, messages);
+	/* (non-Javadoc)
+		 * @see org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+		 */
+	@Override
+	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+		// Some code to save the gangster to the db as necessary
+		GangsterForm gform = (GangsterForm) form;
+		ActionMessages messages = new ActionMessages();
+		messages.add("msg", new ActionMessage("Gangster " + gform.getName() + " added successfully"));
+		addMessages(request, messages);
 
-        return mapping.findForward("success");
-    }
+		return mapping.findForward("success");
+	}
 
 
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java Fri Oct 19 18:49:39 2012
@@ -20,17 +20,13 @@
  */
 package org.apache.struts2.showcase.jsf;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.struts2.showcase.action.EmployeeAction;
 import org.apache.struts2.showcase.dao.SkillDao;
 import org.apache.struts2.showcase.model.Employee;
 import org.apache.struts2.showcase.model.Skill;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.*;
 
 /**
  * Overriding the EmployeeAction to main provide getters returning the data in
@@ -38,85 +34,82 @@ import org.apache.struts2.showcase.model
  */
 public class JsfEmployeeAction extends EmployeeAction {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
+
+	@Autowired
+	private SkillDao skillDao;
 
-    /**
-     * Creating a default employee and main skill, since the JSF EL can't handle
-     * creating new objects as necessary
-     *
-     */
-    public JsfEmployeeAction() {
-        Employee e = new Employee();
-        e.setMainSkill(new Skill());
-        setCurrentEmployee(e);
-    }
-
-    private SkillDao skillDao;
-
-    public void setSkillDao(SkillDao skillDao) {
-        this.skillDao = skillDao;
-    }
-
-    /**
-     * Returning a List because the JSF dataGrid can't handle a Set for some
-     * reason
-     */
-    @Override
-    public Collection getAvailableItems() {
-        return new ArrayList(super.getAvailableItems());
-    }
-
-    /**
-     * Changing the String array into a Map
-     */
-    public Map<String, String> getAvailablePositionsAsMap() {
-        Map<String, String> map = new LinkedHashMap<String, String>();
-        for (String val : super.getAvailablePositions()) {
-            map.put(val, val);
-        }
-        return map;
-    }
-
-    /**
-     * Converting the list into a map
-     */
-    public Map getAvailableLevelsAsMap() {
-        Map map = new LinkedHashMap();
-        for (Object val : super.getAvailableLevels()) {
-            map.put(val, val);
-        }
-        return map;
-    }
-
-    /**
-     * Converting the Skill object list into a map
-     */
-    public Map<String, String> getAvailableSkills() {
-        Map<String, String> map = new HashMap<String, String>();
-        for (Object val : skillDao.findAll()) {
-            Skill skill = (Skill) val;
-            map.put(skill.getDescription(), skill.getName());
-        }
-        return map;
-    }
-
-    /**
-     * Gets the selected Skill objects as a list
-     */
-    public List<String> getSelectedSkillsAsList() {
-        System.out.println("asked for skills");
-        List<String> list = new ArrayList<String>();
-        List skills = super.getSelectedSkills();
-        if (skills != null) {
-            for (Object val : skills) {
-                if (val instanceof Skill) {
-                    list.add(((Skill) val).getDescription());
-                } else {
-                    Skill skill = skillDao.getSkill((String) val);
-                    list.add(skill.getDescription());
-                }
-            }
-        }
-        return list;
-    }
+	/**
+	 * Creating a default employee and main skill, since the JSF EL can't handle
+	 * creating new objects as necessary
+	 */
+	public JsfEmployeeAction() {
+		Employee e = new Employee();
+		e.setMainSkill(new Skill());
+		setCurrentEmployee(e);
+	}
+
+
+	/**
+	 * Returning a List because the JSF dataGrid can't handle a Set for some
+	 * reason
+	 */
+	@Override
+	public Collection getAvailableItems() {
+		return new ArrayList(super.getAvailableItems());
+	}
+
+	/**
+	 * Changing the String array into a Map
+	 */
+	public Map<String, String> getAvailablePositionsAsMap() {
+		Map<String, String> map = new LinkedHashMap<String, String>();
+		for (String val : super.getAvailablePositions()) {
+			map.put(val, val);
+		}
+		return map;
+	}
+
+	/**
+	 * Converting the list into a map
+	 */
+	public Map getAvailableLevelsAsMap() {
+		Map map = new LinkedHashMap();
+		for (Object val : super.getAvailableLevels()) {
+			map.put(val, val);
+		}
+		return map;
+	}
+
+	/**
+	 * Converting the Skill object list into a map
+	 */
+	public Map<String, String> getAvailableSkills() {
+		Map<String, String> map = new HashMap<String, String>();
+		for (Object val : skillDao.findAll()) {
+			Skill skill = (Skill) val;
+			map.put(skill.getDescription(), skill.getName());
+		}
+		return map;
+	}
+
+	/**
+	 * Gets the selected Skill objects as a list
+	 */
+	public List<String> getSelectedSkillsAsList() {
+		System.out.println("asked for skills");
+		List<String> list = new ArrayList<String>();
+		List skills = super.getSelectedSkills();
+		if (skills != null) {
+			for (Object val : skills) {
+				if (val instanceof Skill) {
+					list.add(((Skill) val).getDescription());
+				} else {
+					Skill skill = skillDao.getSkill((String) val);
+					list.add(skill.getDescription());
+				}
+			}
+		}
+		return list;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java Fri Oct 19 18:49:39 2012
@@ -26,151 +26,150 @@ import java.util.List;
 
 /**
  * Employee.
- *
  */
 
 public class Employee implements IdEntity {
 
-    private static final long serialVersionUID = -6226845151026823748L;
+	private static final long serialVersionUID = -6226845151026823748L;
 
-    private Long empId; //textfield w/ conversion
-    private String firstName;
-    private String lastName;
-    private Date birthDate; //datepicker
-    private Float salary; //textfield w/ conversion
-    private boolean married; //checkbox
-    private String position; //combobox
-    private Skill mainSkill; //select
-    private List otherSkills; //doubleSelect
-    private String password; //password
-    private String level; //radio
-    private String comment; //textarea
-
-    public Employee() {
-    }
-
-    public Employee(Long empId, String firstName, String lastName) {
-        this.empId = empId;
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-
-    public Employee(Long empId, String firstName, String lastName, Date birthDate, Float salary, boolean married, String position, Skill mainSkill, List otherSkills, String password, String level, String comment) {
-        this.empId = empId;
-        this.firstName = firstName;
-        this.lastName = lastName;
-        this.birthDate = birthDate;
-        this.salary = salary;
-        this.married = married;
-        this.position = position;
-        this.mainSkill = mainSkill;
-        this.otherSkills = otherSkills;
-        this.password = password;
-        this.level = level;
-        this.comment = comment;
-    }
-
-    public Long getEmpId() {
-        return empId;
-    }
-
-    public void setEmpId(Long empId) {
-        this.empId = empId;
-    }
-
-    public Serializable getId() {
-        return getEmpId();
-    }
-
-    public void setId(Serializable id) {
-        setEmpId((Long) id);
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public Date getBirthDate() {
-        return birthDate;
-    }
-
-    public void setBirthDate(Date birthDate) {
-        this.birthDate = birthDate;
-    }
-
-    public Float getSalary() {
-        return salary;
-    }
-
-    public void setSalary(Float salary) {
-        this.salary = salary;
-    }
-
-    public boolean isMarried() {
-        return married;
-    }
-
-    public void setMarried(boolean married) {
-        this.married = married;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    public Skill getMainSkill() {
-        return mainSkill;
-    }
-
-    public void setMainSkill(Skill mainSkill) {
-        this.mainSkill = mainSkill;
-    }
-
-    public List getOtherSkills() {
-        return otherSkills;
-    }
-
-    public void setOtherSkills(List otherSkills) {
-        this.otherSkills = otherSkills;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
+	private Long empId; //textfield w/ conversion
+	private String firstName;
+	private String lastName;
+	private Date birthDate; //datepicker
+	private Float salary; //textfield w/ conversion
+	private boolean married; //checkbox
+	private String position; //combobox
+	private Skill mainSkill; //select
+	private List otherSkills; //doubleSelect
+	private String password; //password
+	private String level; //radio
+	private String comment; //textarea
+
+	public Employee() {
+	}
+
+	public Employee(Long empId, String firstName, String lastName) {
+		this.empId = empId;
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+
+	public Employee(Long empId, String firstName, String lastName, Date birthDate, Float salary, boolean married, String position, Skill mainSkill, List otherSkills, String password, String level, String comment) {
+		this.empId = empId;
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.birthDate = birthDate;
+		this.salary = salary;
+		this.married = married;
+		this.position = position;
+		this.mainSkill = mainSkill;
+		this.otherSkills = otherSkills;
+		this.password = password;
+		this.level = level;
+		this.comment = comment;
+	}
+
+	public Long getEmpId() {
+		return empId;
+	}
+
+	public void setEmpId(Long empId) {
+		this.empId = empId;
+	}
+
+	public Serializable getId() {
+		return getEmpId();
+	}
+
+	public void setId(Serializable id) {
+		setEmpId((Long) id);
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public Date getBirthDate() {
+		return birthDate;
+	}
+
+	public void setBirthDate(Date birthDate) {
+		this.birthDate = birthDate;
+	}
+
+	public Float getSalary() {
+		return salary;
+	}
+
+	public void setSalary(Float salary) {
+		this.salary = salary;
+	}
+
+	public boolean isMarried() {
+		return married;
+	}
+
+	public void setMarried(boolean married) {
+		this.married = married;
+	}
+
+	public String getPosition() {
+		return position;
+	}
+
+	public void setPosition(String position) {
+		this.position = position;
+	}
+
+	public Skill getMainSkill() {
+		return mainSkill;
+	}
+
+	public void setMainSkill(Skill mainSkill) {
+		this.mainSkill = mainSkill;
+	}
+
+	public List getOtherSkills() {
+		return otherSkills;
+	}
+
+	public void setOtherSkills(List otherSkills) {
+		this.otherSkills = otherSkills;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java Fri Oct 19 18:49:39 2012
@@ -24,13 +24,12 @@ import java.io.Serializable;
 
 /**
  * IdEntity. Interface.
- *
  */
 
 public interface IdEntity extends Serializable {
 
-    Serializable getId ();
+	Serializable getId();
 
-    void setId ( Serializable id );
+	void setId(Serializable id);
 
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java Fri Oct 19 18:49:39 2012
@@ -26,49 +26,48 @@ import java.io.Serializable;
 
 /**
  * Skill.
- *
  */
 
 public class Skill implements IdEntity {
 
-    private static final long serialVersionUID = -4150317722693212439L;
+	private static final long serialVersionUID = -4150317722693212439L;
 
-    private String name;
-    private String description;
+	private String name;
+	private String description;
 
-    public Skill() {
-    }
+	public Skill() {
+	}
 
-    public Skill(String name, String description) {
-        this.name = name;
-        this.description = description;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(name));
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(description));
-    }
-
-    public Serializable getId() {
-        return getName();
-    }
-
-    public void setId(Serializable id) {
-        setName((String) id);
-    }
-
-    public String toString() {
-        return getName();
-    }
+	public Skill(String name, String description) {
+		this.name = name;
+		this.description = description;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(name));
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(description));
+	}
+
+	public Serializable getId() {
+		return getName();
+	}
+
+	public void setId(Serializable id) {
+		setName((String) id);
+	}
+
+	public String toString() {
+		return getName();
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java Fri Oct 19 18:49:39 2012
@@ -24,39 +24,45 @@ import java.io.Serializable;
 
 /**
  * A model class to be used by the simple Model-Driven example.
- *
  */
 public class Gangster implements Serializable {
 
-    private static final long serialVersionUID = 3688389475320294992L;
+	private static final long serialVersionUID = 3688389475320294992L;
 
-    private String name;
-    private int age;
-    private String description;
-    private boolean bustedBefore;
-
-    public int getAge() {
-        return age;
-    }
-    public void setAge(int age) {
-        this.age = age;
-    }
-    public boolean isBustedBefore() {
-        return bustedBefore;
-    }
-    public void setBustedBefore(boolean bustedBefore) {
-        this.bustedBefore = bustedBefore;
-    }
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
+	private String name;
+	private int age;
+	private String description;
+	private boolean bustedBefore;
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public boolean isBustedBefore() {
+		return bustedBefore;
+	}
+
+	public void setBustedBefore(boolean bustedBefore) {
+		this.bustedBefore = bustedBefore;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java Fri Oct 19 18:49:39 2012
@@ -25,21 +25,20 @@ import com.opensymphony.xwork2.ModelDriv
 
 /**
  * Action to demonstrate simple model-driven feature of the framework.
- *
  */
 public class ModelDrivenAction extends ActionSupport implements ModelDriven {
 
-    private static final long serialVersionUID = 1271130427666936592L;
+	private static final long serialVersionUID = 1271130427666936592L;
 
-    public String input() throws Exception {
-        return SUCCESS;
-    }
+	public String input() throws Exception {
+		return SUCCESS;
+	}
 
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
+	public String execute() throws Exception {
+		return SUCCESS;
+	}
 
-    public Object getModel() {
-        return new Gangster();
-    }
+	public Object getModel() {
+		return new Gangster();
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java Fri Oct 19 18:49:39 2012
@@ -20,68 +20,59 @@
  */
 package org.apache.struts2.showcase.person;
 
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+import org.springframework.beans.factory.annotation.Autowired;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.struts2.convention.annotation.ParentPackage;
-import org.apache.struts2.convention.annotation.Result;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Results;
-
 /**
  * <code>EditPerson</code>
- *
  */
 @Results({
-    @Result(name="list", location="list-people.action", type="redirect"),
-    @Result(name="input", location="new-person.ftl", type="freemarker")
+		@Result(name = "list", location = "list-people.action", type = "redirect"),
+		@Result(name = "input", location = "edit-person.jsp")
 })
 public class EditPersonAction extends ActionSupport {
 
-    private static final long serialVersionUID = 7699491775215130850L;
-
-    PersonManager personManager;
-    List persons = new ArrayList();
-
-    public void setPersonManager(PersonManager personManager) {
-        this.personManager = personManager;
-    }
-
-    public List getPersons() {
-        return persons;
-    }
-
-    public void setPersons(List persons) {
-        this.persons = persons;
-    }
-
-    /**
-     * A default implementation that does nothing an returns "success".
-     *
-     * @return {@link #SUCCESS}
-     */
-    public String execute() throws Exception {
-        persons.addAll(personManager.getPeople());
-        return SUCCESS;
-    }
-
-    /**
-     * A default implementation that does nothing an returns "success".
-     *
-     * @return {@link #SUCCESS}
-     */
-    public String save() throws Exception {
-
-        // Set people = personManager.getPeople();
-
-        for ( Iterator iter = persons.iterator(); iter.hasNext();) {
-            Person p = (Person) iter.next();
-            personManager.getPeople().remove(p);
-            personManager.getPeople().add(p);
-        }
-        return "list";
-    }
+	private static final long serialVersionUID = 7699491775215130850L;
 
+	@Autowired
+	private PersonManager personManager;
+	private List<Person> persons = new ArrayList<Person>();
+
+	/**
+	 * A default implementation that does nothing an returns "success".
+	 *
+	 * @return {@link #INPUT}
+	 */
+	public String execute() throws Exception {
+		persons.addAll(personManager.getPeople());
+		return INPUT;
+	}
+
+	/**
+	 * A default implementation that does nothing an returns "success".
+	 *
+	 * @return {@link #SUCCESS}
+	 */
+	public String save() throws Exception {
+
+		for (Person p : persons) {
+			personManager.getPeople().remove(p);
+			personManager.getPeople().add(p);
+		}
+		return "list";
+	}
+
+	public List<Person> getPersons() {
+		return persons;
+	}
+
+	public void setPersons(List<Person> persons) {
+		this.persons = persons;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java Fri Oct 19 18:49:39 2012
@@ -20,37 +20,35 @@
  */
 package org.apache.struts2.showcase.person;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.ParentPackage;
 import org.apache.struts2.convention.annotation.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
 
-@Result(location="list-people.ftl", type="freemarker")
+@Result(location = "list-people.ftl", type = "freemarker")
 public class ListPeopleAction extends ActionSupport {
 
-    private static final long serialVersionUID = 3608017189783645371L;
+	private static final long serialVersionUID = 3608017189783645371L;
 
-    PersonManager personManager;
-    List people = new ArrayList();
+	@Autowired
+	private PersonManager personManager;
 
-    public void setPersonManager(PersonManager personManager) {
-        this.personManager = personManager;
-    }
+	private List<Person> people = new ArrayList<Person>();
 
-    public String execute() {
-        people.addAll(personManager.getPeople());
+	public String execute() {
+		people.addAll(personManager.getPeople());
 
-        return SUCCESS;
-    }
+		return SUCCESS;
+	}
 
-    public List getPeople() {
-        return people;
-    }
+	public List<Person> getPeople() {
+		return people;
+	}
 
-    public int getPeopleCount() {
-        return people.size();
-    }
+	public int getPeopleCount() {
+		return people.size();
+	}
 
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java Fri Oct 19 18:49:39 2012
@@ -20,35 +20,35 @@
  */
 package org.apache.struts2.showcase.person;
 
-import org.apache.struts2.convention.annotation.ParentPackage;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.views.freemarker.FreemarkerResult;
+import org.apache.struts2.convention.annotation.Results;
+import org.springframework.beans.factory.annotation.Autowired;
 
-import com.opensymphony.xwork2.ActionSupport;
 
-@Result(name="input", location="new-person.ftl", type="freemarker")
+@Results({
+		@Result(name = "list", location = "list-people.action", type = "redirect"),
+		@Result(name = "input", location = "new-person.ftl", type = "freemarker")
+})
 public class NewPersonAction extends ActionSupport {
 
-    private static final long serialVersionUID = 200410824352645515L;
-
-    PersonManager personManager;
-    Person person;
+	private static final long serialVersionUID = 200410824352645515L;
 
-    public void setPersonManager(PersonManager personManager) {
-        this.personManager = personManager;
-    }
+	@Autowired
+	private PersonManager personManager;
+	private Person person;
 
-    public String execute() {
-        personManager.createPerson(person);
+	public String execute() {
+		personManager.createPerson(person);
 
-        return SUCCESS;
-    }
+		return "list";
+	}
 
-    public Person getPerson() {
-        return person;
-    }
+	public Person getPerson() {
+		return person;
+	}
 
-    public void setPerson(Person person) {
-        this.person = person;
-    }
+	public void setPerson(Person person) {
+		this.person = person;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java Fri Oct 19 18:49:39 2012
@@ -20,67 +20,65 @@
  */
 package org.apache.struts2.showcase.person;
 
-/**
- */
 public class Person {
-    Long id;
-    String name;
-    String lastName;
-
-    public Person() {
-    }
-
-    public Person(Long id, String name, String lastName) {
-        this.id = id;
-        this.name = name;
-        this.lastName = lastName;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        final Person person = (Person) o;
-
-        if (id != null ? !id.equals(person.id) : person.id != null) return false;
-
-        return true;
-    }
-
-    public int hashCode() {
-        return (id != null ? id.hashCode() : 0);
-    }
-
-
-    public String toString() {
-        return "Person{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", lastName='" + lastName + '\'' +
-                '}';
-    }
+	private Long id;
+	private String name;
+	private String lastName;
+
+	public Person() {
+	}
+
+	public Person(Long id, String name, String lastName) {
+		this.id = id;
+		this.name = name;
+		this.lastName = lastName;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		final Person person = (Person) o;
+
+		if (id != null ? !id.equals(person.id) : person.id != null) return false;
+
+		return true;
+	}
+
+	public int hashCode() {
+		return (id != null ? id.hashCode() : 0);
+	}
+
+
+	public String toString() {
+		return "Person{" +
+				"id=" + id +
+				", name='" + name + '\'' +
+				", lastName='" + lastName + '\'' +
+				'}';
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java Fri Oct 19 18:49:39 2012
@@ -20,39 +20,40 @@
  */
 package org.apache.struts2.showcase.person;
 
+import org.springframework.stereotype.Service;
+
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- */
+@Service
 public class PersonManager {
-    private static Set people = new HashSet(5);
-    private static long COUNT = 5;
+	private static Set<Person> people = new HashSet<Person>(5);
+	private static long COUNT = 5;
 
-    static {
-        // create some imaginary persons
-        Person p1 = new Person(new Long(1), "Patrick", "Lightbuddie");
-        Person p2 = new Person(new Long(2), "Jason", "Carrora");
-        Person p3 = new Person(new Long(3), "Alexandru", "Papesco");
-        Person p4 = new Person(new Long(4), "Jay", "Boss");
-        Person p5 = new Person(new Long(5), "Rainer", "Hermanos");
-        people.add(p1);
-        people.add(p2);
-        people.add(p3);
-        people.add(p4);
-        people.add(p5);
-    }
-
-    public void createPerson(Person person) {
-        person.setId(new Long(++COUNT));
-        people.add(person);
-    }
-
-    public void updatePerson(Person person) {
-        people.add(person);
-    }
-
-    public Set getPeople() {
-        return people;
-    }
+	static {
+		// create some imaginary persons
+		Person p1 = new Person(new Long(1), "Patrick", "Lightbuddie");
+		Person p2 = new Person(new Long(2), "Jason", "Carrora");
+		Person p3 = new Person(new Long(3), "Alexandru", "Papesco");
+		Person p4 = new Person(new Long(4), "Jay", "Boss");
+		Person p5 = new Person(new Long(5), "Rainer", "Hermanos");
+		people.add(p1);
+		people.add(p2);
+		people.add(p3);
+		people.add(p4);
+		people.add(p5);
+	}
+
+	public void createPerson(Person person) {
+		person.setId(new Long(++COUNT));
+		people.add(person);
+	}
+
+	public void updatePerson(Person person) {
+		people.add(person);
+	}
+
+	public Set<Person> getPeople() {
+		return people;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java Fri Oct 19 18:49:39 2012
@@ -1,6 +1,5 @@
 @ParentPackage("person")
-@Namespace("/person")
-package org.apache.struts2.showcase.person;
+@Namespace("/person") package org.apache.struts2.showcase.person;
 
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java Fri Oct 19 18:49:39 2012
@@ -20,6 +20,12 @@
  */
 package org.apache.struts2.showcase.source;
 
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.util.ServletContextAware;
+
+import javax.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,211 +35,201 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.util.ServletContextAware;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-
 /**
  * Processes configuration, page, and action class paths to create snippets
  * of the files for display.
  */
 public class ViewSourceAction extends ActionSupport implements ServletContextAware {
 
-    private String page;
-    private String className;
-    private String config;
-
-    private List pageLines;
-    private List classLines;
-    private List configLines;
-
-    private int configLine;
-    private int padding = 10;
-
-    private ServletContext servletContext;
-
-    public String execute() throws MalformedURLException, IOException {
-
-        if (page != null) {
-
-            InputStream in = ClassLoaderUtil.getResourceAsStream(page.substring(page.indexOf("//")+1), getClass());
-            page = page.replace("//", "/");
-
-            if (in == null) {
-                in = servletContext.getResourceAsStream(page);
-                while (in == null && page.indexOf('/', 1) > 0) {
-                    page = page.substring(page.indexOf('/', 1));
-                    in = servletContext.getResourceAsStream(page);
-                }
-            }
-            pageLines = read(in, -1);
-
-            if (in != null) {
-                in.close();
-            }
-        }
-
-        if (className != null) {
-            className = "/"+className.replace('.', '/') + ".java";
-            InputStream in = getClass().getResourceAsStream(className);
-            if (in == null) {
-                in = servletContext.getResourceAsStream("/WEB-INF/src"+className);
-            }
-            classLines = read(in, -1);
-
-            if (in != null) {
-                in.close();
-            }
-        }
-
-        String rootPath = ServletActionContext.getServletContext().getRealPath("/");
-                
-        if (config != null && (rootPath == null || config.startsWith(rootPath))) {
-            int pos = config.lastIndexOf(':');
-            configLine = Integer.parseInt(config.substring(pos+1));
-            config = config.substring(0, pos).replace("//", "/");
-            configLines = read(new URL(config).openStream(), configLine);
-        }
-        return SUCCESS;
-    }
-
-
-    /**
-     * @param className the className to set
-     */
-    public void setClassName(String className) {
-        if (className != null && className.trim().length()>0) {
-            this.className = className;
-        }
-    }
-
-    /**
-     * @param config the config to set
-     */
-    public void setConfig(String config) {
-        if (config != null && config.trim().length()>0) {
-            this.config = config;
-        }
-    }
-
-    /**
-     * @param page the page to set
-     */
-    public void setPage(String page) {
-        if (page != null && page.trim().length()>0) {
-            this.page = page;
-        }
-    }
-
-    /**
-     * @param padding the padding to set
-     */
-    public void setPadding(int padding) {
-        this.padding = padding;
-    }
-
-
-
-    /**
-     * @return the classLines
-     */
-    public List getClassLines() {
-        return classLines;
-    }
-
-    /**
-     * @return the configLines
-     */
-    public List getConfigLines() {
-        return configLines;
-    }
-
-    /**
-     * @return the pageLines
-     */
-    public List getPageLines() {
-        return pageLines;
-    }
-
-    /**
-     * @return the className
-     */
-    public String getClassName() {
-        return className;
-    }
-
-    /**
-     * @return the config
-     */
-    public String getConfig() {
-        return config;
-    }
-
-    /**
-     * @return the page
-     */
-    public String getPage() {
-        return page;
-    }
-
-    /**
-     * @return the configLine
-     */
-    public int getConfigLine() {
-        return configLine;
-    }
-
-    /**
-     * @return the padding
-     */
-    public int getPadding() {
-        return padding;
-    }
-
-    /**
-     * Reads in a strea, optionally only including the target line number
-     * and its padding
-     *
-     * @param in The input stream
-     * @param targetLineNumber The target line number, negative to read all
-     * @return A list of lines
-     */
-    private List read(InputStream in, int targetLineNumber) {
-        List snippet = null;
-        if (in != null) {
-            snippet = new ArrayList();
-            int startLine = 0;
-            int endLine = Integer.MAX_VALUE;
-            if (targetLineNumber > 0) {
-                startLine = targetLineNumber - padding;
-                endLine = targetLineNumber + padding;
-            }
-            try {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
-                int lineno = 0;
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    lineno++;
-                    if (lineno >= startLine && lineno <= endLine) {
-                        snippet.add(line);
-                    }
-                }
-            } catch (Exception ex) {
-                // ignoring as snippet not available isn't a big deal
-            }
-        }
-        return snippet;
-    }
-
-    public void setServletContext(ServletContext arg0) {
-        this.servletContext = arg0;
-    }
+	private String page;
+	private String className;
+	private String config;
+
+	private List pageLines;
+	private List classLines;
+	private List configLines;
+
+	private int configLine;
+	private int padding = 10;
+
+	private ServletContext servletContext;
+
+	public String execute() throws MalformedURLException, IOException {
+
+		if (page != null) {
+
+			InputStream in = ClassLoaderUtil.getResourceAsStream(page.substring(page.indexOf("//") + 1), getClass());
+			page = page.replace("//", "/");
+
+			if (in == null) {
+				in = servletContext.getResourceAsStream(page);
+				while (in == null && page.indexOf('/', 1) > 0) {
+					page = page.substring(page.indexOf('/', 1));
+					in = servletContext.getResourceAsStream(page);
+				}
+			}
+			pageLines = read(in, -1);
+
+			if (in != null) {
+				in.close();
+			}
+		}
+
+		if (className != null) {
+			className = "/" + className.replace('.', '/') + ".java";
+			InputStream in = getClass().getResourceAsStream(className);
+			if (in == null) {
+				in = servletContext.getResourceAsStream("/WEB-INF/src" + className);
+			}
+			classLines = read(in, -1);
+
+			if (in != null) {
+				in.close();
+			}
+		}
+
+		String rootPath = ServletActionContext.getServletContext().getRealPath("/");
+
+		if (config != null && (rootPath == null || config.startsWith(rootPath))) {
+			int pos = config.lastIndexOf(':');
+			configLine = Integer.parseInt(config.substring(pos + 1));
+			config = config.substring(0, pos).replace("//", "/");
+			configLines = read(new URL(config).openStream(), configLine);
+		}
+		return SUCCESS;
+	}
+
+
+	/**
+	 * @param className the className to set
+	 */
+	public void setClassName(String className) {
+		if (className != null && className.trim().length() > 0) {
+			this.className = className;
+		}
+	}
+
+	/**
+	 * @param config the config to set
+	 */
+	public void setConfig(String config) {
+		if (config != null && config.trim().length() > 0) {
+			this.config = config;
+		}
+	}
+
+	/**
+	 * @param page the page to set
+	 */
+	public void setPage(String page) {
+		if (page != null && page.trim().length() > 0) {
+			this.page = page;
+		}
+	}
+
+	/**
+	 * @param padding the padding to set
+	 */
+	public void setPadding(int padding) {
+		this.padding = padding;
+	}
+
+
+	/**
+	 * @return the classLines
+	 */
+	public List getClassLines() {
+		return classLines;
+	}
+
+	/**
+	 * @return the configLines
+	 */
+	public List getConfigLines() {
+		return configLines;
+	}
+
+	/**
+	 * @return the pageLines
+	 */
+	public List getPageLines() {
+		return pageLines;
+	}
+
+	/**
+	 * @return the className
+	 */
+	public String getClassName() {
+		return className;
+	}
+
+	/**
+	 * @return the config
+	 */
+	public String getConfig() {
+		return config;
+	}
+
+	/**
+	 * @return the page
+	 */
+	public String getPage() {
+		return page;
+	}
+
+	/**
+	 * @return the configLine
+	 */
+	public int getConfigLine() {
+		return configLine;
+	}
+
+	/**
+	 * @return the padding
+	 */
+	public int getPadding() {
+		return padding;
+	}
+
+	/**
+	 * Reads in a strea, optionally only including the target line number
+	 * and its padding
+	 *
+	 * @param in               The input stream
+	 * @param targetLineNumber The target line number, negative to read all
+	 * @return A list of lines
+	 */
+	private List read(InputStream in, int targetLineNumber) {
+		List snippet = null;
+		if (in != null) {
+			snippet = new ArrayList();
+			int startLine = 0;
+			int endLine = Integer.MAX_VALUE;
+			if (targetLineNumber > 0) {
+				startLine = targetLineNumber - padding;
+				endLine = targetLineNumber + padding;
+			}
+			try {
+				BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+
+				int lineno = 0;
+				String line;
+				while ((line = reader.readLine()) != null) {
+					lineno++;
+					if (lineno >= startLine && lineno <= endLine) {
+						snippet.add(line);
+					}
+				}
+			} catch (Exception ex) {
+				// ignoring as snippet not available isn't a big deal
+			}
+		}
+		return snippet;
+	}
+
+	public void setServletContext(ServletContext arg0) {
+		this.servletContext = arg0;
+	}
 
 
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java Fri Oct 19 18:49:39 2012
@@ -24,19 +24,24 @@ import com.opensymphony.xwork2.ActionSup
 
 public class SubmitAction extends ActionSupport {
 
-    private static final long serialVersionUID = -7832803019378213087L;
+	private static final long serialVersionUID = -7832803019378213087L;
 
-    private String text;
+	private String text;
 
-    public String getText() { return text; }
-    public void setText(String text) { this.text = text; }
+	public String getText() {
+		return text;
+	}
 
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
+	public void setText(String text) {
+		this.text = text;
+	}
 
-    public String alternateMethod() {
-        return "methodPrefixResult";
-    }
+	public String execute() throws Exception {
+		return SUCCESS;
+	}
+
+	public String alternateMethod() {
+		return "methodPrefixResult";
+	}
 
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java Fri Oct 19 18:49:39 2012
@@ -26,13 +26,13 @@ import com.opensymphony.xwork2.ActionSup
  */
 public class ActionTagDemo extends ActionSupport {
 
-    private static final long serialVersionUID = -2749145880590245184L;
+	private static final long serialVersionUID = -2749145880590245184L;
 
-    public String show() throws Exception {
-        return SUCCESS;
-    }
+	public String show() throws Exception {
+		return SUCCESS;
+	}
 
-    public String doInclude() throws Exception {
-        return SUCCESS;
-    }
+	public String doInclude() throws Exception {
+		return SUCCESS;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java Fri Oct 19 18:49:39 2012
@@ -28,53 +28,49 @@ import com.opensymphony.xwork2.Validatea
  */
 public class AppendIteratorTagDemo extends ActionSupport implements Validateable {
 
-    private static final long serialVersionUID = -6525059998526094664L;
+	private static final long serialVersionUID = -6525059998526094664L;
 
-    private String iteratorValue1;
-    private String iteratorValue2;
+	private String iteratorValue1;
+	private String iteratorValue2;
 
 
-    public void validate() {
-        if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0 ) {
-            addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
-        }
-        else if (iteratorValue1.trim().indexOf(",") <= 0) {
-            addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
-        }
-        if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
-            addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
-        }
-        else if (iteratorValue2.trim().indexOf(",") <= 0) {
-            addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
-        }
-    }
+	public void validate() {
+		if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0) {
+			addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
+		} else if (iteratorValue1.trim().indexOf(",") <= 0) {
+			addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
+		}
+		if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
+			addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
+		} else if (iteratorValue2.trim().indexOf(",") <= 0) {
+			addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
+		}
+	}
 
 
+	public String getIteratorValue1() {
+		return iteratorValue1;
+	}
 
+	public void setIteratorValue1(String iteratorValue1) {
+		this.iteratorValue1 = iteratorValue1;
+	}
 
-    public String getIteratorValue1() {
-        return iteratorValue1;
-    }
-    public void setIteratorValue1(String iteratorValue1) {
-        this.iteratorValue1 = iteratorValue1;
-    }
 
+	public String getIteratorValue2() {
+		return iteratorValue2;
+	}
 
+	public void setIteratorValue2(String iteratorValue2) {
+		this.iteratorValue2 = iteratorValue2;
+	}
 
-    public String getIteratorValue2() {
-        return iteratorValue2;
-    }
-    public void setIteratorValue2(String iteratorValue2) {
-        this.iteratorValue2 = iteratorValue2;
-    }
 
+	public String input() throws Exception {
+		return SUCCESS;
+	}
 
-
-    public String input() throws Exception {
-        return SUCCESS;
-    }
-
-    public String submit() throws Exception {
-        return SUCCESS;
-    }
+	public String submit() throws Exception {
+		return SUCCESS;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java Fri Oct 19 18:49:39 2012
@@ -26,44 +26,46 @@ import com.opensymphony.xwork2.ActionSup
  */
 public class IteratorGeneratorTagDemo extends ActionSupport {
 
-    private static final long serialVersionUID = 6893616642389337039L;
+	private static final long serialVersionUID = 6893616642389337039L;
 
-    private String value;
-    private Integer count;
-    private String separator;
+	private String value;
+	private Integer count;
+	private String separator;
 
 
-    public String getValue() {
-        return value;
-    }
-    public void setValue(String value) {
-        this.value = value;
-    }
+	public String getValue() {
+		return value;
+	}
 
+	public void setValue(String value) {
+		this.value = value;
+	}
 
-    public Integer getCount() {
-        return count;
-    }
-    public void setCount(Integer count) {
-        this.count = count;
-    }
 
+	public Integer getCount() {
+		return count;
+	}
 
+	public void setCount(Integer count) {
+		this.count = count;
+	}
 
-    public String getSeparator() {
-        return this.separator;
-    }
-    public void setSeparator(String separator) {
-        this.separator = separator;
-    }
 
+	public String getSeparator() {
+		return this.separator;
+	}
 
-    public String submit() throws Exception {
-        return SUCCESS;
-    }
+	public void setSeparator(String separator) {
+		this.separator = separator;
+	}
 
 
-    public String input() throws Exception {
-        return SUCCESS;
-    }
+	public String submit() throws Exception {
+		return SUCCESS;
+	}
+
+
+	public String input() throws Exception {
+		return SUCCESS;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java Fri Oct 19 18:49:39 2012
@@ -28,54 +28,49 @@ import com.opensymphony.xwork2.Validatea
  */
 public class MergeIteratorTagDemo extends ActionSupport implements Validateable {
 
-    private static final long serialVersionUID = 4401107963952961695L;
+	private static final long serialVersionUID = 4401107963952961695L;
 
-    private String iteratorValue1;
-    private String iteratorValue2;
+	private String iteratorValue1;
+	private String iteratorValue2;
 
 
-    public void validate() {
-        if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0 ) {
-            addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
-        }
-        else if (iteratorValue1.trim().indexOf(",") <= 0) {
-            addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
-        }
-        if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
-            addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
-        }
-        else if (iteratorValue2.trim().indexOf(",") <= 0) {
-            addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
-        }
-    }
+	public void validate() {
+		if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0) {
+			addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
+		} else if (iteratorValue1.trim().indexOf(",") <= 0) {
+			addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
+		}
+		if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
+			addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
+		} else if (iteratorValue2.trim().indexOf(",") <= 0) {
+			addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
+		}
+	}
 
 
+	public String getIteratorValue1() {
+		return this.iteratorValue1;
+	}
 
-    public String getIteratorValue1() {
-        return this.iteratorValue1;
-    }
-    public void setIteratorValue1(String iteratorValue1) {
-        this.iteratorValue1 = iteratorValue1;
-    }
+	public void setIteratorValue1(String iteratorValue1) {
+		this.iteratorValue1 = iteratorValue1;
+	}
 
 
+	public String getIteratorValue2() {
+		return this.iteratorValue2;
+	}
 
-    public String getIteratorValue2() {
-        return this.iteratorValue2;
-    }
-    public void setIteratorValue2(String iteratorValue2) {
-        this.iteratorValue2 = iteratorValue2;
-    }
+	public void setIteratorValue2(String iteratorValue2) {
+		this.iteratorValue2 = iteratorValue2;
+	}
 
 
+	public String input() throws Exception {
+		return SUCCESS;
+	}
 
-
-
-    public String input() throws Exception {
-        return SUCCESS;
-    }
-
-    public String submit() throws Exception {
-        return SUCCESS;
-    }
+	public String submit() throws Exception {
+		return SUCCESS;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java Fri Oct 19 18:49:39 2012
@@ -28,61 +28,56 @@ import com.opensymphony.xwork2.Validatea
  */
 public class SubsetIteratorTagDemo extends ActionSupport implements Validateable {
 
-    private static final long serialVersionUID = -8151855954644052650L;
+	private static final long serialVersionUID = -8151855954644052650L;
 
-    private String iteratorValue;
-    private Integer count;
-    private Integer start;
+	private String iteratorValue;
+	private Integer count;
+	private Integer start;
 
 
-    public void validate() {
-        if (iteratorValue == null || iteratorValue.trim().length() <= 0 ) {
-            addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
-        }
-        else if (iteratorValue.trim().indexOf(",") <= 0) {
-            addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
-        }
-    }
+	public void validate() {
+		if (iteratorValue == null || iteratorValue.trim().length() <= 0) {
+			addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
+		} else if (iteratorValue.trim().indexOf(",") <= 0) {
+			addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
+		}
+	}
 
 
+	public String getIteratorValue() {
+		return this.iteratorValue;
+	}
 
-    public String getIteratorValue() {
-        return this.iteratorValue;
-    }
-    public void setIteratorValue(String iteratorValue) {
-        this.iteratorValue = iteratorValue;
-    }
+	public void setIteratorValue(String iteratorValue) {
+		this.iteratorValue = iteratorValue;
+	}
 
 
+	public Integer getCount() {
+		return this.count;
+	}
 
-    public Integer getCount() {
-        return this.count;
-    }
-    public void setCount(Integer count) {
-        this.count = count;
-    }
+	public void setCount(Integer count) {
+		this.count = count;
+	}
 
 
+	public Integer getStart() {
+		return this.start;
+	}
 
-    public Integer getStart() {
-        return this.start;
-    }
-    public void setStart(Integer start) {
-        this.start = start;
-    }
+	public void setStart(Integer start) {
+		this.start = start;
+	}
 
 
+	public String input() throws Exception {
+		return SUCCESS;
+	}
 
-
-
-    public String input() throws Exception {
-        return SUCCESS;
-    }
-
-    public String submit() throws Exception {
-        return SUCCESS;
-    }
-
+	public String submit() throws Exception {
+		return SUCCESS;
+	}
 
 
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java Fri Oct 19 18:49:39 2012
@@ -20,65 +20,64 @@
  */
 package org.apache.struts2.showcase.token;
 
-import java.util.Date;
-
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionSupport;
 
+import java.util.Date;
+
 /**
  * Example to illustrate the <code>token</code> and <code>tokenSession</code> interceptor.
- *
  */
 public class TokenAction extends ActionSupport {
 
-    private static final long serialVersionUID = 616150375751184884L;
+	private static final long serialVersionUID = 616150375751184884L;
 
-    private int amount;
+	private int amount;
 
-    public String execute() throws Exception {
-        // transfer from source to destination
+	public String execute() throws Exception {
+		// transfer from source to destination
 
-        Integer balSource = (Integer) ActionContext.getContext().getSession().get("balanceSource");
-        Integer balDest = (Integer) ActionContext.getContext().getSession().get("balanceDestination");
+		Integer balSource = (Integer) ActionContext.getContext().getSession().get("balanceSource");
+		Integer balDest = (Integer) ActionContext.getContext().getSession().get("balanceDestination");
 
-        Integer newSource = new Integer(balSource.intValue() - amount);
-        Integer newDest = new Integer(balDest.intValue() + amount);
+		Integer newSource = new Integer(balSource.intValue() - amount);
+		Integer newDest = new Integer(balDest.intValue() + amount);
 
-        ActionContext.getContext().getSession().put("balanceSource", newSource);
-        ActionContext.getContext().getSession().put("balanceDestination", newDest);
-        ActionContext.getContext().getSession().put("time", new Date());
+		ActionContext.getContext().getSession().put("balanceSource", newSource);
+		ActionContext.getContext().getSession().put("balanceDestination", newDest);
+		ActionContext.getContext().getSession().put("time", new Date());
 
-        Thread.sleep(2000); // to simulate processing time
+		Thread.sleep(2000); // to simulate processing time
 
-        return SUCCESS;
-    }
+		return SUCCESS;
+	}
 
-    public String input() throws Exception {
-        // prepare input form
-        Integer balSource = (Integer) ActionContext.getContext().getSession().get("balanceSource");
-        Integer balDest = (Integer) ActionContext.getContext().getSession().get("balanceDestination");
+	public String input() throws Exception {
+		// prepare input form
+		Integer balSource = (Integer) ActionContext.getContext().getSession().get("balanceSource");
+		Integer balDest = (Integer) ActionContext.getContext().getSession().get("balanceDestination");
 
-        if (balSource == null) {
-            // first time set up an initial account balance
-            balSource = new Integer(1200);
-            ActionContext.getContext().getSession().put("balanceSource", balSource);
-        }
+		if (balSource == null) {
+			// first time set up an initial account balance
+			balSource = new Integer(1200);
+			ActionContext.getContext().getSession().put("balanceSource", balSource);
+		}
 
-        if (balDest == null) {
-            // first time set up an initial account balance
-            balDest = new Integer(2500);
-            ActionContext.getContext().getSession().put("balanceDestination", balDest);
-        }
+		if (balDest == null) {
+			// first time set up an initial account balance
+			balDest = new Integer(2500);
+			ActionContext.getContext().getSession().put("balanceDestination", balDest);
+		}
 
-        return INPUT;
-    }
+		return INPUT;
+	}
 
-    public int getAmount() {
-        return amount;
-    }
+	public int getAmount() {
+		return amount;
+	}
 
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
+	public void setAmount(int amount) {
+		this.amount = amount;
+	}
 
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java Fri Oct 19 18:49:39 2012
@@ -26,11 +26,11 @@ import com.opensymphony.xwork2.ActionSup
  */
 public abstract class AbstractValidationActionSupport extends ActionSupport {
 
-    public String submit() throws Exception {
-        return "success";
-    }
+	public String submit() throws Exception {
+		return "success";
+	}
 
-    public String input() throws Exception {
-        return "input";
-    }
+	public String input() throws Exception {
+		return "input";
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java Fri Oct 19 18:49:39 2012
@@ -29,77 +29,91 @@ import java.sql.Date;
 
 public class FieldValidatorsExampleAction extends AbstractValidationActionSupport {
 
-    private static final long serialVersionUID = -4829381083003175423L;
+	private static final long serialVersionUID = -4829381083003175423L;
 
-    private String requiredValidatorField = null;
-    private String requiredStringValidatorField = null;
-    private Integer integerValidatorField = null;
-    private Date dateValidatorField = null;
-    private String emailValidatorField = null;
-    private String urlValidatorField = null;
-    private String stringLengthValidatorField = null;
-    private String regexValidatorField = null;
-    private String fieldExpressionValidatorField = null;
-
-
-
-    public Date getDateValidatorField() {
-        return dateValidatorField;
-    }
-    public void setDateValidatorField(Date dateValidatorField) {
-        this.dateValidatorField = dateValidatorField;
-    }
-    public String getEmailValidatorField() {
-        return emailValidatorField;
-    }
-    public void setEmailValidatorField(String emailValidatorField) {
-        this.emailValidatorField = emailValidatorField;
-    }
-    public Integer getIntegerValidatorField() {
-        return integerValidatorField;
-    }
-    public void setIntegerValidatorField(Integer integerValidatorField) {
-        this.integerValidatorField = integerValidatorField;
-    }
-    public String getRegexValidatorField() {
-        return regexValidatorField;
-    }
-    public void setRegexValidatorField(String regexValidatorField) {
-        this.regexValidatorField = regexValidatorField;
-    }
-    public String getRequiredStringValidatorField() {
-        return requiredStringValidatorField;
-    }
-    public void setRequiredStringValidatorField(String requiredStringValidatorField) {
-        this.requiredStringValidatorField = requiredStringValidatorField;
-    }
-    public String getRequiredValidatorField() {
-        return requiredValidatorField;
-    }
-    public void setRequiredValidatorField(String requiredValidatorField) {
-        this.requiredValidatorField = requiredValidatorField;
-    }
-    public String getStringLengthValidatorField() {
-        return stringLengthValidatorField;
-    }
-    public void setStringLengthValidatorField(String stringLengthValidatorField) {
-        this.stringLengthValidatorField = stringLengthValidatorField;
-    }
-    public String getFieldExpressionValidatorField() {
-        return fieldExpressionValidatorField;
-    }
-    public void setFieldExpressionValidatorField(
-            String fieldExpressionValidatorField) {
-        this.fieldExpressionValidatorField = fieldExpressionValidatorField;
-    }
-
-    public String getUrlValidatorField() {
-        return urlValidatorField;
-    }
-
-    public void setUrlValidatorField(String urlValidatorField) {
-        this.urlValidatorField = urlValidatorField;
-    }
+	private String requiredValidatorField = null;
+	private String requiredStringValidatorField = null;
+	private Integer integerValidatorField = null;
+	private Date dateValidatorField = null;
+	private String emailValidatorField = null;
+	private String urlValidatorField = null;
+	private String stringLengthValidatorField = null;
+	private String regexValidatorField = null;
+	private String fieldExpressionValidatorField = null;
+
+
+	public Date getDateValidatorField() {
+		return dateValidatorField;
+	}
+
+	public void setDateValidatorField(Date dateValidatorField) {
+		this.dateValidatorField = dateValidatorField;
+	}
+
+	public String getEmailValidatorField() {
+		return emailValidatorField;
+	}
+
+	public void setEmailValidatorField(String emailValidatorField) {
+		this.emailValidatorField = emailValidatorField;
+	}
+
+	public Integer getIntegerValidatorField() {
+		return integerValidatorField;
+	}
+
+	public void setIntegerValidatorField(Integer integerValidatorField) {
+		this.integerValidatorField = integerValidatorField;
+	}
+
+	public String getRegexValidatorField() {
+		return regexValidatorField;
+	}
+
+	public void setRegexValidatorField(String regexValidatorField) {
+		this.regexValidatorField = regexValidatorField;
+	}
+
+	public String getRequiredStringValidatorField() {
+		return requiredStringValidatorField;
+	}
+
+	public void setRequiredStringValidatorField(String requiredStringValidatorField) {
+		this.requiredStringValidatorField = requiredStringValidatorField;
+	}
+
+	public String getRequiredValidatorField() {
+		return requiredValidatorField;
+	}
+
+	public void setRequiredValidatorField(String requiredValidatorField) {
+		this.requiredValidatorField = requiredValidatorField;
+	}
+
+	public String getStringLengthValidatorField() {
+		return stringLengthValidatorField;
+	}
+
+	public void setStringLengthValidatorField(String stringLengthValidatorField) {
+		this.stringLengthValidatorField = stringLengthValidatorField;
+	}
+
+	public String getFieldExpressionValidatorField() {
+		return fieldExpressionValidatorField;
+	}
+
+	public void setFieldExpressionValidatorField(
+			String fieldExpressionValidatorField) {
+		this.fieldExpressionValidatorField = fieldExpressionValidatorField;
+	}
+
+	public String getUrlValidatorField() {
+		return urlValidatorField;
+	}
+
+	public void setUrlValidatorField(String urlValidatorField) {
+		this.urlValidatorField = urlValidatorField;
+	}
 }
 
 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java Fri Oct 19 18:49:39 2012
@@ -27,30 +27,35 @@ package org.apache.struts2.showcase.vali
 
 public class NonFieldValidatorsExampleAction extends AbstractValidationActionSupport {
 
-    private static final long serialVersionUID = -524460368233581186L;
+	private static final long serialVersionUID = -524460368233581186L;
 
-    private String someText;
-    private String someTextRetype;
-    private String someTextRetypeAgain;
-
-    public String getSomeText() {
-        return someText;
-    }
-    public void setSomeText(String someText) {
-        this.someText = someText;
-    }
-    public String getSomeTextRetype() {
-        return someTextRetype;
-    }
-    public void setSomeTextRetype(String someTextRetype) {
-        this.someTextRetype = someTextRetype;
-    }
-    public String getSomeTextRetypeAgain() {
-        return someTextRetypeAgain;
-    }
-    public void setSomeTextRetypeAgain(String someTextRetypeAgain) {
-        this.someTextRetypeAgain = someTextRetypeAgain;
-    }
+	private String someText;
+	private String someTextRetype;
+	private String someTextRetypeAgain;
+
+	public String getSomeText() {
+		return someText;
+	}
+
+	public void setSomeText(String someText) {
+		this.someText = someText;
+	}
+
+	public String getSomeTextRetype() {
+		return someTextRetype;
+	}
+
+	public void setSomeTextRetype(String someTextRetype) {
+		this.someTextRetype = someTextRetype;
+	}
+
+	public String getSomeTextRetypeAgain() {
+		return someTextRetypeAgain;
+	}
+
+	public void setSomeTextRetypeAgain(String someTextRetypeAgain) {
+		this.someTextRetypeAgain = someTextRetypeAgain;
+	}
 }
 
 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java Fri Oct 19 18:49:39 2012
@@ -29,35 +29,35 @@ import com.opensymphony.xwork2.ActionSup
 
 public class QuizAction extends ActionSupport {
 
-    private static final long serialVersionUID = -7505437345373234225L;
+	private static final long serialVersionUID = -7505437345373234225L;
 
-    String name;
-    int age;
-    String answer;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
+	String name;
+	int age;
+	String answer;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public String getAnswer() {
+		return answer;
+	}
+
+	public void setAnswer(String answer) {
+		this.answer = answer;
+	}
 }
 
 // END SNIPPET: quizAction

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java Fri Oct 19 18:49:39 2012
@@ -23,38 +23,40 @@ package org.apache.struts2.showcase.vali
 import com.opensymphony.xwork2.ActionSupport;
 
 /**
- *
  * @version $Date$ $Id$
  */
 public class SubmitApplication extends ActionSupport {
 
-    private String name;
-    private Integer age;
+	private String name;
+	private Integer age;
 
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getName() {
-        return this.name;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-    public Integer getAge() {
-        return age;
-    }
-
-    public String submitApplication() throws Exception {
-        return SUCCESS;
-    }
-
-    public String applicationOk() throws Exception {
-        addActionMessage("Your application looks ok.");
-        return SUCCESS;
-    }
-    public String cancelApplication() throws Exception {
-        addActionMessage("So you have decided to cancel the application");
-        return SUCCESS;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setAge(Integer age) {
+		this.age = age;
+	}
+
+	public Integer getAge() {
+		return age;
+	}
+
+	public String submitApplication() throws Exception {
+		return SUCCESS;
+	}
+
+	public String applicationOk() throws Exception {
+		addActionMessage("Your application looks ok.");
+		return SUCCESS;
+	}
+
+	public String cancelApplication() throws Exception {
+		addActionMessage("So you have decided to cancel the application");
+		return SUCCESS;
+	}
 }

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java Fri Oct 19 18:49:39 2012
@@ -26,28 +26,33 @@ import java.sql.Date;
  */
 public class User {
 
-    private String name;
-    private Integer age;
-    private Date birthday;
-
-
-    public Integer getAge() {
-        return age;
-    }
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-    public Date getBirthday() {
-        return birthday;
-    }
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
+	private String name;
+	private Integer age;
+	private Date birthday;
+
+
+	public Integer getAge() {
+		return age;
+	}
+
+	public void setAge(Integer age) {
+		this.age = age;
+	}
+
+	public Date getBirthday() {
+		return birthday;
+	}
+
+	public void setBirthday(Date birthday) {
+		this.birthday = birthday;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }
 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java Fri Oct 19 18:49:39 2012
@@ -25,17 +25,17 @@ package org.apache.struts2.showcase.vali
 
 public class VisitorValidatorsExampleAction extends AbstractValidationActionSupport {
 
-    private static final long serialVersionUID = 4375454086939598216L;
+	private static final long serialVersionUID = 4375454086939598216L;
 
-    private User user;
+	private User user;
 
-    public User getUser() {
-        return user;
-    }
+	public User getUser() {
+		return user;
+	}
 
-    public void setUser(User user) {
-        this.user = user;
-    }
+	public void setUser(User user) {
+		this.user = user;
+	}
 }
 
 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java Fri Oct 19 18:49:39 2012
@@ -24,27 +24,24 @@ import com.opensymphony.xwork2.ActionSup
 
 /**
  * Example to illustrate the <code>execAndWait</code> interceptor.
- *
  */
 public class LongProcessAction extends ActionSupport {
 
-    private static final long serialVersionUID = 2471910747833998708L;
+	private static final long serialVersionUID = 2471910747833998708L;
 
-    private int time;
+	private int time;
 
-    public int getTime() {
-        return time;
-    }
+	public String execute() throws Exception {
+		Thread.sleep(time);
 
-    public void setTime(int time) {
-        this.time = time;
-    }
+		return SUCCESS;
+	}
 
-    public String execute() throws Exception {
-        System.err.println("time: " + time);
-        Thread.sleep(time);
-
-        return SUCCESS;
-    }
+	public int getTime() {
+		return time;
+	}
 
+	public void setTime(int time) {
+		this.time = time;
+	}
 }



Mime
View raw message