rename com/opensymphony to org/apache/struts

git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@390821 13f79535-47bb-0310-9956-ffa450edef68

webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java

@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package org.apache.struts.action2.showcase;
+package org.apache.struts.webwork.showcase;
 
 import com.opensymphony.xwork.ActionSupport;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase;
+package org.apache.struts.webwork.showcase;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Action;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase;
+package org.apache.struts.webwork.showcase;
 
 import java.util.LinkedHashMap;
 import java.util.List;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase;
+package org.apache.struts.webwork.showcase;
 
 import com.opensymphony.xwork.ActionSupport;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase;
+package org.apache.struts.webwork.showcase;
 
 import org.apache.struts.action2.ServletActionContext;
 import org.apache.struts.action2.interceptor.ServletRequestAware;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java

@@ -48,12 +48,12 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.action;
+package org.apache.struts.webwork.showcase.action;
 
 import org.apache.log4j.Logger;
 import com.opensymphony.xwork.ActionSupport;
-import org.apache.struts.action2.showcase.dao.Dao;
-import org.apache.struts.action2.showcase.model.IdEntity;
+import org.apache.struts.webwork.showcase.dao.Dao;
+import org.apache.struts.webwork.showcase.model.IdEntity;
 
 import java.util.Collection;
 import java.io.Serializable;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java

@@ -48,13 +48,13 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.action;
+package org.apache.struts.webwork.showcase.action;
 
-import org.apache.struts.action2.showcase.dao.Dao;
-import org.apache.struts.action2.showcase.dao.EmployeeDao;
-import org.apache.struts.action2.showcase.model.Employee;
-import org.apache.struts.action2.showcase.model.Skill;
-import org.apache.struts.action2.showcase.application.TestDataProvider;
+import org.apache.struts.webwork.showcase.dao.Dao;
+import org.apache.struts.webwork.showcase.dao.EmployeeDao;
+import org.apache.struts.webwork.showcase.model.Employee;
+import org.apache.struts.webwork.showcase.model.Skill;
+import org.apache.struts.webwork.showcase.application.TestDataProvider;
 import com.opensymphony.xwork.Preparable;
 import org.apache.log4j.Logger;
 
@@ -71,7 +71,9 @@ import java.util.ArrayList;
 
 public class EmployeeAction extends AbstractCRUDAction implements Preparable {
 
-    private static final Logger log = Logger.getLogger(EmployeeAction.class);
+	private static final long serialVersionUID = 7047317819789938957L;
+
+	private static final Logger log = Logger.getLogger(EmployeeAction.class);
 
     private Long empId;
     protected EmployeeDao employeeDao;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java

@@ -48,11 +48,11 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.action;
+package org.apache.struts.webwork.showcase.action;
 
-import org.apache.struts.action2.showcase.dao.Dao;
-import org.apache.struts.action2.showcase.dao.SkillDao;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts.webwork.showcase.dao.Dao;
+import org.apache.struts.webwork.showcase.dao.SkillDao;
+import org.apache.struts.webwork.showcase.model.Skill;
 import com.opensymphony.xwork.Preparable;
 import org.apache.log4j.Logger;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.actionchaining;
+package org.apache.struts.webwork.showcase.actionchaining;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -13,6 +13,8 @@ import com.opensymphony.xwork.ActionSupport;
  */
 public class ActionChain1 extends ActionSupport {
 
+	private static final long serialVersionUID = -6811701750042275153L;
+	
 	private String actionChain1Property1 = "Property Set In Action Chain 1";
 
 	public String getActionChain1Property1() { 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.actionchaining;
+package org.apache.struts.webwork.showcase.actionchaining;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -13,12 +13,12 @@ import com.opensymphony.xwork.ActionSupport;
  */
 public class ActionChain2 extends ActionSupport {
 
+	private static final long serialVersionUID = 3951745956044674809L;
+	
 	private String actionChain1Property1;
 	private String actionChain2Property1 = "Property Set in Action Chain 2";
 	
 	
-	
-	
 	public String getActionChain1Property1() { 
 		return actionChain1Property1;
 	}

webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.actionchaining;
+package org.apache.struts.webwork.showcase.actionchaining;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -13,6 +13,8 @@ import com.opensymphony.xwork.ActionSupport;
  */
 public class ActionChain3 extends ActionSupport {
 
+	private static final long serialVersionUID = -1456568865075250621L;
+	
 	private String actionChain1Property1;
 	private String actionChain2Property1;
 	private String actionChain3Property1 = "Property set in Action Chain 3";

webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.ajax;
+package org.apache.struts.webwork.showcase.ajax;
 
 import com.opensymphony.xwork.Action;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java

@@ -48,15 +48,14 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.application;
+package org.apache.struts.webwork.showcase.application;
 
-import org.apache.struts.action2.showcase.exception.CreateException;
-import org.apache.struts.action2.showcase.exception.DuplicateKeyException;
-import org.apache.struts.action2.showcase.exception.StorageException;
-import org.apache.struts.action2.showcase.exception.UpdateException;
-import org.apache.struts.action2.showcase.model.IdEntity;
-import org.apache.struts.action2.showcase.application.Storage;
-import org.apache.log4j.Logger;
+import org.apache.struts.webwork.showcase.exception.CreateException;
+import org.apache.struts.webwork.showcase.exception.DuplicateKeyException;
+import org.apache.struts.webwork.showcase.exception.StorageException;
+import org.apache.struts.webwork.showcase.exception.UpdateException;
+import org.apache.struts.webwork.showcase.model.IdEntity;
+import org.apache.struts.webwork.showcase.application.Storage;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -73,7 +72,8 @@ import java.util.Map;
 
 public class MemoryStorage implements Storage {
 
-    private static final Logger log = Logger.getLogger(MemoryStorage.class);
+	private static final long serialVersionUID = 8611213748834904125L;
+
 
     private Map memory = new HashMap();
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java

@@ -48,12 +48,12 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.application;
+package org.apache.struts.webwork.showcase.application;
 
-import org.apache.struts.action2.showcase.model.IdEntity;
-import org.apache.struts.action2.showcase.exception.CreateException;
-import org.apache.struts.action2.showcase.exception.UpdateException;
-import org.apache.struts.action2.showcase.exception.StorageException;
+import org.apache.struts.webwork.showcase.model.IdEntity;
+import org.apache.struts.webwork.showcase.exception.CreateException;
+import org.apache.struts.webwork.showcase.exception.UpdateException;
+import org.apache.struts.webwork.showcase.exception.StorageException;
 
 import java.io.Serializable;
 import java.util.Collection;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java

@@ -48,13 +48,13 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.application;
+package org.apache.struts.webwork.showcase.application;
 
-import org.apache.struts.action2.showcase.dao.EmployeeDao;
-import org.apache.struts.action2.showcase.dao.SkillDao;
-import org.apache.struts.action2.showcase.exception.StorageException;
-import org.apache.struts.action2.showcase.model.Employee;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts.webwork.showcase.dao.EmployeeDao;
+import org.apache.struts.webwork.showcase.dao.SkillDao;
+import org.apache.struts.webwork.showcase.exception.StorageException;
+import org.apache.struts.webwork.showcase.model.Employee;
+import org.apache.struts.webwork.showcase.model.Skill;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -70,7 +70,9 @@ import java.util.Arrays;
 
 public class TestDataProvider implements Serializable, InitializingBean {
 
-    private static final Logger log = Logger.getLogger(TestDataProvider.class);
+	private static final long serialVersionUID = 1L;
+
+	private static final Logger log = Logger.getLogger(TestDataProvider.class);
 
     public static final String[] POSITIONS = {
             "Developer",

webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java

@@ -48,14 +48,14 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.dao;
+package org.apache.struts.webwork.showcase.dao;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.action2.showcase.model.IdEntity;
-import org.apache.struts.action2.showcase.exception.CreateException;
-import org.apache.struts.action2.showcase.exception.UpdateException;
-import org.apache.struts.action2.showcase.exception.StorageException;
-import org.apache.struts.action2.showcase.application.Storage;
+import org.apache.struts.webwork.showcase.model.IdEntity;
+import org.apache.struts.webwork.showcase.exception.CreateException;
+import org.apache.struts.webwork.showcase.exception.UpdateException;
+import org.apache.struts.webwork.showcase.exception.StorageException;
+import org.apache.struts.webwork.showcase.application.Storage;
 
 import java.io.Serializable;
 import java.util.Collection;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java

@@ -48,12 +48,12 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.dao;
+package org.apache.struts.webwork.showcase.dao;
 
-import org.apache.struts.action2.showcase.model.IdEntity;
-import org.apache.struts.action2.showcase.exception.CreateException;
-import org.apache.struts.action2.showcase.exception.UpdateException;
-import org.apache.struts.action2.showcase.exception.StorageException;
+import org.apache.struts.webwork.showcase.model.IdEntity;
+import org.apache.struts.webwork.showcase.exception.CreateException;
+import org.apache.struts.webwork.showcase.exception.UpdateException;
+import org.apache.struts.webwork.showcase.exception.StorageException;
 
 import java.io.Serializable;
 import java.util.Collection;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java

@@ -48,11 +48,10 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.dao;
+package org.apache.struts.webwork.showcase.dao;
 
-import org.apache.struts.action2.showcase.model.Employee;
-import org.apache.struts.action2.showcase.model.IdEntity;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts.webwork.showcase.model.Employee;
+import org.apache.struts.webwork.showcase.model.Skill;
 import org.apache.log4j.Logger;
 
 import java.util.List;
@@ -66,7 +65,7 @@ import java.util.ArrayList;
 
 public class EmployeeDao extends AbstractDao {
 
-    private static final Logger log = Logger.getLogger(EmployeeDao.class);
+	private static final long serialVersionUID = -6615310540042830594L;
 
     protected SkillDao skillDao;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java

@@ -48,9 +48,9 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.dao;
+package org.apache.struts.webwork.showcase.dao;
 
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts.webwork.showcase.model.Skill;
 import org.apache.log4j.Logger;
 
 /**

webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java

@@ -1,6 +1,4 @@
-package org.apache.struts.action2.showcase.exception;
-
-import org.apache.log4j.Logger;
+package org.apache.struts.webwork.showcase.exception;
 
 /**
  * CreateException.
@@ -10,8 +8,8 @@ import org.apache.log4j.Logger;
 
 public class CreateException extends StorageException {
 
-    private static final Logger log = Logger.getLogger(CreateException.class);
-
+	private static final long serialVersionUID = 6734349565111633783L;
+	
     public CreateException(String message) {
         super(message);
     }

webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java

@@ -1,6 +1,4 @@
-package org.apache.struts.action2.showcase.exception;
-
-import org.apache.log4j.Logger;
+package org.apache.struts.webwork.showcase.exception;
 
 /**
  * DeleteException.
@@ -10,9 +8,9 @@ import org.apache.log4j.Logger;
 
 public class DeleteException extends StorageException {
 
-    private static final Logger log = Logger.getLogger(DeleteException.class);
+	private static final long serialVersionUID = -5286362812955627352L;
 
-    public DeleteException(String message) {
+	public DeleteException(String message) {
         super(message);
     }
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java

@@ -1,6 +1,4 @@
-package org.apache.struts.action2.showcase.exception;
-
-import org.apache.log4j.Logger;
+package org.apache.struts.webwork.showcase.exception;
 
 /**
  * DuplicateKeyException.
@@ -10,7 +8,7 @@ import org.apache.log4j.Logger;
 
 public class DuplicateKeyException extends CreateException {
 
-    private static final Logger log = Logger.getLogger(DuplicateKeyException.class);
+	private static final long serialVersionUID = 989620752592415898L;
 
     public DuplicateKeyException(String message) {
         super(message);

webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java

@@ -1,6 +1,4 @@
-package org.apache.struts.action2.showcase.exception;
-
-import org.apache.log4j.Logger;
+package org.apache.struts.webwork.showcase.exception;
 
 /**
  * StorageException.
@@ -10,8 +8,8 @@ import org.apache.log4j.Logger;
 
 public class StorageException extends Exception {
 
-    private static final Logger log = Logger.getLogger(StorageException.class);
-
+	private static final long serialVersionUID = -2528721270540362905L;
+	
     public StorageException(String message) {
         super(message);
     }

webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java

@@ -1,6 +1,5 @@
-package org.apache.struts.action2.showcase.exception;
+package org.apache.struts.webwork.showcase.exception;
 
-import org.apache.log4j.Logger;
 
 /**
  * UpdateException.
@@ -10,7 +9,8 @@ import org.apache.log4j.Logger;
 
 public class UpdateException extends StorageException {
 
-    private static final Logger log = Logger.getLogger(UpdateException.class);
+	private static final long serialVersionUID = -4728238600375630452L;
+	
 
     public UpdateException(String message) {
         super(message);

webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.filedownload;
+package org.apache.struts.webwork.showcase.filedownload;
 
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
 import com.opensymphony.xwork.Action;
 
 import java.io.InputStream;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.fileupload;
+package org.apache.struts.webwork.showcase.fileupload;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -17,8 +17,9 @@ import java.io.File;
  */
 public class FileUploadAction extends ActionSupport {
 
-
-    private String contentType;
+	private static final long serialVersionUID = 5156288255337069381L;
+	
+	private String contentType;
     private File upload;
     private String fileName;
     private String caption;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2005 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.jasper;
+package org.apache.struts.webwork.showcase.jasper;
 
 import java.util.Set;
 import java.io.File;
@@ -10,8 +10,8 @@ import java.io.File;
 import net.sf.jasperreports.engine.JasperCompileManager;
 
 import com.opensymphony.xwork.ActionSupport;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.showcase.person.PersonManager;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.showcase.person.PersonManager;
 
 /**
  * @author Philip Luppens
@@ -19,7 +19,9 @@ import org.apache.struts.action2.showcase.person.PersonManager;
  */
 public class JasperAction extends ActionSupport {
 
-    private PersonManager personManager;
+	private static final long serialVersionUID = 6320765173392624324L;
+	
+	private PersonManager personManager;
 
     public void setPersonManager(PersonManager personManager) {
         this.personManager = personManager;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java

@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.model;
+package org.apache.struts.webwork.showcase.model;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -62,7 +62,9 @@ import java.util.List;
 
 public class Employee implements IdEntity {
 
-    private Long empId; //textfield w/ conversion
+	private static final long serialVersionUID = -6226845151026823748L;
+	
+	private Long empId; //textfield w/ conversion
     private String firstName;
     private String lastName;
     private Date birthDate; //datepicker

webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java

@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.model;
+package org.apache.struts.webwork.showcase.model;
 
 import java.io.Serializable;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java

@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package org.apache.struts.action2.showcase.model;
+package org.apache.struts.webwork.showcase.model;
 
 import java.io.Serializable;
 
@@ -60,7 +60,9 @@ import java.io.Serializable;
 
 public class Skill implements IdEntity {
 
-    private String name;
+	private static final long serialVersionUID = -4150317722693212439L;
+	
+	private String name;
     private String description;
 
     public Skill() {

webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.modelDriven;
+package org.apache.struts.webwork.showcase.modelDriven;
 
 import java.io.Serializable;
 
@@ -14,6 +14,8 @@ import java.io.Serializable;
  */
 public class Gangster implements Serializable {
 
+	private static final long serialVersionUID = 3688389475320294992L;
+	
 	private String name;
 	private int age;
 	private String description;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.modelDriven;
+package org.apache.struts.webwork.showcase.modelDriven;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.ModelDriven;
@@ -15,6 +15,8 @@ import com.opensymphony.xwork.ModelDriven;
  */
 public class ModelDrivenAction extends ActionSupport implements ModelDriven {
 
+	private static final long serialVersionUID = 1271130427666936592L;
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}

webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.person;
+package org.apache.struts.webwork.showcase.person;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -8,7 +8,10 @@ import com.opensymphony.xwork.ActionSupport;
  * Time: 9:24:03 PM
  */
 public class CreatePerson extends ActionSupport {
-    PersonManager personManager;
+	
+	private static final long serialVersionUID = 200410824352645515L;
+	
+	PersonManager personManager;
     Person person;
 
     public void setPersonManager(PersonManager personManager) {

webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.person;
+package org.apache.struts.webwork.showcase.person;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -14,7 +14,9 @@ import java.util.ArrayList;
  */
 public class EditPerson extends ActionSupport {
 
-    PersonManager personManager;
+	private static final long serialVersionUID = 7699491775215130850L;
+	
+	PersonManager personManager;
     List persons = new ArrayList();
 
     public void setPersonManager(PersonManager personManager) {

webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.person;
+package org.apache.struts.webwork.showcase.person;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -11,7 +11,10 @@ import java.util.ArrayList;
  * Time: 12:03:15 AM
  */
 public class ListPeople extends ActionSupport {
-    PersonManager personManager;
+	
+	private static final long serialVersionUID = 3608017189783645371L;
+	
+	PersonManager personManager;
     List people = new ArrayList();
 
     public void setPersonManager(PersonManager personManager) {

webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.person;
+package org.apache.struts.webwork.showcase.person;
 
 /**
  * User: plightbo

webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java

@@ -1,7 +1,5 @@
-package org.apache.struts.action2.showcase.person;
+package org.apache.struts.webwork.showcase.person;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.tag.nonui.actiontag;
+package org.apache.struts.webwork.showcase.tag.nonui.actiontag;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -12,6 +12,8 @@ import com.opensymphony.xwork.ActionSupport;
  */
 public class ActionTagDemo extends ActionSupport {
 	
+	private static final long serialVersionUID = -2749145880590245184L;
+
 	public String show() throws Exception {
 		return SUCCESS;
 	}

webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
+package org.apache.struts.webwork.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Validateable;
@@ -14,6 +14,8 @@ import com.opensymphony.xwork.Validateable;
  */
 public class AppendIteratorTagDemo extends ActionSupport implements Validateable {
 
+	private static final long serialVersionUID = -6525059998526094664L;
+	
 	private String iteratorValue1;
 	private String iteratorValue2;
 	

webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
+package org.apache.struts.webwork.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -12,6 +12,8 @@ import com.opensymphony.xwork.ActionSupport;
  */
 public class IteratorGeneratorTagDemo extends ActionSupport {
 
+	private static final long serialVersionUID = 6893616642389337039L;
+	
 	private String value;
 	private Integer count;
 	private String separator;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
+package org.apache.struts.webwork.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Validateable;
@@ -14,6 +14,8 @@ import com.opensymphony.xwork.Validateable;
  */
 public class MergeIteratorTagDemo extends ActionSupport implements Validateable {
 
+	private static final long serialVersionUID = 4401107963952961695L;
+	
 	private String iteratorValue1;
 	private String iteratorValue2;
 	

webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
+package org.apache.struts.webwork.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Validateable;
@@ -14,6 +14,8 @@ import com.opensymphony.xwork.Validateable;
  */
 public class SubsetIteratorTagDemo extends ActionSupport implements Validateable {
 
+	private static final long serialVersionUID = -8151855954644052650L;
+	
 	private String iteratorValue;
 	private Integer count;
 	private Integer start;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java

@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package org.apache.struts.action2.showcase.token;
+package org.apache.struts.webwork.showcase.token;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionSupport;
@@ -17,7 +17,9 @@ import java.util.Date;
  */
 public class TokenAction extends ActionSupport {
 
-    private int amount;
+	private static final long serialVersionUID = 616150375751184884L;
+	
+	private int amount;
 
     public String execute() throws Exception {
         // transfer from source to destination

webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.validation;
+package org.apache.struts.webwork.showcase.validation;
 
 import com.opensymphony.xwork.ActionSupport;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java

@@ -2,10 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.validation;
+package org.apache.struts.webwork.showcase.validation;
 
 import java.sql.Date;
-import java.util.Random;
 
 /**
  * @author tm_jee
@@ -16,6 +15,8 @@ import java.util.Random;
 
 public class FieldValidatorsExampleAction extends AbstractValidationActionSupport {
 	
+	private static final long serialVersionUID = -4829381083003175423L;
+	
 	private String requiredValidatorField = null;
 	private String requiredStringValidatorField = null;
 	private Integer integerValidatorField = null;
@@ -27,8 +28,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
 	private String fieldExpressionValidatorField = null;
 	
 	
-	private String randomNumber = null;
-	
 	
 	public Date getDateValidatorField() {
 		return dateValidatorField;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.validation;
+package org.apache.struts.webwork.showcase.validation;
 
 /**
  * @author tm_jee
@@ -13,6 +13,8 @@ package org.apache.struts.action2.showcase.validation;
 
 public class NonFieldValidatorsExampleAction extends AbstractValidationActionSupport {
 	
+	private static final long serialVersionUID = -524460368233581186L;
+	
 	private String someText;
 	private String someTextRetype;
 	private String someTextRetypeAgain;

webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.validation;
+package org.apache.struts.webwork.showcase.validation;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -9,7 +9,10 @@ import com.opensymphony.xwork.ActionSupport;
 // START SNIPPET: quizAction 
 
 public class QuizAction extends ActionSupport {
-    String name;
+	
+	private static final long serialVersionUID = -7505437345373234225L;
+	
+	String name;
     int age;
     String answer;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.validation;
+package org.apache.struts.webwork.showcase.validation;
 
 import java.sql.Date;
 

webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package org.apache.struts.action2.showcase.validation;
+package org.apache.struts.webwork.showcase.validation;
 
 /**
  * @author tm_jee
@@ -13,6 +13,8 @@ package org.apache.struts.action2.showcase.validation;
 
 public class VisitorValidatorsExampleAction extends AbstractValidationActionSupport {
 
+	private static final long serialVersionUID = 4375454086939598216L;
+	
 	private User user;
 	
 	public User getUser() {

webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java

@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.wait;
+package org.apache.struts.webwork.showcase.wait;
 
 import com.opensymphony.xwork.ActionSupport;
 
@@ -9,7 +9,9 @@ import com.opensymphony.xwork.ActionSupport;
  */
 public class LongProcessAction extends ActionSupport {
 
-    private int time;
+	private static final long serialVersionUID = 2471910747833998708L;
+	
+	private int time;
 
     public int getTime() {
         return time;