From f41ffc2421b512c1580086a275b610109b3818db Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Fri, 19 Dec 2008 15:03:25 +0000
Subject: [PATCH] WW-2926 Port rest-showcase to use convention plugin

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@728041 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/struts2/rest/example/OrdersController.java  | 2 --
 apps/rest-showcase/src/main/resources/struts.xml                | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java b/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
index 8299caafe..0df8494ef 100644
--- a/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
+++ b/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
@@ -19,8 +19,6 @@ import com.opensymphony.xwork2.ValidationAwareSupport;
 @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();
diff --git a/apps/rest-showcase/src/main/resources/struts.xml b/apps/rest-showcase/src/main/resources/struts.xml
index 42ba6bb9a..16bf7e7be 100644
--- a/apps/rest-showcase/src/main/resources/struts.xml
+++ b/apps/rest-showcase/src/main/resources/struts.xml
@@ -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