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:54:54 UTC
svn commit: r965975 - in /myfaces/extensions/validator/trunk:
core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/
core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/
test-modules/core-tests/src/test/java/or...
Author: gpetracek
Date: Tue Jul 20 19:54:54 2010
New Revision: 965975
URL: http://svn.apache.org/viewvc?rev=965975&view=rev
Log:
EXTVAL-107 moved ValidationExceptionInterceptor
Added:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java
- copied, changed from r946386, myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java
Removed:
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java
Modified:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationValidationExceptionInterceptorTestCase.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java (from r946386, myfaces/extensions/validator/trunk/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/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java&p1=myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java&r1=946386&r2=965975&rev=965975&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationExceptionInterceptor.java Tue Jul 20 19:54:54 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,
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java?rev=965975&r1=965974&r2=965975&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java Tue Jul 20 19:54:54 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/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationValidationExceptionInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationValidationExceptionInterceptorTestCase.java?rev=965975&r1=965974&r2=965975&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationValidationExceptionInterceptorTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/core-tests/src/test/java/org/apache/myfaces/extensions/validator/test/core/interceptor/RegistrationValidationExceptionInterceptorTestCase.java Tue Jul 20 19:54:54 2010
@@ -25,6 +25,7 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.interceptor.ValidationExceptionInterceptor;
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.ViolationExceptionInterceptor;
import org.apache.myfaces.extensions.validator.test.core.AbstractExValCoreTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -61,7 +62,7 @@ public class RegistrationValidationExcep
List<ValidationExceptionInterceptor> result = ExtValContext.getContext().getValidationExceptionInterceptors();
- int resultLength = 7;
+ int resultLength = 8;
Assert.assertEquals(resultLength, result.size());
for(int i = 0; i < resultLength; i++)
@@ -84,9 +85,12 @@ public class RegistrationValidationExcep
Assert.assertEquals(HtmlCoreComponentsValidationExceptionInterceptor.class, result.get(i).getClass());
break;
case 5:
- Assert.assertEquals(TestValidationExceptionInterceptor1000.class, result.get(i).getClass());
+ Assert.assertEquals(ViolationExceptionInterceptor.class, result.get(i).getClass());
break;
case 6:
+ Assert.assertEquals(TestValidationExceptionInterceptor1000.class, result.get(i).getClass());
+ break;
+ case 7:
Assert.assertEquals(TestValidationExceptionInterceptor.class, result.get(i).getClass());
break;
}
@@ -136,4 +140,4 @@ public class RegistrationValidationExcep
return true;
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/trunk/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/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java?rev=965975&r1=965974&r2=965975&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java Tue Jul 20 19:54:54 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();
}
@@ -140,11 +138,6 @@ public class BeanValidationStartupListen
JsfUtils.registerPhaseListener(new ModelValidationPhaseListener());
}
- protected void registerExceptionInterceptor()
- {
- ExtValContext.getContext().addValidationExceptionInterceptor(new BeanValidationExceptionInterceptor());
- }
-
protected void registerViolationSeverityPayload()
{
ExtValContext extValContext = ExtValContext.getContext();