Author: jogep
Date: Tue Apr 26 20:18:52 2011
New Revision: 1096885
URL: http://svn.apache.org/viewvc?rev=1096885&view=rev
Log:
WW-3241: ShowCase demo application still uses the CodeBehind plugin.
Added:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java
struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp
(contents, props changed)
- copied, changed from r1096838,
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl
(contents, props changed)
- copied, changed from r1096838,
struts/struts2/trunk/apps/showcase/src/main/webapp/person/listPeople.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl
(contents, props changed)
- copied, changed from r1096838,
struts/struts2/trunk/apps/showcase/src/main/webapp/person/newPerson.ftl
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/person/listPeople.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/person/newPerson.ftl
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
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/resources/struts.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/person/index.jsp
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=1096885&r1=1096884&r2=1096885&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Apr 26 20:18:52 2011
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-codebehind-plugin</artifactId>
+ <artifactId>struts2-convention-plugin</artifactId>
<version>${project.version}</version>
</dependency>
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java?rev=1096885&r1=1096884&r2=1096885&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
Tue Apr 26 20:18:52 2011
@@ -24,17 +24,20 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
-import org.apache.struts2.dispatcher.ServletRedirectResult;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.Results;
/**
* <code>EditPerson</code>
*
*/
-@Result(name="list", value="listPeople.action",
type=ServletRedirectResult.class)
+@Results({
+ @Result(name="list", location="list-people.action", type="redirect"),
+ @Result(name="input", location="new-person.ftl", type="freemarker")
+})
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?rev=1096885&r1=1096884&r2=1096885&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
Tue Apr 26 20:18:52 2011
@@ -23,11 +23,11 @@ package org.apache.struts2.showcase.pers
import java.util.ArrayList;
import java.util.List;
-import org.apache.struts2.config.Result;
-import org.apache.struts2.views.freemarker.FreemarkerResult;
-
import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
+@Result(location="list-people.ftl", type="freemarker")
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?rev=1096885&r1=1096884&r2=1096885&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
Tue Apr 26 20:18:52 2011
@@ -20,16 +20,13 @@
*/
package org.apache.struts2.showcase.person;
-import org.apache.struts2.config.ParentPackage;
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.views.freemarker.FreemarkerResult;
import com.opensymphony.xwork2.ActionSupport;
-/**
- */
-@ParentPackage("person")
+@Result(name="input", location="new-person.ftl", type="freemarker")
public class NewPersonAction extends ActionSupport {
private static final long serialVersionUID = 200410824352645515L;
Added:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java?rev=1096885&view=auto
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java
Tue Apr 26 20:18:52 2011
@@ -0,0 +1,7 @@
+@ParentPackage("person")
+@Namespace("/person")
+package org.apache.struts2.showcase.person;
+
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.ParentPackage;
+
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?rev=1096885&r1=1096884&r2=1096885&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Tue Apr 26
20:18:52 2011
@@ -14,13 +14,13 @@
<constant name="struts.custom.i18n.resources" value="globalMessages" />
<constant name="struts.action.extension" value="action,," />
- <constant name="struts.codebehind.defaultPackage" value="person" />
+ <constant name="struts.convention.package.locators.basePackage"
value="org.apache.struts2.showcase.person" />
+ <constant name="struts.convention.result.path" value="/" />
+
<constant name="struts.freemarker.manager.classname"
value="customFreemarkerManager" />
<constant name="struts.serve.static" value="true" />
<constant name="struts.serve.static.browserCache" value="false" />
- <constant name="actionPackages"
value="org.apache.struts2.showcase.person"/>
-
<include file="struts-chat.xml" />
<include file="struts-interactive.xml" />
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?rev=1096885&r1=1096884&r2=1096885&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Tue Apr
26 20:18:52 2011
@@ -9,10 +9,6 @@
<filter>
<filter-name>struts-prepare</filter-name>
<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
- <init-param>
- <param-name>actionPackages</param-name>
- <param-value>org.apache.struts2.showcase.person</param-value>
- </init-param>
</filter>
<filter>
Copied:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp (from
r1096838,
struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp?p2=struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp&r1=1096838&r2=1096885&rev=1096885&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/person/editPerson.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp
Tue Apr 26 20:18:52 2011
@@ -6,7 +6,7 @@
</head>
<body>
-<s:form action="editPerson" theme="simple" validate="false">
+<s:form action="edit-person" theme="simple" validate="false">
<table>
<tr>
@@ -33,8 +33,8 @@
</s:form>
<ul>
- <li><a href="newPerson!input.action">Create</a> a new person</li>
- <li><a href="listPeople.action">List</a> all people</li>
+ <li><a href="new-person!input.action">Create</a> a new person</li>
+ <li><a href="list-people.action">List</a> all people</li>
</ul>
</body>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/edit-person.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/person/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/person/index.jsp?rev=1096885&r1=1096884&r2=1096885&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/person/index.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/person/index.jsp Tue Apr
26 20:18:52 2011
@@ -5,8 +5,8 @@
<body>
<ul>
- <li><a href="newPerson!input.action">Create</a> a new person</li>
- <li><a href="listPeople.action">List</a> all people</li>
+ <li><a href="new-person!input.action">Create</a> a new person</li>
+ <li><a href="list-people.action">List</a> all people</li>
</ul>
</body>
</html>
Copied:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl (from
r1096838,
struts/struts2/trunk/apps/showcase/src/main/webapp/person/listPeople.ftl)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl?p2=struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/person/listPeople.ftl&r1=1096838&r2=1096885&rev=1096885&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/person/listPeople.ftl
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl
Tue Apr 26 20:18:52 2011
@@ -21,8 +21,8 @@ There are ${peopleCount} people...
</table>
<ul>
- <li><a href="editPerson.action">Edit people</a></li>
- <li><a href="newPerson!input.action">Create</a> a new person</li>
+ <li><a href="edit-person.action">Edit people</a></li>
+ <li><a href="new-person!input.action">Create</a> a new person</li>
</ul>
</body>
</html>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl (from
r1096838,
struts/struts2/trunk/apps/showcase/src/main/webapp/person/newPerson.ftl)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl?p2=struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/person/newPerson.ftl&r1=1096838&r2=1096885&rev=1096885&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/person/newPerson.ftl
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl
Tue Apr 26 20:18:52 2011
@@ -4,15 +4,15 @@
</head>
<body>
-<@s.form action="newPerson">
+<@s.form action="new-person">
<@s.textfield label="First Name" name="person.name"/>
<@s.textfield label="Last Name" name="person.lastName"/>
<@s.submit value="Create person"/>
</@s.form>
<ul>
- <li><a href="editPerson.action">Edit people</a></li>
- <li><a href="listPeople.action">List</a> all people</li>
+ <li><a href="edit-person.action">Edit people</a></li>
+ <li><a href="list-people.action">List</a> all people</li>
</ul>
</body>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/person/new-person.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
