You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tm...@apache.org on 2006/04/02 16:00:40 UTC
svn commit: r390821 - in /incubator/webwork2/webapps/showcase/src/java: com/
org/ org/apache/ org/apache/struts/ org/apache/struts/webwork/
org/apache/struts/webwork/showcase/
org/apache/struts/webwork/showcase/action/
org/apache/struts/webwork/showcas...
Author: tmjee
Date: Sun Apr 2 07:00:37 2006
New Revision: 390821
URL: http://svn.apache.org/viewcvs?rev=390821&view=rev
Log:
rename com/opensymphony to org/apache/struts
Added:
incubator/webwork2/webapps/showcase/src/java/org/
incubator/webwork2/webapps/showcase/src/java/org/apache/
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/
- copied from r390819, incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/
Removed:
incubator/webwork2/webapps/showcase/src/java/com/
Modified:
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java
incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/DateAction.java Sun Apr 2 07:00:37 2006
@@ -3,7 +3,7 @@
* All rights reserved.
*/
-package org.apache.struts.action2.showcase;
+package org.apache.struts.webwork.showcase;
import com.opensymphony.xwork.ActionSupport;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/Guess.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfOptiontransferselectAction.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/LotsOfRichtexteditorAction.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/UITagExample.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/AbstractCRUDAction.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/EmployeeAction.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/action/SkillAction.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain1.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class ActionChain1 extends ActionSupport {
+ private static final long serialVersionUID = -6811701750042275153L;
+
private String actionChain1Property1 = "Property Set In Action Chain 1";
public String getActionChain1Property1() {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain2.java Sun Apr 2 07:00:37 2006
@@ -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,10 +13,10 @@
*/
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() {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/actionchaining/ActionChain3.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
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";
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/ajax/AjaxTestAction.java Sun Apr 2 07:00:37 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.ajax;
+package org.apache.struts.webwork.showcase.ajax;
import com.opensymphony.xwork.Action;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/MemoryStorage.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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();
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/Storage.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/application/TestDataProvider.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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",
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/AbstractDao.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/Dao.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/EmployeeDao.java Sun Apr 2 07:00:37 2006
@@ -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 @@
public class EmployeeDao extends AbstractDao {
- private static final Logger log = Logger.getLogger(EmployeeDao.class);
+ private static final long serialVersionUID = -6615310540042830594L;
protected SkillDao skillDao;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/dao/SkillDao.java Sun Apr 2 07:00:37 2006
@@ -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;
/**
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/CreateException.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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);
}
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DeleteException.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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);
}
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/DuplicateKeyException.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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);
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/StorageException.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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);
}
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/exception/UpdateException.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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);
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/filedownload/FileDownloadAction.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/fileupload/FileUploadAction.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/jasper/JasperAction.java Sun Apr 2 07:00:37 2006
@@ -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 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 @@
*/
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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Employee.java Sun Apr 2 07:00:37 2006
@@ -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 @@
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
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/IdEntity.java Sun Apr 2 07:00:37 2006
@@ -48,7 +48,7 @@
* SUCH DAMAGE.
* ====================================================================
*/
-package org.apache.struts.action2.showcase.model;
+package org.apache.struts.webwork.showcase.model;
import java.io.Serializable;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/model/Skill.java Sun Apr 2 07:00:37 2006
@@ -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 @@
public class Skill implements IdEntity {
- private String name;
+ private static final long serialVersionUID = -4150317722693212439L;
+
+ private String name;
private String description;
public Skill() {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/Gangster.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class Gangster implements Serializable {
+ private static final long serialVersionUID = 3688389475320294992L;
+
private String name;
private int age;
private String description;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/modelDriven/ModelDrivenAction.java Sun Apr 2 07:00:37 2006
@@ -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;
@@ -14,6 +14,8 @@
* @version $Date: 2006/03/20 16:22:00 $ $Id: ModelDrivenAction.java,v 1.2 2006/03/20 16:22:00 tmjee Exp $
*/
public class ModelDrivenAction extends ActionSupport implements ModelDriven {
+
+ private static final long serialVersionUID = 1271130427666936592L;
public String input() throws Exception {
return SUCCESS;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/CreatePerson.java Sun Apr 2 07:00:37 2006
@@ -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 @@
* 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) {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/EditPerson.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class EditPerson extends ActionSupport {
- PersonManager personManager;
+ private static final long serialVersionUID = 7699491775215130850L;
+
+ PersonManager personManager;
List persons = new ArrayList();
public void setPersonManager(PersonManager personManager) {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/ListPeople.java Sun Apr 2 07:00:37 2006
@@ -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 @@
* 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) {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/Person.java Sun Apr 2 07:00:37 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.person;
+package org.apache.struts.webwork.showcase.person;
/**
* User: plightbo
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/person/PersonManager.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class ActionTagDemo extends ActionSupport {
+ private static final long serialVersionUID = -2749145880590245184L;
+
public String show() throws Exception {
return SUCCESS;
}
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class AppendIteratorTagDemo extends ActionSupport implements Validateable {
+ private static final long serialVersionUID = -6525059998526094664L;
+
private String iteratorValue1;
private String iteratorValue2;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class IteratorGeneratorTagDemo extends ActionSupport {
+ private static final long serialVersionUID = 6893616642389337039L;
+
private String value;
private Integer count;
private String separator;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class MergeIteratorTagDemo extends ActionSupport implements Validateable {
+ private static final long serialVersionUID = 4401107963952961695L;
+
private String iteratorValue1;
private String iteratorValue2;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class SubsetIteratorTagDemo extends ActionSupport implements Validateable {
+ private static final long serialVersionUID = -8151855954644052650L;
+
private String iteratorValue;
private Integer count;
private Integer start;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/token/TokenAction.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
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
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/AbstractValidationActionSupport.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/FieldValidatorsExampleAction.java Sun Apr 2 07:00:37 2006
@@ -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 @@
public class FieldValidatorsExampleAction extends AbstractValidationActionSupport {
+ private static final long serialVersionUID = -4829381083003175423L;
+
private String requiredValidatorField = null;
private String requiredStringValidatorField = null;
private Integer integerValidatorField = null;
@@ -26,8 +27,6 @@
private String regexValidatorField = null;
private String fieldExpressionValidatorField = null;
-
- private String randomNumber = null;
public Date getDateValidatorField() {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/NonFieldValidatorsExampleAction.java Sun Apr 2 07:00:37 2006
@@ -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
@@ -12,6 +12,8 @@
// START SNIPPET: nonFieldValidatorsExample
public class NonFieldValidatorsExampleAction extends AbstractValidationActionSupport {
+
+ private static final long serialVersionUID = -524460368233581186L;
private String someText;
private String someTextRetype;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/QuizAction.java Sun Apr 2 07:00:37 2006
@@ -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 @@
// START SNIPPET: quizAction
public class QuizAction extends ActionSupport {
- String name;
+
+ private static final long serialVersionUID = -7505437345373234225L;
+
+ String name;
int age;
String answer;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/User.java Sun Apr 2 07:00:37 2006
@@ -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;
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/validation/VisitorValidatorsExampleAction.java Sun Apr 2 07:00:37 2006
@@ -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 @@
public class VisitorValidatorsExampleAction extends AbstractValidationActionSupport {
+ private static final long serialVersionUID = 4375454086939598216L;
+
private User user;
public User getUser() {
Modified: incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java?rev=390821&r1=390819&r2=390821&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java (original)
+++ incubator/webwork2/webapps/showcase/src/java/org/apache/struts/webwork/showcase/wait/LongProcessAction.java Sun Apr 2 07:00:37 2006
@@ -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 @@
*/
public class LongProcessAction extends ActionSupport {
- private int time;
+ private static final long serialVersionUID = 2471910747833998708L;
+
+ private int time;
public int getTime() {
return time;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org