You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/20 21:56:35 UTC
svn commit: r965978 - in /myfaces/extensions/validator/branches/branch_for_jsf_2_0: core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ validation-modules...

Author: gpetracek
Date: Tue Jul 20 19:56:34 2010
New Revision: 965978

URL: http://svn.apache.org/viewvc?rev=965978&view=rev
Log:
EXTVAL-107 moved ValidationExceptionInterceptor

Added:
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java
      - copied, changed from r938185, myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java
Removed:
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java
Modified:
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java

Copied: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java (from r938185, myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java?p2=myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java&p1=myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java&r1=938185&r2=965978&rev=965978&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java Tue Jul 20 19:56:34 2010
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.validator.beanval.interceptor;
+package org.apache.myfaces.extensions.validator.core.interceptor;
 
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import org.apache.myfaces.extensions.validator.core.interceptor.ValidationExceptionInterceptor;
 import org.apache.myfaces.extensions.validator.core.InvocationOrder;
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
@@ -32,14 +31,12 @@ import javax.faces.validator.ValidatorEx
 import javax.faces.context.FacesContext;
 
 /**
- * extracts and adds the extval bv meta-data (e.g. validation groups) to the ExtValBeanValidationContext
- *
  * @author Gerhard Petracek
  * @since x.x.3
  */
 @InvocationOrder(200)
 @UsageInformation(UsageCategory.INTERNAL)
-public class BeanValidationExceptionInterceptor implements ValidationExceptionInterceptor
+public class ViolationExceptionInterceptor implements ValidationExceptionInterceptor
 {
 
     public boolean afterThrowing(UIComponent uiComponent,
@@ -63,4 +60,4 @@ public class BeanValidationExceptionInte
                 uiComponent,
                 validatorException.getFacesMessage().getSeverity());
     }
-}
\ No newline at end of file
+}

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java?rev=965978&r1=965977&r2=965978&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java Tue Jul 20 19:56:34 2010
@@ -24,6 +24,7 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.interceptor.HtmlCoreComponentsValidationExceptionInterceptor;
 import org.apache.myfaces.extensions.validator.core.interceptor.ViolationSeverityValidationExceptionInterceptor;
 import org.apache.myfaces.extensions.validator.core.interceptor.FacesMessagePropertyValidationInterceptor;
+import org.apache.myfaces.extensions.validator.core.interceptor.ViolationExceptionInterceptor;
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.core.CustomInformation;
 import org.apache.myfaces.extensions.validator.core.ExtValCoreConfiguration;
@@ -184,6 +185,9 @@ public class ExtValStartupListener exten
                 new HtmlCoreComponentsValidationExceptionInterceptor());
         ExtValContext.getContext().addValidationExceptionInterceptor(
                 new ViolationSeverityValidationExceptionInterceptor());
+
+        ExtValContext.getContext().addValidationExceptionInterceptor(
+                new ViolationExceptionInterceptor());
     }
 
     private void initViolationSeverityInterpreter()

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java?rev=965978&r1=965977&r2=965978&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java Tue Jul 20 19:56:34 2010
@@ -26,7 +26,6 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.beanval.payload.DisableClientSideValidation;
 import org.apache.myfaces.extensions.validator.beanval.util.BeanValidationUtils;
 import org.apache.myfaces.extensions.validator.beanval.interceptor.ExtValBeanValidationMetaDataExtractionInterceptor;
-import org.apache.myfaces.extensions.validator.beanval.interceptor.BeanValidationExceptionInterceptor;
 import org.apache.myfaces.extensions.validator.beanval.validation.ModelValidationPhaseListener;
 import org.apache.myfaces.extensions.validator.beanval.metadata.transformer.mapper.SizeNameMapper;
 import org.apache.myfaces.extensions.validator.beanval.metadata.transformer.mapper.NotNullNameMapper;
@@ -67,7 +66,6 @@ public class BeanValidationStartupListen
         registerComponentInitializers();
         registerMetaDataExtractionInterceptors();
         registerPhaseListeners();
-        registerExceptionInterceptor();
         registerViolationSeverityPayload();
         registerDisableClientSideValidationPayload();
     }
@@ -141,11 +139,6 @@ public class BeanValidationStartupListen
         JsfUtils.registerPhaseListener(new ModelValidationPhaseListener());
     }
 
-    protected void registerExceptionInterceptor()
-    {
-        ExtValContext.getContext().addValidationExceptionInterceptor(new BeanValidationExceptionInterceptor());
-    }
-
     protected void registerViolationSeverityPayload()
     {
         ExtValContext extValContext = ExtValContext.getContext();