From cec0cbf9cc4efaa28d13a7981b9c5a3e427d0d7a Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Mon, 11 Sep 2006 04:47:47 +0000
Subject: [PATCH] Adding missing fileupload dep for showcase, added checkbox
 interceptor to proper stacks

WW-1349 WW-992


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@442097 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/showcase/pom.xml                       | 6 ++++++
 apps/showcase/src/main/resources/struts.xml | 1 +
 core/src/main/resources/struts-default.xml  | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index aae7aeee1..aebdf31de 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -61,6 +61,12 @@
          <artifactId>rife-continuations</artifactId>
          <version>0.0.2</version>
      </dependency>
+     <dependency>
+         <groupId>commons-fileupload</groupId>
+         <artifactId>commons-fileupload</artifactId>
+         <version>1.1</version>
+     </dependency>
+
  
     </dependencies>
     
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index d8d7c5bc5..4913dcaee 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -47,6 +47,7 @@
     <package name="default" extends="struts-default">
         <interceptors>
             <interceptor-stack name="crudStack">
+            	<interceptor-ref name="checkbox" />
                 <interceptor-ref name="params" />
 				<interceptor-ref name="static-params" />
                 <interceptor-ref name="defaultStack" />
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 7562f0e08..f1b5e4b4c 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -66,7 +66,7 @@
                 <interceptor-ref name="exception"/>
                 <interceptor-ref name="servlet-config"/>
                 <interceptor-ref name="prepare"/>
-                <interceptor-ref name="static-params"/>
+                <interceptor-ref name="checkbox"/>
                 <interceptor-ref name="params"/>
                 <interceptor-ref name="conversionError"/>
             </interceptor-stack>
@@ -124,6 +124,7 @@
                 <interceptor-ref name="chain"/>
                 <interceptor-ref name="model-driven"/>
                 <interceptor-ref name="fileUpload"/>
+                <interceptor-ref name="checkbox"/>
                 <interceptor-ref name="static-params"/>
                 <interceptor-ref name="params"/>
                 <interceptor-ref name="conversionError"/>
@@ -156,8 +157,8 @@
                 <interceptor-ref name="debugging"/>
                 <interceptor-ref name="model-driven"/>
                 <interceptor-ref name="fileUpload"/>
-                <interceptor-ref name="static-params"/>
                 <interceptor-ref name="checkbox"/>
+                <interceptor-ref name="static-params"/>
                 <interceptor-ref name="params"/>
                 <interceptor-ref name="conversionError"/>
                 <interceptor-ref name="validation">