Author: mrdon
Date: Sat Sep 23 21:46:40 2006
New Revision: 449359
URL: http://svn.apache.org/viewvc?view=rev&rev=449359
Log:
Moving the scoped model driven interceptor over to xwork, adding interceptor to
default
stack
WW-1452
Removed:
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ScopedModelDriven.java
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ScopedModelDrivenInterceptor.java
struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/legacy/ScopedModelDrivenInterceptorTest.java
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml?view=diff&rev=449359&r1=449358&r2=449359
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml Sat
Sep 23 21:46:40 2006
@@ -8,7 +8,7 @@
<package name="legacy" extends="struts-default,struts-legacy-default"
namespace="/legacy">
<interceptors>
- <interceptor name="gangsterForm"
class="org.apache.struts2.legacy.ScopedModelDrivenInterceptor">
+ <interceptor name="gangsterForm"
class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor">
<param
name="className">org.apache.struts2.showcase.legacy.GangsterForm</param>
</interceptor>
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?view=diff&rev=449359&r1=449358&r2=449359
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sat Sep 23
21:46:40 2006
@@ -39,6 +39,7 @@
<interceptor name="i18n"
class="com.opensymphony.xwork2.interceptor.I18nInterceptor"/>
<interceptor name="logger"
class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
<interceptor name="model-driven"
class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="scoped-model-driven"
class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
<interceptor name="params"
class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
<interceptor name="prepare"
class="com.opensymphony.xwork2.interceptor.PrepareInterceptor"/>
<interceptor name="static-params"
class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
@@ -155,6 +156,7 @@
<interceptor-ref name="i18n"/>
<interceptor-ref name="chain"/>
<interceptor-ref name="debugging"/>
+ <interceptor-ref name="scoped-model-driven"/>
<interceptor-ref name="model-driven"/>
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="checkbox"/>
Modified:
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java?view=diff&rev=449359&r1=449358&r2=449359
==============================================================================
---
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
(original)
+++
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
Sat Sep 23 21:46:40 2006
@@ -27,6 +27,7 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.interceptor.ScopedModelDriven;
/**
* Calls the reset() method on the ActionForm, if it exists.
Modified:
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java?view=diff&rev=449359&r1=449358&r2=449359
==============================================================================
---
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
(original)
+++
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
Sat Sep 23 21:46:40 2006
@@ -28,6 +28,7 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.interceptor.ScopedModelDriven;
/**
* Calls the validate() method on the ActionForm, if it exists. The errors
are handled
Modified:
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java?view=diff&rev=449359&r1=449358&r2=449359
==============================================================================
---
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java
(original)
+++
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java
Sat Sep 23 21:46:40 2006
@@ -38,6 +38,7 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.interceptor.ScopedModelDriven;
/**
* Wraps legacy Struts 1.3 Actions. Supports the following features:
