From f800eeb7f08b220f7547becaa59bb6aee764bb1c Mon Sep 17 00:00:00 2001 From: Toby Jee Date: Sun, 2 Apr 2006 14:00:37 +0000 Subject: [PATCH] rename com/opensymphony to org/apache/struts git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@390821 13f79535-47bb-0310-9956-ffa450edef68 --- .../struts}/webwork/showcase/DateAction.java | 2 +- .../webwork/showcase/DateAction.properties | 0 .../apache/struts}/webwork/showcase/Guess.java | 2 +- .../LotsOfOptiontransferselectAction.java | 2 +- ...n-lotsOfRichtexteditorSubmit-validation.xml | 0 .../showcase/LotsOfRichtexteditorAction.java | 2 +- .../UITagExample-conversion.properties | 0 .../struts}/webwork/showcase/UITagExample.java | 2 +- .../showcase/action/AbstractCRUDAction.java | 6 +++--- .../EmployeeAction-conversion.properties | 0 .../action/EmployeeAction-validation.xml | 0 .../showcase/action/EmployeeAction.java | 16 +++++++++------- .../showcase/action/EmployeeAction.properties | 0 .../action/EmployeeAction_de.properties | 0 .../showcase/action/SkillAction-validation.xml | 0 .../webwork/showcase/action/SkillAction.java | 8 ++++---- .../showcase/action/SkillAction.properties | 0 .../showcase/action/SkillAction_de.properties | 0 .../showcase/actionchaining/ActionChain1.java | 4 +++- .../showcase/actionchaining/ActionChain2.java | 6 +++--- .../showcase/actionchaining/ActionChain3.java | 4 +++- .../webwork/showcase/ajax/AjaxTestAction.java | 2 +- .../showcase/application/MemoryStorage.java | 18 +++++++++--------- .../webwork/showcase/application/Storage.java | 10 +++++----- .../showcase/application/TestDataProvider.java | 16 +++++++++------- .../webwork/showcase/dao/AbstractDao.java | 12 ++++++------ .../struts}/webwork/showcase/dao/Dao.java | 10 +++++----- .../webwork/showcase/dao/EmployeeDao.java | 9 ++++----- .../struts}/webwork/showcase/dao/SkillDao.java | 4 ++-- .../showcase/exception/CreateException.java | 8 +++----- .../showcase/exception/DeleteException.java | 8 +++----- .../exception/DuplicateKeyException.java | 6 ++---- .../showcase/exception/StorageException.java | 8 +++----- .../showcase/exception/UpdateException.java | 6 +++--- .../filedownload/FileDownloadAction.java | 4 ++-- .../showcase/fileupload/FileUploadAction.java | 7 ++++--- .../webwork/showcase/jasper/JasperAction.java | 10 ++++++---- .../webwork/showcase/model/Employee.java | 6 ++++-- .../webwork/showcase/model/IdEntity.java | 2 +- .../struts}/webwork/showcase/model/Skill.java | 6 ++++-- .../webwork/showcase/modelDriven/Gangster.java | 4 +++- .../modelDriven/ModelDrivenAction.java | 4 +++- .../person/CreatePerson-validation.xml | 0 .../webwork/showcase/person/CreatePerson.java | 7 +++++-- .../person/EditPerson-conversion.properties | 0 .../webwork/showcase/person/EditPerson.java | 6 ++++-- .../webwork/showcase/person/ListPeople.java | 7 +++++-- .../showcase/person/Person-validation.xml | 0 .../webwork/showcase/person/Person.java | 2 +- .../webwork/showcase/person/PersonManager.java | 4 +--- .../tag/nonui/actiontag/ActionTagDemo.java | 4 +++- .../iteratortag/AppendIteratorTagDemo.java | 4 +++- .../IteratorGeneratorTagDemo-validation.xml | 0 .../iteratortag/IteratorGeneratorTagDemo.java | 4 +++- .../iteratortag/MergeIteratorTagDemo.java | 4 +++- .../iteratortag/SubsetIteratorTagDemo.java | 4 +++- .../webwork/showcase/token/TokenAction.java | 6 ++++-- .../AbstractValidationActionSupport.java | 2 +- ...lidatorsExampleAction-conversion.properties | 0 ...tClientSideValidationExample-validation.xml | 0 ...ubmitFieldValidatorsExamples-validation.xml | 0 .../FieldValidatorsExampleAction.java | 7 +++---- .../FieldValidatorsExampleAction.properties | 0 ...itNonFieldValidatorsExamples-validation.xml | 0 .../NonFieldValidatorsExampleAction.java | 4 +++- .../validation/QuizAction-validation.xml | 0 .../showcase/validation/QuizAction.java | 7 +++++-- .../validation/User-userContext-validation.xml | 0 .../webwork/showcase/validation/User.java | 2 +- ...mitVisitorValidatorsExamples-validation.xml | 0 .../VisitorValidatorsExampleAction.java | 4 +++- .../showcase/wait/LongProcessAction.java | 6 ++++-- 72 files changed, 167 insertions(+), 131 deletions(-) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/DateAction.java (97%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/DateAction.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/Guess.java (96%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/LotsOfOptiontransferselectAction.java (99%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/LotsOfRichtexteditorAction.java (96%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/UITagExample-conversion.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/UITagExample.java (99%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/AbstractCRUDAction.java (96%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/EmployeeAction-conversion.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/EmployeeAction-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/EmployeeAction.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/EmployeeAction.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/EmployeeAction_de.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/SkillAction-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/SkillAction.java (95%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/SkillAction.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/action/SkillAction_de.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/actionchaining/ActionChain1.java (83%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/actionchaining/ActionChain2.java (87%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/actionchaining/ActionChain3.java (89%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/ajax/AjaxTestAction.java (92%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/application/MemoryStorage.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/application/Storage.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/application/TestDataProvider.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/dao/AbstractDao.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/dao/Dao.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/dao/EmployeeDao.java (92%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/dao/SkillDao.java (96%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/exception/CreateException.java (70%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/exception/DeleteException.java (63%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/exception/DuplicateKeyException.java (71%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/exception/StorageException.java (70%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/exception/UpdateException.java (71%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/filedownload/FileDownloadAction.java (84%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/fileupload/FileUploadAction.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/jasper/JasperAction.java (86%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/model/Employee.java (97%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/model/IdEntity.java (98%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/model/Skill.java (95%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/modelDriven/Gangster.java (88%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/modelDriven/ModelDrivenAction.java (83%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/CreatePerson-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/CreatePerson.java (78%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/EditPerson-conversion.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/EditPerson.java (90%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/ListPeople.java (80%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/Person-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/Person.java (96%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/person/PersonManager.java (90%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java (76%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java (91%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java (87%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java (92%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java (90%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/token/TokenAction.java (93%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/AbstractValidationActionSupport.java (89%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/FieldValidatorsExampleAction-conversion.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/FieldValidatorsExampleAction.java (95%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/FieldValidatorsExampleAction.properties (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/NonFieldValidatorsExampleAction.java (88%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/QuizAction-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/QuizAction.java (81%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/User-userContext-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/User.java (92%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml (100%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/validation/VisitorValidatorsExampleAction.java (80%) rename webapps/showcase/src/java/{com/opensymphony => org/apache/struts}/webwork/showcase/wait/LongProcessAction.java (77%) diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java similarity index 97% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java index 27e337537..d6a3566e8 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java similarity index 96% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java index e4f9a67a4..38f084cef 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java similarity index 99% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java index af4f70e7d..9e6c12804 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java similarity index 96% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java index fe550b660..6098e6708 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample-conversion.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample-conversion.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample-conversion.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample-conversion.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java similarity index 99% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java index 0b97663aa..11ce98149 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java similarity index 96% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java index 58c3b12b1..5b8f6f393 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction-conversion.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction-conversion.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction-conversion.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction-conversion.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java index 8698fcfcc..63d15dd40 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction_de.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction_de.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction_de.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction_de.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java similarity index 95% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java index 12e1d48e2..ec375bd7e 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction_de.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction_de.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction_de.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction_de.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java similarity index 83% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java index 47648ba21..ca6cb5995 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java +++ b/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() { diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java similarity index 87% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java index db449de90..c9851d274 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java +++ b/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; } diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java similarity index 89% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java index cbc801d36..ee7900025 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java +++ b/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"; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java similarity index 92% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java index e5dfee3f0..68f6efe5d 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java index acb774444..7c89c286d 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java +++ b/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(); diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java index 3b15e73c0..11007c3d6 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java index 4de98bab5..eab97770b 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java +++ b/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", diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java index 199df070c..c0e285f7b 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java index d14ff39c3..9206ec402 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java similarity index 92% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java index e700517ae..aca638133 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java similarity index 96% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java index b67771a5c..de989010a 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java +++ b/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; /** diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java similarity index 70% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java index 4680f9816..828dd871a 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java +++ b/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); } diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java similarity index 63% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java index 30021cc60..a831246ef 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java +++ b/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); } diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java similarity index 71% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java index 3298e6038..5e460e25a 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java +++ b/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); diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java similarity index 70% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java index 388120a7e..638598498 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java +++ b/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); } diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java similarity index 71% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java index 4b5528337..c8bc6d8f8 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java +++ b/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); diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java similarity index 84% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java index 33f1a6b4c..51ecd44f5 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java index 59f04bcd5..6873f1549 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java similarity index 86% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java index 84dba95a9..fafcc2145 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java similarity index 97% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java index 52d7056ba..70d850c17 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java +++ b/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 diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java similarity index 98% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java index bb6596d26..0fbc74b7b 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java similarity index 95% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java index 64c7e2daf..bb8031edf 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java +++ b/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() { diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java similarity index 88% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java index d7906897f..74bee353a 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java similarity index 83% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java index 3d4554fa2..2fd405728 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java +++ b/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; } diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java similarity index 78% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java index 038f0e721..2033ebf2b 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java +++ b/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) { diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson-conversion.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson-conversion.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson-conversion.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson-conversion.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java similarity index 90% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java index 261bbe08b..4bcb649c1 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java +++ b/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) { diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java similarity index 80% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java index 25492d9c4..8115cb370 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java +++ b/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) { diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java similarity index 96% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java index da61403f1..38504d157 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java +++ b/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 diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java similarity index 90% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java index 52873b6df..4b8a91eeb 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java similarity index 76% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java index 56e8e03bf..b7bc99b0a 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java +++ b/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; } diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java similarity index 91% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java index e0452b963..724d68a5d 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java similarity index 87% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java index dca8605bd..d79e961b5 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java similarity index 92% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java index cd7e7ae92..2661ca2a2 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java similarity index 90% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java index 64a082005..7d674c8ea 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java similarity index 93% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java index c8339b68a..ff254f558 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java +++ b/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 diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java similarity index 89% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java index 24f838be5..a697a83d7 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction-conversion.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction-conversion.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction-conversion.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction-conversion.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java similarity index 95% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java index 7a8f6b6cb..1c38649e0 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.properties b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.properties similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.properties rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.properties diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java similarity index 88% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java index 215b17ed0..a75436100 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java similarity index 81% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java index 14d8eb865..fa3d75256 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User-userContext-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User-userContext-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User-userContext-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User-userContext-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java similarity index 92% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java index f808809c3..daca802b9 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java +++ b/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; diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml similarity index 100% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java similarity index 80% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java index 837b2ae91..a62e8eb8e 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java +++ b/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() { diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java b/webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java similarity index 77% rename from webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java rename to webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java index 12f4e708b..18a34a17c 100644 --- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java +++ b/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;