Author: mrdon
Date: Sat Nov 18 21:05:14 2006
New Revision: 476710
URL: http://svn.apache.org/viewvc?view=rev&rev=476710
Log:
Added the codebehind plugin and used it in the person manager example, cleaned
imports
WW-1515
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp
- copied unchanged from r476601,
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPeople.jsp
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPeople.jsp
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Sat Nov 18 21:05:14 2006
@@ -64,6 +64,12 @@
<dependency>
<groupId>org.apache.struts</groupId>
+ <artifactId>struts2-codebehind-plugin</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -137,7 +143,7 @@
<artifactId>maven-jetty-plugin</artifactId>
<version>6.0.1</version>
<configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
+ <scanIntervalSeconds>1000000</scanIntervalSeconds>
</configuration>
<dependencies>
<dependency>
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
Sat Nov 18 21:05:14 2006
@@ -20,12 +20,12 @@
*/
package org.apache.struts2.showcase;
-import com.opensymphony.xwork2.ActionSupport;
-
import java.text.DateFormat;
-import java.util.Date;
import java.util.Calendar;
+import java.util.Date;
import java.util.GregorianCalendar;
+
+import com.opensymphony.xwork2.ActionSupport;
/**
* <code>DateAction</code>
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
Sat Nov 18 21:05:14 2006
@@ -20,12 +20,12 @@
*/
package org.apache.struts2.showcase;
-import com.opensymphony.xwork2.ActionSupport;
+import java.util.Random;
+
import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.Preparable;
import com.uwyn.rife.continuations.ContinuableObject;
-
-import java.util.Random;
// START SNIPPET: example
public class Guess extends ActionSupport implements Preparable,
ContinuableObject {
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
Sat Nov 18 21:05:14 2006
@@ -20,18 +20,19 @@
*/
package org.apache.struts2.showcase;
-import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.util.ValueStack;
-
+import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.io.File;
+
+import org.apache.struts2.ServletActionContext;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.util.ValueStack;
/**
*/
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
Sat Nov 18 21:05:14 2006
@@ -20,13 +20,14 @@
*/
package org.apache.struts2.showcase.action;
+import java.io.Serializable;
+import java.util.Collection;
+
import org.apache.log4j.Logger;
-import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.showcase.dao.Dao;
import org.apache.struts2.showcase.model.IdEntity;
-import java.util.Collection;
-import java.io.Serializable;
+import com.opensymphony.xwork2.ActionSupport;
/**
* AbstractCRUDAction.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
Sat Nov 18 21:05:14 2006
@@ -20,7 +20,11 @@
*/
package org.apache.struts2.showcase.action;
-import com.opensymphony.xwork2.Preparable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.log4j.Logger;
import org.apache.struts2.showcase.application.TestDataProvider;
import org.apache.struts2.showcase.dao.Dao;
@@ -28,10 +32,7 @@
import org.apache.struts2.showcase.model.Employee;
import org.apache.struts2.showcase.model.Skill;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import com.opensymphony.xwork2.Preparable;
/**
* JsfEmployeeAction.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
Sat Nov 18 21:05:14 2006
@@ -20,11 +20,12 @@
*/
package org.apache.struts2.showcase.action;
+import org.apache.log4j.Logger;
import org.apache.struts2.showcase.dao.Dao;
import org.apache.struts2.showcase.dao.SkillDao;
import org.apache.struts2.showcase.model.Skill;
+
import com.opensymphony.xwork2.Preparable;
-import org.apache.log4j.Logger;
/**
* SkillAction.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
Sat Nov 18 21:05:14 2006
@@ -20,10 +20,10 @@
*/
package org.apache.struts2.showcase.ajax.tree;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
/**
*/
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
Sat Nov 18 21:05:14 2006
@@ -20,7 +20,6 @@
*/
package org.apache.struts2.showcase.ajax.tree;
-import com.opensymphony.xwork2.ActionSupport;
/**
*/
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java
Sat Nov 18 21:05:14 2006
@@ -20,18 +20,17 @@
*/
package org.apache.struts2.showcase.application;
-import org.apache.struts2.showcase.exception.CreateException;
-import org.apache.struts2.showcase.exception.DuplicateKeyException;
-import org.apache.struts2.showcase.exception.StorageException;
-import org.apache.struts2.showcase.exception.UpdateException;
-import org.apache.struts2.showcase.model.IdEntity;
-import org.apache.struts2.showcase.application.Storage;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+
+import org.apache.struts2.showcase.exception.CreateException;
+import org.apache.struts2.showcase.exception.DuplicateKeyException;
+import org.apache.struts2.showcase.exception.StorageException;
+import org.apache.struts2.showcase.exception.UpdateException;
+import org.apache.struts2.showcase.model.IdEntity;
/**
* MemoryStorage.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java
Sat Nov 18 21:05:14 2006
@@ -20,13 +20,13 @@
*/
package org.apache.struts2.showcase.application;
-import org.apache.struts2.showcase.model.IdEntity;
-import org.apache.struts2.showcase.exception.CreateException;
-import org.apache.struts2.showcase.exception.UpdateException;
-import org.apache.struts2.showcase.exception.StorageException;
-
import java.io.Serializable;
import java.util.Collection;
+
+import org.apache.struts2.showcase.exception.CreateException;
+import org.apache.struts2.showcase.exception.StorageException;
+import org.apache.struts2.showcase.exception.UpdateException;
+import org.apache.struts2.showcase.model.IdEntity;
/**
* Storage. Interface.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
Sat Nov 18 21:05:14 2006
@@ -20,17 +20,17 @@
*/
package org.apache.struts2.showcase.application;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Date;
+
+import org.apache.log4j.Logger;
import org.apache.struts2.showcase.dao.EmployeeDao;
import org.apache.struts2.showcase.dao.SkillDao;
import org.apache.struts2.showcase.exception.StorageException;
import org.apache.struts2.showcase.model.Employee;
import org.apache.struts2.showcase.model.Skill;
-import org.apache.log4j.Logger;
import org.springframework.beans.factory.InitializingBean;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Arrays;
/**
* TestDataProvider.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java
Sat Nov 18 21:05:14 2006
@@ -20,14 +20,14 @@
*/
package org.apache.struts2.showcase.dao;
-import org.apache.struts2.showcase.model.IdEntity;
-import org.apache.struts2.showcase.exception.CreateException;
-import org.apache.struts2.showcase.exception.UpdateException;
-import org.apache.struts2.showcase.exception.StorageException;
-import org.apache.struts2.showcase.application.Storage;
-
import java.io.Serializable;
import java.util.Collection;
+
+import org.apache.struts2.showcase.application.Storage;
+import org.apache.struts2.showcase.exception.CreateException;
+import org.apache.struts2.showcase.exception.StorageException;
+import org.apache.struts2.showcase.exception.UpdateException;
+import org.apache.struts2.showcase.model.IdEntity;
/**
* AbstractDao.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java
Sat Nov 18 21:05:14 2006
@@ -20,13 +20,13 @@
*/
package org.apache.struts2.showcase.dao;
-import org.apache.struts2.showcase.model.IdEntity;
-import org.apache.struts2.showcase.exception.CreateException;
-import org.apache.struts2.showcase.exception.UpdateException;
-import org.apache.struts2.showcase.exception.StorageException;
-
import java.io.Serializable;
import java.util.Collection;
+
+import org.apache.struts2.showcase.exception.CreateException;
+import org.apache.struts2.showcase.exception.StorageException;
+import org.apache.struts2.showcase.exception.UpdateException;
+import org.apache.struts2.showcase.model.IdEntity;
/**
* Dao. Interface.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java
Sat Nov 18 21:05:14 2006
@@ -20,11 +20,11 @@
*/
package org.apache.struts2.showcase.dao;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.struts2.showcase.model.Employee;
import org.apache.struts2.showcase.model.Skill;
-
-import java.util.List;
-import java.util.ArrayList;
/**
* EmployeeDao.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
Sat Nov 18 21:05:14 2006
@@ -20,10 +20,11 @@
*/
package org.apache.struts2.showcase.filedownload;
+import java.io.InputStream;
+
import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.Action;
-import java.io.InputStream;
+import com.opensymphony.xwork2.Action;
/**
* Action to demonstrate how to use file download.
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
Sat Nov 18 21:05:14 2006
@@ -20,9 +20,9 @@
*/
package org.apache.struts2.showcase.fileupload;
-import com.opensymphony.xwork2.ActionSupport;
-
import java.io.File;
+
+import com.opensymphony.xwork2.ActionSupport;
/**
* Show case File Upload example's action. <code>FileUploadAction</code>
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
Sat Nov 18 21:05:14 2006
@@ -19,11 +19,11 @@
* under the License.
*/
package org.apache.struts2.showcase.fileupload;
-import com.opensymphony.xwork2.ActionSupport;
-
import java.io.File;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+
+import com.opensymphony.xwork2.ActionSupport;
/**
* Showcase action - multiple file upload using List
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
Sat Nov 18 21:05:14 2006
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.hangman;
-import static org.apache.struts2.showcase.hangman.HangmanConstants.*;
+import static
org.apache.struts2.showcase.hangman.HangmanConstants.HANGMAN_SESSION_KEY;
import java.util.Map;
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
Sat Nov 18 21:05:14 2006
@@ -23,7 +23,6 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.validator.ValidatorForm;
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
Sat Nov 18 21:05:14 2006
@@ -34,11 +34,7 @@
* <code>EditPerson</code>
*
*/
[EMAIL PROTECTED]({
- @Result(value="editPeople.jsp"),
- @Result(name="error",value="editPeople.jsp"),
- @Result(name="list", value="listPeople.action",
type=ServletRedirectResult.class)
-})
[EMAIL PROTECTED](name="list", value="listPeople.action",
type=ServletRedirectResult.class)
public class EditPersonAction extends ActionSupport {
private static final long serialVersionUID = 7699491775215130850L;
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
Sat Nov 18 21:05:14 2006
@@ -28,7 +28,6 @@
import com.opensymphony.xwork2.ActionSupport;
[EMAIL PROTECTED](value="listPeople.ftl", type=FreemarkerResult.class)
public class ListPeopleAction extends ActionSupport {
private static final long serialVersionUID = 3608017189783645371L;
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
Sat Nov 18 21:05:14 2006
@@ -30,10 +30,6 @@
/**
*/
@ParentPackage("person")
[EMAIL PROTECTED]({
- @Result(value="newPerson.ftl", type=FreemarkerResult.class),
- @Result(name="input", value="newPerson.ftl", type=FreemarkerResult.class)
-})
public class NewPersonAction extends ActionSupport {
private static final long serialVersionUID = 200410824352645515L;
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
Sat Nov 18 21:05:14 2006
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.showcase.person;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
/**
*/
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
Sat Nov 18 21:05:14 2006
@@ -20,11 +20,11 @@
*/
package org.apache.struts2.showcase.sitemesh;
+import javax.servlet.http.HttpServletRequest;
+
import com.opensymphony.module.sitemesh.Decorator;
import com.opensymphony.module.sitemesh.Page;
import com.opensymphony.module.sitemesh.mapper.AbstractDecoratorMapper;
-
-import javax.servlet.http.HttpServletRequest;
public class NoneDecoratorMapper extends AbstractDecoratorMapper {
public Decorator getDecorator(HttpServletRequest req, Page page) {
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
Sat Nov 18 21:05:14 2006
@@ -20,10 +20,10 @@
*/
package org.apache.struts2.showcase.token;
+import java.util.Date;
+
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-
-import java.util.Date;
/**
* Example to illustrate the <code>token</code> and <code>token-session</code>
interceptor.
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties?view=diff&rev=476710&r1=476709&r2=476710
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties Sat
Nov 18 21:05:14 2006
@@ -8,3 +8,4 @@
struts.freemarker.manager.classname=customFreemarkerManager
struts.serve.static=true
struts.serve.static.browserCache=false
+struts.codebehind.defaultPackage=person
\ No newline at end of file
