Author: musachy
Date: Fri Dec 19 07:03:25 2008
New Revision: 728041
URL: http://svn.apache.org/viewvc?rev=728041&view=rev
Log:
WW-2926 Port rest-showcase to use convention plugin
Modified:
struts/struts2/trunk/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
struts/struts2/trunk/apps/rest-showcase/src/main/resources/struts.xml
Modified:
struts/struts2/trunk/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java?rev=728041&r1=728040&r2=728041&view=diff
==============================================================================
---
struts/struts2/trunk/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
(original)
+++
struts/struts2/trunk/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
Fri Dec 19 07:03:25 2008
@@ -19,8 +19,6 @@
@Results({
@Result(name="success", type="redirectAction", params = {"actionName" ,
"orders"})
})
-...@namespace("")
-...@interceptorref("restDefaultStack")
public class OrdersController extends ValidationAwareSupport implements
ModelDriven<Object>, Validateable{
private Order model = new Order();
Modified: struts/struts2/trunk/apps/rest-showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/main/resources/struts.xml?rev=728041&r1=728040&r2=728041&view=diff
==============================================================================
--- struts/struts2/trunk/apps/rest-showcase/src/main/resources/struts.xml
(original)
+++ struts/struts2/trunk/apps/rest-showcase/src/main/resources/struts.xml Fri
Dec 19 07:03:25 2008
@@ -27,8 +27,10 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
+ <!-- Overwrite Convention -->
<constant name="struts.convention.action.suffix" value="Controller"/>
<constant name="struts.convention.action.mapAllMatches" value="true"/>
<constant name="struts.convention.default.parent.package"
value="rest-default"/>
+ <constant name="struts.convention.package.locators" value="example"/>
</struts>
\ No newline at end of file
