Author: lukaszlenart
Date: Wed Jul 13 07:52:54 2011
New Revision: 1145897
URL: http://svn.apache.org/viewvc?rev=1145897&view=rev
Log:
Moves JSONValidationInterceptor into JSON plugin to keep core consistent
Added:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
(contents, props changed)
- copied, changed from r1144270,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java
(contents, props changed)
- copied, changed from r1144270,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpServletRequest.java
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpServletResponse.java
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpSession.java
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/json-validation-1.txt
(contents, props changed)
- copied, changed from r1144270,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/interceptor/validation/
Modified:
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/plugins/json/pom.xml
struts/struts2/trunk/plugins/json/src/main/resources/struts-plugin.xml
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?rev=1145897&r1=1145896&r2=1145897&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Wed Jul 13
07:52:54 2011
@@ -151,7 +151,6 @@
-
@@ -176,16 +175,6 @@
-
-
-
-
-input,back,cancel
-
-
-
-
-
Modified: struts/struts2/trunk/plugins/json/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/pom.xml?rev=1145897&r1=1145896&r2=1145897&view=diff
==
--- struts/struts2/trunk/plugins/json/pom.xml (original)
+++ struts/struts2/trunk/plugins/json/pom.xml Wed Jul 13 07:52:54 2011
@@ -92,6 +92,18 @@
+mockobjects
+mockobjects-core
+test
+
+
+
+mockobjects
+mockobjects-jdk1.3-j2ee1.3
+test
+
+
+
org.springframework
spring-test
test
Copied:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
(from r1144270,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java?p2=struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java&r1=1144270&r2=1145897&rev=1145897&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
(original)
+++
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
Wed Jul 13 07:52:54 2011
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts2.interceptor.validation;
+package org.apache.struts2.json;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionInvocation;
Propchange:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
--