struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject struts git commit: WW-4077 Moves ValidationAware interface into proper package
Date Thu, 18 Jun 2015 09:34:35 GMT
Repository: struts
Updated Branches:
  refs/heads/master 82cb1286c -> e2347f165


WW-4077 Moves ValidationAware interface into proper package


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e2347f16
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e2347f16
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e2347f16

Branch: refs/heads/master
Commit: e2347f165c5e0a8522bc55ed01e973b196155185
Parents: 82cb128
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Thu Jun 18 11:33:49 2015 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Thu Jun 18 11:33:49 2015 +0200

----------------------------------------------------------------------
 .../com/opensymphony/xwork2/ActionSupport.java  |   1 +
 .../opensymphony/xwork2/ValidationAware.java    | 130 -------------------
 .../xwork2/ValidationAwareSupport.java          |   2 +
 .../xwork2/interceptor/AliasInterceptor.java    |   1 -
 .../interceptor/ConversionErrorInterceptor.java |   1 -
 .../interceptor/DefaultWorkflowInterceptor.java |   1 -
 .../interceptor/ParametersInterceptor.java      |   1 -
 .../StaticParametersInterceptor.java            |   1 -
 .../xwork2/interceptor/ValidationAware.java     | 130 +++++++++++++++++++
 .../interceptor/ValidationErrorAware.java       |   2 +-
 .../interceptor/ValidationWorkflowAware.java    |   2 +-
 .../validator/DelegatingValidatorContext.java   |   1 +
 .../xwork2/validator/ValidationInterceptor.java |   3 +-
 .../xwork2/validator/ValidatorContext.java      |   2 +-
 .../interceptor/FileUploadInterceptor.java      |   1 +
 .../interceptor/MessageStoreInterceptor.java    |   2 +-
 .../struts2/interceptor/TokenInterceptor.java   |   2 +-
 .../interceptor/ValidationErrorAwareTest.java   |   1 -
 .../ConversionErrorFieldValidatorTest.java      |   2 +-
 .../validator/DateRangeValidatorTest.java       |   2 +-
 .../validator/DoubleRangeValidatorTest.java     |   1 +
 .../validator/ExpressionValidatorTest.java      |   1 +
 .../xwork2/validator/IntRangeValidatorTest.java |   2 +-
 .../validator/LongRangeValidatorTest.java       |   2 +-
 .../validator/ShortRangeValidatorTest.java      |   2 +-
 .../validator/SimpleActionValidationTest.java   |   1 +
 .../validator/ValidatorAnnotationTest.java      |   2 +-
 .../BeanValidationInterceptorTest.java          |   2 +-
 .../apache/struts2/validators/DWRValidator.java |   2 +-
 .../struts2/json/JSONValidationInterceptor.java |   2 +-
 .../apache/struts2/StrutsJUnit4TestCase.java    |   1 +
 .../OValValidationInterceptorTest.java          |   3 +-
 .../struts2/rest/RestActionInvocation.java      |   1 +
 .../struts2/rest/RestWorkflowInterceptor.java   |   2 +-
 34 files changed, 158 insertions(+), 154 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index fd8675b..62daf15 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -17,6 +17,7 @@ package com.opensymphony.xwork2;
 
 import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/ValidationAware.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/ValidationAware.java b/core/src/main/java/com/opensymphony/xwork2/ValidationAware.java
deleted file mode 100644
index 4ae5e84..0000000
--- a/core/src/main/java/com/opensymphony/xwork2/ValidationAware.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2002-2007,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ValidationAware classes can accept Action (class level) or field level error messages.
Action level messages are kept
- * in a Collection. Field level error messages are kept in a Map from String field name to
a List of field error msgs.
- *
- * @author plightbo 
- */
-public interface ValidationAware {
-
-    /**
-     * Set the Collection of Action-level String error messages.
-     *
-     * @param errorMessages Collection of String error messages
-     */
-    void setActionErrors(Collection<String> errorMessages);
-
-    /**
-     * Get the Collection of Action-level error messages for this action. Error messages
should not
-     * be added directly here, as implementations are free to return a new Collection or
an
-     * Unmodifiable Collection.
-     *
-     * @return Collection of String error messages
-     */
-    Collection<String> getActionErrors();
-
-    /**
-     * Set the Collection of Action-level String messages (not errors).
-     *
-     * @param messages Collection of String messages (not errors).
-     */
-    void setActionMessages(Collection<String> messages);
-
-    /**
-     * Get the Collection of Action-level messages for this action. Messages should not be
added
-     * directly here, as implementations are free to return a new Collection or an Unmodifiable
-     * Collection.
-     *
-     * @return Collection of String messages
-     */
-    Collection<String> getActionMessages();
-
-    /**
-     * Set the field error map of fieldname (String) to Collection of String error messages.
-     *
-     * @param errorMap field error map
-     */
-    void setFieldErrors(Map<String, List<String>> errorMap);
-
-    /**
-     * Get the field specific errors associated with this action. Error messages should not
be added
-     * directly here, as implementations are free to return a new Collection or an Unmodifiable
-     * Collection.
-     *
-     * @return Map with errors mapped from fieldname (String) to Collection of String error
messages
-     */
-    Map<String, List<String>> getFieldErrors();
-
-    /**
-     * Add an Action-level error message to this Action.
-     *
-     * @param anErrorMessage  the error message
-     */
-    void addActionError(String anErrorMessage);
-
-    /**
-     * Add an Action-level message to this Action.
-     *
-     * @param aMessage  the message
-     */
-    void addActionMessage(String aMessage);
-
-    /**
-     * Add an error message for a given field.
-     *
-     * @param fieldName    name of field
-     * @param errorMessage the error message
-     */
-    void addFieldError(String fieldName, String errorMessage);
-
-    /**
-     * Check whether there are any Action-level error messages.
-     *
-     * @return true if any Action-level error messages have been registered
-     */
-    boolean hasActionErrors();
-
-    /**
-     * Checks whether there are any Action-level messages.
-     *
-     * @return true if any Action-level messages have been registered
-     */
-    boolean hasActionMessages();
-
-    /**
-     * Checks whether there are any action errors or field errors.
-     * <p/>
-     * <b>Note</b>: that this does not have the same meaning as in WW 1.x.
-     *
-     * @return <code>(hasActionErrors() || hasFieldErrors())</code>
-     */
-    boolean hasErrors();
-
-    /**
-     * Check whether there are any field errors associated with this action.
-     *
-     * @return whether there are any field errors
-     */
-    boolean hasFieldErrors();
-
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java b/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
index 520513b..3d9ccac 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
@@ -15,6 +15,8 @@
  */
 package com.opensymphony.xwork2;
 
+import com.opensymphony.xwork2.interceptor.ValidationAware;
+
 import java.io.Serializable;
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
index 7bd9499..a95ee88 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
@@ -18,7 +18,6 @@ package com.opensymphony.xwork2.interceptor;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.XWorkConstants;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.inject.Inject;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
index 47d020a..4f70aed 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
@@ -17,7 +17,6 @@ package com.opensymphony.xwork2.interceptor;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
 import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.commons.lang3.StringEscapeUtils;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
index 13cea0e..e3f2220 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
@@ -17,7 +17,6 @@ package com.opensymphony.xwork2.interceptor;
 
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.interceptor.annotations.InputConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 8496610..865eeb8 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -17,7 +17,6 @@ package com.opensymphony.xwork2.interceptor;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.XWorkConstants;
 import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
 import com.opensymphony.xwork2.conversion.impl.XWorkConverter;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
index 25fd8d6..e47af30 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
@@ -17,7 +17,6 @@ package com.opensymphony.xwork2.interceptor;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.XWorkConstants;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.Parameterizable;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java
new file mode 100644
index 0000000..5aa19b6
--- /dev/null
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2002-2007,2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.opensymphony.xwork2.interceptor;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ValidationAware classes can accept Action (class level) or field level error messages.
Action level messages are kept
+ * in a Collection. Field level error messages are kept in a Map from String field name to
a List of field error msgs.
+ *
+ * @author plightbo 
+ */
+public interface ValidationAware {
+
+    /**
+     * Set the Collection of Action-level String error messages.
+     *
+     * @param errorMessages Collection of String error messages
+     */
+    void setActionErrors(Collection<String> errorMessages);
+
+    /**
+     * Get the Collection of Action-level error messages for this action. Error messages
should not
+     * be added directly here, as implementations are free to return a new Collection or
an
+     * Unmodifiable Collection.
+     *
+     * @return Collection of String error messages
+     */
+    Collection<String> getActionErrors();
+
+    /**
+     * Set the Collection of Action-level String messages (not errors).
+     *
+     * @param messages Collection of String messages (not errors).
+     */
+    void setActionMessages(Collection<String> messages);
+
+    /**
+     * Get the Collection of Action-level messages for this action. Messages should not be
added
+     * directly here, as implementations are free to return a new Collection or an Unmodifiable
+     * Collection.
+     *
+     * @return Collection of String messages
+     */
+    Collection<String> getActionMessages();
+
+    /**
+     * Set the field error map of fieldname (String) to Collection of String error messages.
+     *
+     * @param errorMap field error map
+     */
+    void setFieldErrors(Map<String, List<String>> errorMap);
+
+    /**
+     * Get the field specific errors associated with this action. Error messages should not
be added
+     * directly here, as implementations are free to return a new Collection or an Unmodifiable
+     * Collection.
+     *
+     * @return Map with errors mapped from fieldname (String) to Collection of String error
messages
+     */
+    Map<String, List<String>> getFieldErrors();
+
+    /**
+     * Add an Action-level error message to this Action.
+     *
+     * @param anErrorMessage  the error message
+     */
+    void addActionError(String anErrorMessage);
+
+    /**
+     * Add an Action-level message to this Action.
+     *
+     * @param aMessage  the message
+     */
+    void addActionMessage(String aMessage);
+
+    /**
+     * Add an error message for a given field.
+     *
+     * @param fieldName    name of field
+     * @param errorMessage the error message
+     */
+    void addFieldError(String fieldName, String errorMessage);
+
+    /**
+     * Check whether there are any Action-level error messages.
+     *
+     * @return true if any Action-level error messages have been registered
+     */
+    boolean hasActionErrors();
+
+    /**
+     * Checks whether there are any Action-level messages.
+     *
+     * @return true if any Action-level messages have been registered
+     */
+    boolean hasActionMessages();
+
+    /**
+     * Checks whether there are any action errors or field errors.
+     * <p/>
+     * <b>Note</b>: that this does not have the same meaning as in WW 1.x.
+     *
+     * @return <code>(hasActionErrors() || hasFieldErrors())</code>
+     */
+    boolean hasErrors();
+
+    /**
+     * Check whether there are any field errors associated with this action.
+     *
+     * @return whether there are any field errors
+     */
+    boolean hasFieldErrors();
+
+}

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
index 5d0fd6b..2e5e82c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
@@ -21,7 +21,7 @@ package com.opensymphony.xwork2.interceptor;
  * before {@link com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor} will return
'inputResultName' result
  * to allow change or not the result name
  *
- * This interface can be only applied to action which already implements {@link com.opensymphony.xwork2.ValidationAware}
interface!
+ * This interface can be only applied to action which already implements {@link ValidationAware}
interface!
  *
  * @since 2.3.15
  */

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
index 51bdf71..f0ea87d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
@@ -3,7 +3,7 @@ package com.opensymphony.xwork2.interceptor;
 /**
  * ValidationWorkflowAware classes can programmatically change result name when errors occurred
  *
- * This interface can be only applied to action which already implements {@link com.opensymphony.xwork2.ValidationAware}
interface!
+ * This interface can be only applied to action which already implements {@link ValidationAware}
interface!
  */
 public interface ValidationWorkflowAware {
 

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 5b11921..7033b5d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -16,6 +16,7 @@
 package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
b/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
index bbb25ed..5b2a65c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
@@ -21,6 +21,7 @@ import com.opensymphony.xwork2.Validateable;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -29,7 +30,7 @@ import org.apache.logging.log4j.Logger;
  *
  * This interceptor runs the action through the standard validation framework, which in turn
checks the action against
  * any validation rules (found in files such as <i>ActionClass-validation.xml</i>)
and adds field-level and action-level
- * error messages (provided that the action implements {@link com.opensymphony.xwork2.ValidationAware}).
This interceptor
+ * error messages (provided that the action implements {@link ValidationAware}). This interceptor
  * is often one of the last (or second to last) interceptors applied in a stack, as it assumes
that all values have
  * already been set on the action.
  *

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
index f795867..82d01fd 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index 76ae56a..5e12df0 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -25,6 +25,7 @@ import com.opensymphony.xwork2.*;
 import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.util.TextParseUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
index aff8aac..82d2a55 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
@@ -23,7 +23,7 @@ package org.apache.struts2.interceptor;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
index 53a9807..229fcaf 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
@@ -23,7 +23,7 @@ package org.apache.struts2.interceptor;
 
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import org.apache.struts2.ServletActionContext;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
b/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
index 1a5729a..169477d 100644
--- a/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
@@ -6,7 +6,6 @@ import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ActionProxy;
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.InterceptorConfig;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
index ab22d48..d686131 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
@@ -16,7 +16,7 @@
 package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.ValidationAwareSupport;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.util.ValueStack;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
index a937292..ee05539 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
 import com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
index e7045c2..b506d8d 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
@@ -3,6 +3,7 @@ package com.opensymphony.xwork2.validator;
 import com.opensymphony.xwork2.*;
 import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
index 572b316..bf260c9 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
@@ -20,6 +20,7 @@ import com.mockobjects.dynamic.Mock;
 import com.opensymphony.xwork2.*;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.validator.validators.ExpressionValidator;
 import org.easymock.EasyMock;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
index 9c0281b..0ec7ac9 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
index dfed43e..78b8f9a 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
index 22909df..1861271 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
index dc1fad8..19094c2 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
@@ -18,6 +18,7 @@ package com.opensymphony.xwork2.validator;
 import com.opensymphony.xwork2.*;
 import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
index 3991288..009dbb7 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
@@ -2,7 +2,7 @@ package com.opensymphony.xwork2.validator;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
index a049061..7571aa7 100644
--- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
+++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
@@ -21,7 +21,7 @@
 package org.apache.struts.beanvalidation;
 
 import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
----------------------------------------------------------------------
diff --git a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
index 3375cf6..0dcdb6b 100644
--- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
+++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
@@ -39,7 +39,7 @@ import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionProxy;
 import com.opensymphony.xwork2.ActionProxyFactory;
 import com.opensymphony.xwork2.DefaultActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.ValidationAwareSupport;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import org.apache.logging.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
index d94adc1..7dd169d 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
@@ -24,7 +24,7 @@ package org.apache.struts2.json;
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
----------------------------------------------------------------------
diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
index 026a4f0..20ec81c 100644
--- a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
+++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
@@ -23,6 +23,7 @@ package org.apache.struts2;
 
 import com.opensymphony.xwork2.*;
 import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.interceptor.annotations.After;
 import com.opensymphony.xwork2.interceptor.annotations.Before;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
----------------------------------------------------------------------
diff --git a/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
index 5ab288a..4a5bc5c 100644
--- a/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
+++ b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
@@ -21,14 +21,13 @@
 package org.apache.struts2.oval.interceptor;
 
 import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
 import net.sf.oval.configuration.Configurer;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 public class OValValidationInterceptorTest extends XWorkTestCase {

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
----------------------------------------------------------------------
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
index 06f52a8..65e6084 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
@@ -26,6 +26,7 @@ import com.opensymphony.xwork2.config.ConfigurationException;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
 import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.logging.log4j.LogManager;

http://git-wip-us.apache.org/repos/asf/struts/blob/e2347f16/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
index 073d312..4cadd82 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
@@ -24,7 +24,7 @@ package org.apache.struts2.rest;
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.ValidationAware;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import org.apache.logging.log4j.LogManager;


Mime
View raw message