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 2009/10/21 09:13:12 UTC

svn commit: r827906 - in /myfaces/extensions/validator/branches/trunk_severity_test: core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ examples/feature-set_02/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/bea...

Author: gpetracek
Date: Wed Oct 21 07:13:11 2009
New Revision: 827906

URL: http://svn.apache.org/viewvc?rev=827906&view=rev
Log:
[intermediate result] advanced severity approach - step 1

Added:
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/payload/ViolationSeverity.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationResult.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/FacesMessageHolder.java
Modified:
    myfaces/extensions/validator/branches/trunk_severity_test/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java
    myfaces/extensions/validator/branches/trunk_severity_test/examples/feature-set_02/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java
    myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java

Modified: myfaces/extensions/validator/branches/trunk_severity_test/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java?rev=827906&r1=827905&r2=827906&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/branches/trunk_severity_test/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java Wed Oct 21 07:13:11 2009
@@ -57,6 +57,7 @@
  */
 @InvocationOrder(200)
 @UsageInformation(UsageCategory.INTERNAL)
+@ToDo(value = Priority.HIGH, description = "check compatibility with bv-integration")
 public class HtmlCoreComponentsValidationExceptionInterceptor implements ValidationExceptionInterceptor
 {
     protected final Log logger = LogFactory.getLog(getClass());

Modified: myfaces/extensions/validator/branches/trunk_severity_test/examples/feature-set_02/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/examples/feature-set_02/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java?rev=827906&r1=827905&r2=827906&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/examples/feature-set_02/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java (original)
+++ myfaces/extensions/validator/branches/trunk_severity_test/examples/feature-set_02/src/main/java/org/apache/myfaces/extensions/validator/demo/gui/beans/RegistrationPage.java Wed Oct 21 07:13:11 2009
@@ -20,6 +20,7 @@
 
 import org.apache.myfaces.extensions.validator.demo.domain.Person;
 import org.apache.myfaces.extensions.validator.beanval.payload.DisableClientSideValidation;
+import org.apache.myfaces.extensions.validator.beanval.payload.ViolationSeverity;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -29,7 +30,7 @@
     @NotNull(payload = DisableClientSideValidation.class)
     private String password;
 
-    @NotNull(payload = DisableClientSideValidation.class)
+    @NotNull(payload = ViolationSeverity.Warn.class)
     private String passwordRepeated;
 
     private Person person;

Modified: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java?rev=827906&r1=827905&r2=827906&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptor.java Wed Oct 21 07:13:11 2009
@@ -130,8 +130,8 @@
                                           Object convertedObject,
                                           PropertyInformation propertyInformation)
     {
-        this.bviUtils.validate(facesContext, uiComponent, convertedObject,
-                propertyInformation, supportMultipleViolationsPerField());
+        /*not used yet supportMultipleViolationsPerField()*/
+        this.bviUtils.validate(facesContext, uiComponent, convertedObject, propertyInformation);
     }
 
     protected boolean supportMultipleViolationsPerField()

Modified: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java?rev=827906&r1=827905&r2=827906&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java (original)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationInterceptorInternals.java Wed Oct 21 07:13:11 2009
@@ -20,6 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.myfaces.extensions.validator.beanval.validation.strategy.BeanValidationVirtualValidationStrategy;
+import org.apache.myfaces.extensions.validator.beanval.util.BeanValidationUtils;
 import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
 import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
 import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
@@ -30,20 +31,14 @@
 import org.apache.myfaces.extensions.validator.internal.ToDo;
 import org.apache.myfaces.extensions.validator.internal.Priority;
 import org.apache.myfaces.extensions.validator.util.ExtValUtils;
-import org.apache.myfaces.extensions.validator.util.JsfUtils;
 
-import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.validator.ValidatorException;
 import javax.validation.ConstraintViolation;
 import javax.validation.groups.Default;
 import javax.validation.metadata.BeanDescriptor;
 import javax.validation.metadata.ConstraintDescriptor;
 import javax.validation.metadata.ElementDescriptor;
-import java.util.MissingResourceException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Set;
@@ -56,9 +51,6 @@
 class BeanValidationInterceptorInternals
 {
     private Log logger;
-    private final String defaultLabelMessageTemplate = "{1}: {0}";
-    private String labelMessageTemplate = defaultLabelMessageTemplate;
-    private final String JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE = "javax.faces.validator.BeanValidator.MESSAGE";
 
     BeanValidationInterceptorInternals(Log logger)
     {
@@ -184,7 +176,7 @@
     void validate(FacesContext facesContext,
                   UIComponent uiComponent,
                   Object convertedObject,
-                  PropertyInformation propertyInformation, boolean supportMultipleViolationsPerField)
+                  PropertyInformation propertyInformation)
     {
         Class baseBeanClass = getBaseClassType(propertyInformation);
         String propertyName = getPropertyToValidate(propertyInformation);
@@ -202,108 +194,13 @@
                 .getValidator()
                 .validateValue(baseBeanClass, propertyName, convertedObject, groups);
 
-        processConstraintViolations(
-                facesContext, uiComponent, convertedObject, violations, supportMultipleViolationsPerField);
-    }
-
-    private void processConstraintViolations(FacesContext facesContext,
-                                             UIComponent uiComponent,
-                                             Object convertedObject,
-                                             Set<ConstraintViolation> violations,
-                                             boolean supportMultipleViolationsPerField)
-    {
-        List<String> violationMessages = new ArrayList<String>();
-        for (ConstraintViolation violation : violations)
-        {
-            processConstraintViolation(uiComponent, convertedObject, violation, violationMessages);
-
-            if (!supportMultipleViolationsPerField)
-            {
-                break;
-            }
-        }
-
-        if (!violationMessages.isEmpty())
+        if(violations != null && !violations.isEmpty())
         {
-            throwException(facesContext, uiComponent, violationMessages, supportMultipleViolationsPerField);
+            BeanValidationUtils
+                    .processConstraintViolations(facesContext, uiComponent, convertedObject, violations, true);
         }
     }
 
-    private void processConstraintViolation(UIComponent uiComponent,
-                                            Object convertedObject,
-                                            ConstraintViolation violation,
-                                            List<String> violationMessages)
-    {
-        String violationMessage = violation.getMessage();
-
-        String labeledMessage = createLabeledMessage(violationMessage);
-
-        ValidatorException validatorException = createValidatorException(labeledMessage);
-
-        executeAfterThrowingInterceptors(uiComponent, convertedObject, validatorException);
-
-        if (isMessageTextUnchanged(validatorException, labeledMessage))
-        {
-            violationMessages.add(violationMessage);
-        }
-        else
-        {
-            violationMessages.add(validatorException.getFacesMessage().getSummary());
-        }
-    }
-
-    private String createLabeledMessage(String violationMessage)
-    {
-        if(labelMessageTemplate == null)
-        {
-            return this.defaultLabelMessageTemplate.replace("{0}", violationMessage);
-        }
-
-        this.labelMessageTemplate = loadStandardMessageTemplate();
-
-        if(labelMessageTemplate == null)
-        {
-            return createLabeledMessage(violationMessage);
-        }
-        return labelMessageTemplate.replace("{0}", violationMessage);
-    }
-
-    private String loadStandardMessageTemplate()
-    {
-        try
-        {
-            return JsfUtils.getDefaultFacesMessageBundle().getString(JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE);
-        }
-        catch (MissingResourceException e)
-        {
-            return null;
-        }
-    }
-
-    private void executeAfterThrowingInterceptors(UIComponent uiComponent,
-                                                  Object convertedObject,
-                                                  ValidatorException validatorException)
-    {
-        ExtValUtils.executeAfterThrowingInterceptors(
-                uiComponent,
-                null,
-                convertedObject,
-                validatorException,
-                null);
-    }
-
-    private boolean isMessageTextUnchanged(ValidatorException validatorException, String violationMessage)
-    {
-        return violationMessage.equals(validatorException.getFacesMessage().getSummary()) ||
-                violationMessage.equals(validatorException.getFacesMessage().getDetail());
-    }
-
-    private ValidatorException createValidatorException(String violationMessage)
-    {
-        return new ValidatorException(
-                ExtValUtils.createFacesMessage(FacesMessage.SEVERITY_ERROR, violationMessage, violationMessage));
-    }
-
     private Class getBaseClassType(PropertyInformation propertyInformation)
     {
         return ExtValUtils.getPropertyDetails(propertyInformation).getBaseObject().getClass();
@@ -314,31 +211,6 @@
         return ExtValUtils.getPropertyDetails(propertyInformation).getProperty();
     }
 
-    //override this method in the jsf 2.0 version
-    private void throwException(FacesContext facesContext, UIComponent uiComponent,
-                                List<String> violationMessages, boolean supportMultipleViolationsPerField)
-    {
-        if (supportMultipleViolationsPerField)
-        {
-            boolean firstMessage = false;
-            for (String message : violationMessages)
-            {
-                if (!firstMessage)
-                {
-                    firstMessage = true;
-                }
-                else
-                {
-                    facesContext.addMessage(uiComponent.getClientId(facesContext),
-                            ExtValUtils.createFacesMessage(FacesMessage.SEVERITY_ERROR, message, message));
-                }
-            }
-        }
-
-        throw new ValidatorException(ExtValUtils.createFacesMessage(
-                FacesMessage.SEVERITY_ERROR, violationMessages.get(0), violationMessages.get(0)));
-    }
-
     private Class[] resolveGroups(FacesContext facesContext, UIComponent uiComponent)
     {
         return ExtValBeanValidationContext.getCurrentInstance().getGroups(
@@ -353,4 +225,4 @@
 
         return beanDescriptor.getConstraintsForProperty(property);
     }
-}
\ No newline at end of file
+}

Modified: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java?rev=827906&r1=827905&r2=827906&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java Wed Oct 21 07:13:11 2009
@@ -23,6 +23,7 @@
 import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
 import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
 import org.apache.myfaces.extensions.validator.beanval.payload.DisableClientSideValidation;
+import org.apache.myfaces.extensions.validator.beanval.payload.ViolationSeverity;
 
 import javax.validation.metadata.ConstraintDescriptor;
 import javax.validation.Payload;
@@ -41,14 +42,14 @@
     {
         ConstraintDescriptor<? extends T> constraintDescriptor = metaDataEntry.getValue(ConstraintDescriptor.class);
 
-        if(isClientSideValidationEnabled(constraintDescriptor))
+        if(isClientSideValidationEnabled(constraintDescriptor) && isBlockingConstraint(constraintDescriptor))
         {
             return convertConstraintDescriptor((ConstraintDescriptor<T>)constraintDescriptor);
         }
         return new HashMap<String, Object>();
     }
 
-    private boolean isClientSideValidationEnabled(ConstraintDescriptor<? extends T> constraintDescriptor)
+    protected boolean isClientSideValidationEnabled(ConstraintDescriptor<? extends T> constraintDescriptor)
     {
         for(Class<? extends Payload> payload : constraintDescriptor.getPayload())
         {
@@ -60,5 +61,22 @@
         return true;
     }
 
+    protected boolean isBlockingConstraint(ConstraintDescriptor<?> constraintDescriptor)
+    {
+        for (Class<? extends Payload> payload : constraintDescriptor.getPayload())
+        {
+            if (ViolationSeverity.Warn.class.isAssignableFrom(payload) ||
+                    ViolationSeverity.Info.class.isAssignableFrom(payload))
+            {
+                return false;
+            }
+            else if (ViolationSeverity.Error.class.isAssignableFrom(payload) ||
+                    ViolationSeverity.Fatal.class.isAssignableFrom(payload))
+            {
+                return true;
+            }
+        }
+        return true;
+    }
     protected abstract Map<String, Object> convertConstraintDescriptor(ConstraintDescriptor<T> constraintDescriptor);
 }

Added: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/payload/ViolationSeverity.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/payload/ViolationSeverity.java?rev=827906&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/payload/ViolationSeverity.java (added)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/payload/ViolationSeverity.java Wed Oct 21 07:13:11 2009
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.myfaces.extensions.validator.beanval.payload;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+import javax.validation.Payload;
+import javax.faces.application.FacesMessage;
+
+/**
+ * @author Gerhard Petracek
+ * @since x.x.3
+ */
+@UsageInformation(UsageCategory.API)
+public interface ViolationSeverity
+{
+    interface Info extends Payload
+    {
+        FacesMessage.Severity VALUE = FacesMessage.SEVERITY_INFO;
+    }
+
+    interface Warn extends Payload
+    {
+        FacesMessage.Severity VALUE = FacesMessage.SEVERITY_WARN;
+    }
+
+    interface Error extends Payload
+    {
+        FacesMessage.Severity VALUE = FacesMessage.SEVERITY_ERROR;
+    }
+
+    interface Fatal extends Payload
+    {
+        FacesMessage.Severity VALUE = FacesMessage.SEVERITY_FATAL;
+    }
+}

Modified: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java?rev=827906&r1=827905&r2=827906&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java (original)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java Wed Oct 21 07:13:11 2009
@@ -21,9 +21,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.extensions.validator.beanval.ExtValBeanValidationContext;
+import org.apache.myfaces.extensions.validator.beanval.validation.message.FacesMessageHolder;
 import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
 import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
 import org.apache.myfaces.extensions.validator.beanval.annotation.extractor.DefaultGroupControllerScanningExtractor;
+import org.apache.myfaces.extensions.validator.beanval.payload.ViolationSeverity;
 import org.apache.myfaces.extensions.validator.beanval.storage.ModelValidationEntry;
 import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
 import org.apache.myfaces.extensions.validator.core.el.ELHelper;
@@ -38,12 +40,17 @@
 import org.apache.myfaces.extensions.validator.util.ExtValUtils;
 import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
 
+import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+import javax.validation.ConstraintViolation;
+import javax.validation.Payload;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author Gerhard Petracek
@@ -53,8 +60,9 @@
 public class BeanValidationUtils
 {
     private static final Log LOG = LogFactory.getLog(BeanValidationUtils.class);
+    private static LabeledMessageInternals labeledMessageInternals = new LabeledMessageInternals();
 
-    @ToDo(value = Priority.LOW, description = "use it also in ModelValidationPhaseListener" +
+    @ToDo(value = Priority.HIGH, description = "use it - also in ModelValidationPhaseListener" +
             "attention: only add one message per client id")
     public static boolean supportMultipleViolationsPerField()
     {
@@ -461,4 +469,178 @@
         }
         return ReflectionUtils.tryToInvokeMethod(base, targetMethod);
     }
+
+    public static void processConstraintViolations(FacesContext facesContext,
+                                                   UIComponent uiComponent,
+                                                   Object convertedObject,
+                                                   Set<ConstraintViolation> violations,
+                                                   boolean firstErrorCausesAnException)
+    {
+        List<FacesMessageHolder> facesMessageHolderList = new ArrayList<FacesMessageHolder>();
+        FacesMessageHolder facesMessageHolder;
+
+        for (ConstraintViolation violation : violations)
+        {
+            facesMessageHolder = new FacesMessageHolder(
+                    createFacesMessageForConstraintViolation(uiComponent, convertedObject, violation));
+            facesMessageHolder.setClientId(uiComponent.getClientId(facesContext));
+
+            facesMessageHolderList.add(facesMessageHolder);
+        }
+
+        processViolationMessages(facesContext, facesMessageHolderList, firstErrorCausesAnException);
+    }
+
+    @ToDo(value = Priority.HIGH, description = "support severity.warn and .info")
+    public static FacesMessage createFacesMessageForConstraintViolation(UIComponent uiComponent,
+                                                                        Object convertedObject,
+                                                                        ConstraintViolation violation)
+    {
+        String violationMessage = violation.getMessage();
+
+        String labeledMessage = createLabeledMessage(violationMessage);
+
+        FacesMessage.Severity severity = calcSeverity(violation);
+
+        ValidatorException validatorException = createValidatorException(labeledMessage, severity);
+
+        executeAfterThrowingInterceptors(uiComponent, convertedObject, validatorException);
+
+        if (isMessageTextUnchanged(validatorException, labeledMessage))
+        {
+            return ExtValUtils.createFacesMessage(severity, violationMessage, violationMessage);
+        }
+        else
+        {
+            String newMessage = validatorException.getFacesMessage().getSummary();
+            return ExtValUtils.createFacesMessage(severity, newMessage, newMessage);
+        }
+    }
+
+    private static String createLabeledMessage(String violationMessage)
+    {
+        return labeledMessageInternals.createLabeledMessage(violationMessage);
+    }
+
+    private static FacesMessage.Severity calcSeverity(ConstraintViolation<?> violation)
+    {
+        for (Class<? extends Payload> payload : violation.getConstraintDescriptor().getPayload())
+        {
+            if (ViolationSeverity.Warn.class.isAssignableFrom(payload))
+            {
+                return FacesMessage.SEVERITY_WARN;
+            }
+            else if (ViolationSeverity.Info.class.isAssignableFrom(payload))
+            {
+                return FacesMessage.SEVERITY_INFO;
+            }
+            else if (ViolationSeverity.Fatal.class.isAssignableFrom(payload))
+            {
+                return FacesMessage.SEVERITY_FATAL;
+            }
+        }
+        return FacesMessage.SEVERITY_ERROR;
+    }
+
+    private static void executeAfterThrowingInterceptors(UIComponent uiComponent,
+                                                         Object convertedObject,
+                                                         ValidatorException validatorException)
+    {
+        ExtValUtils.executeAfterThrowingInterceptors(
+                uiComponent,
+                null,
+                convertedObject,
+                validatorException,
+                null);
+    }
+
+    private static boolean isMessageTextUnchanged(ValidatorException validatorException, String violationMessage)
+    {
+        return violationMessage.equals(validatorException.getFacesMessage().getSummary()) ||
+                violationMessage.equals(validatorException.getFacesMessage().getDetail());
+    }
+
+    private static ValidatorException createValidatorException(String violationMessage, FacesMessage.Severity severity)
+    {
+        return new ValidatorException(
+                ExtValUtils.createFacesMessage(severity, violationMessage, violationMessage));
+    }
+
+    public static void processViolationMessages(FacesContext facesContext,
+                                                List<FacesMessageHolder> violationMessageHolderList,
+                                                boolean firstErrorCausesAnException)
+    {
+        List<FacesMessageHolder> facesMessageListWithLowSeverity =
+                getFacesMessageListWithLowSeverity(violationMessageHolderList);
+        List<FacesMessageHolder> facesMessageListWithHighSeverity =
+                getFacesMessageListWithHighSeverity(violationMessageHolderList);
+
+        addMessagesWithHighSeverity(facesContext, facesMessageListWithHighSeverity, firstErrorCausesAnException);
+        addMessagesWithLowSeverity(facesContext, facesMessageListWithLowSeverity);
+
+        if (!facesMessageListWithHighSeverity.isEmpty() && firstErrorCausesAnException)
+        {
+            throw new ValidatorException(facesMessageListWithHighSeverity.iterator().next().getFacesMessage());
+        }
+    }
+
+    private static List<FacesMessageHolder> getFacesMessageListWithLowSeverity(
+            List<FacesMessageHolder> violationMessages)
+    {
+        List<FacesMessageHolder> result = new ArrayList<FacesMessageHolder>();
+
+        for (FacesMessageHolder facesMessageHolder : violationMessages)
+        {
+            if (FacesMessage.SEVERITY_WARN.equals(facesMessageHolder.getFacesMessage().getSeverity()) ||
+                    FacesMessage.SEVERITY_INFO.equals(facesMessageHolder.getFacesMessage().getSeverity()))
+            {
+                result.add(facesMessageHolder);
+            }
+        }
+        return result;
+    }
+
+    private static List<FacesMessageHolder> getFacesMessageListWithHighSeverity(
+            List<FacesMessageHolder> violationMessageHolderList)
+    {
+        List<FacesMessageHolder> result = new ArrayList<FacesMessageHolder>();
+
+        for (FacesMessageHolder facesMessageHolder : violationMessageHolderList)
+        {
+            if (FacesMessage.SEVERITY_ERROR.equals(facesMessageHolder.getFacesMessage().getSeverity()) ||
+                    FacesMessage.SEVERITY_FATAL.equals(facesMessageHolder.getFacesMessage().getSeverity()))
+            {
+                result.add(facesMessageHolder);
+            }
+        }
+        return result;
+    }
+
+    private static void addMessagesWithHighSeverity(FacesContext facesContext,
+                                                    List<FacesMessageHolder> facesMessageHolderListWithHighSeverity,
+                                                    boolean firstErrorCausesAnException)
+    {
+        boolean firstMessage = true;
+        for (FacesMessageHolder facesMessageHolder : facesMessageHolderListWithHighSeverity)
+        {
+            if (firstMessage && firstErrorCausesAnException)
+            {
+                //the first error will be thrown as exception
+                firstMessage = false;
+            }
+            else
+            {
+                facesContext.addMessage(facesMessageHolder.getClientId(), facesMessageHolder.getFacesMessage());
+            }
+        }
+    }
+
+    private static void addMessagesWithLowSeverity(
+            FacesContext facesContext, List<FacesMessageHolder> facesMessageHolderListWithLowSeverity)
+    {
+        for (FacesMessageHolder facesMessageHolder : facesMessageHolderListWithLowSeverity)
+        {
+            facesContext.addMessage(facesMessageHolder.getClientId(), facesMessageHolder.getFacesMessage());
+        }
+    }
 }

Added: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java?rev=827906&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java (added)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java Wed Oct 21 07:13:11 2009
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.myfaces.extensions.validator.beanval.util;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.util.JsfUtils;
+
+import java.util.MissingResourceException;
+
+/**
+ * @author Gerhard Petracek
+ * @since x.x.3
+ */
+@UsageInformation(UsageCategory.API)
+class LabeledMessageInternals
+{
+    //there is no concurrency issue here - it always leads to the same result
+    private final String defaultLabelMessageTemplate = "{1}: {0}";
+    private String labelMessageTemplate = defaultLabelMessageTemplate;
+    private static final String JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE =
+            "javax.faces.validator.BeanValidator.MESSAGE";
+
+    String createLabeledMessage(String violationMessage)
+    {
+        if(labelMessageTemplate == null)
+        {
+            return this.defaultLabelMessageTemplate.replace("{0}", violationMessage);
+        }
+
+        this.labelMessageTemplate = loadStandardMessageTemplate();
+
+        if(labelMessageTemplate == null)
+        {
+            return createLabeledMessage(violationMessage);
+        }
+        return labelMessageTemplate.replace("{0}", violationMessage);
+    }
+
+    private String loadStandardMessageTemplate()
+    {
+        try
+        {
+            return JsfUtils.getDefaultFacesMessageBundle().getString(JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE);
+        }
+        catch (MissingResourceException e)
+        {
+            return null;
+        }
+    }
+}

Modified: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java?rev=827906&r1=827905&r2=827906&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java Wed Oct 21 07:13:11 2009
@@ -21,22 +21,22 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.extensions.validator.beanval.ExtValBeanValidationContext;
+import org.apache.myfaces.extensions.validator.beanval.validation.message.FacesMessageHolder;
 import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
 import org.apache.myfaces.extensions.validator.beanval.storage.ModelValidationEntry;
-import org.apache.myfaces.extensions.validator.internal.Priority;
-import org.apache.myfaces.extensions.validator.internal.ToDo;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.beanval.util.BeanValidationUtils;
 
-import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
-import javax.faces.validator.ValidatorException;
 import javax.validation.ConstraintViolation;
 import javax.validation.MessageInterpolator;
+import javax.validation.Path;
 import javax.validation.metadata.ConstraintDescriptor;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -61,11 +61,15 @@
 
         List<Object> processedValidationTargets = new ArrayList<Object>();
 
+        Map<String, ModelValidationResult> results = new HashMap<String, ModelValidationResult>();
+
         for (ModelValidationEntry modelValidationEntry : getModelValidationEntriesToValidate())
         {
-            processModelValidation(modelValidationEntry, processedValidationTargets);
+            processModelValidation(modelValidationEntry, processedValidationTargets, results);
         }
 
+        processViolations(FacesContext.getCurrentInstance(), results);
+
         if (logger.isTraceEnabled())
         {
             logger.trace("jsr303 validation finished");
@@ -77,8 +81,9 @@
         return ExtValBeanValidationContext.getCurrentInstance().getModelValidationEntriesToValidate();
     }
 
-    private void processModelValidation(
-            ModelValidationEntry modelValidationEntry, List<Object> processedValidationTargets)
+    private void processModelValidation(ModelValidationEntry modelValidationEntry,
+                                        List<Object> processedValidationTargets,
+                                        Map<String, ModelValidationResult> results)
     {
         for (Object validationTarget : modelValidationEntry.getValidationTargets())
         {
@@ -93,11 +98,14 @@
                 processedValidationTargets.add(validationTarget);
             }
 
-            validateTarget(modelValidationEntry, validationTarget, modelValidationEntry.getGroups());
+            validateTarget(modelValidationEntry, validationTarget, modelValidationEntry.getGroups(), results);
         }
     }
 
-    private void validateTarget(ModelValidationEntry modelValidationEntry, Object validationTarget, Class[] groups)
+    private void validateTarget(ModelValidationEntry modelValidationEntry,
+                                Object validationTarget,
+                                Class[] groups,
+                                Map<String, ModelValidationResult> results)
     {
         Set<ConstraintViolation<Object>> violations = ExtValBeanValidationContext.getCurrentInstance()
                 .getValidatorFactory().usingContext()
@@ -105,71 +113,120 @@
                 .getValidator()
                 .validate(validationTarget, groups);
 
-        if (violations != null && violations.size() > 0)
+        if (violations != null && !violations.isEmpty())
         {
-            FacesContext.getCurrentInstance().renderResponse();
+            FacesContext facesContext = FacesContext.getCurrentInstance();
+            facesContext.renderResponse();
 
             //jsf 2.0 is able to display multiple messages per component - so process all violations
             //jsf < 2.0 will just use the first one (it's only a little overhead)
             Iterator violationsIterator = violations.iterator();
             ConstraintViolation constraintViolation;
+            ModelValidationResult result;
             while (violationsIterator.hasNext())
             {
+                if (!results.containsKey(modelValidationEntry.getComponent().getClientId(facesContext)))
+                {
+                    result = new ModelValidationResult();
+                    results.put(modelValidationEntry.getComponent().getClientId(facesContext), result);
+                }
+
+                result = results.get(modelValidationEntry.getComponent().getClientId(facesContext));
+
                 constraintViolation = (ConstraintViolation) violationsIterator.next();
                 if (modelValidationEntry.getMetaData().displayInline())
                 {
-                    processConstraintViolation(constraintViolation, modelValidationEntry, validationTarget, true);
+                    result.addFacesMessageHolder(createFacesMessageHolderForConstraintViolation(
+                            constraintViolation, modelValidationEntry, validationTarget, true));
                 }
                 else
                 {
-                    processConstraintViolation(constraintViolation, modelValidationEntry, validationTarget, false);
+                    result.addFacesMessageHolder(createFacesMessageHolderForConstraintViolation(
+                            constraintViolation, modelValidationEntry, validationTarget, false));
                 }
             }
         }
     }
 
-    private void processConstraintViolation(final ConstraintViolation violation,
-                                            ModelValidationEntry modelValidationEntry,
-                                            final Object validationTarget,
-                                            boolean displayAtComponent)
+    private FacesMessageHolder createFacesMessageHolderForConstraintViolation(final ConstraintViolation violation,
+                                                                        ModelValidationEntry modelValidationEntry,
+                                                                        final Object validationTarget,
+                                                                        boolean displayAtComponent)
     {
-        String violationMessage = violation.getMessage();
+        final String newViolationMessage = tryToChangeViolationMessage(
+                modelValidationEntry, validationTarget, violation);
+
+        ConstraintViolation newConstraintViolation = new ConstraintViolation()
+        {
+            private ConstraintViolation wrapped = violation;
+
+            public String getMessage()
+            {
+                return newViolationMessage;
+            }
+
+            public String getMessageTemplate()
+            {
+                return wrapped.getMessageTemplate();
+            }
+
+            public Object getRootBean()
+            {
+                return wrapped.getRootBean();
+            }
+
+            public Class getRootBeanClass()
+            {
+                return wrapped.getRootBeanClass();
+            }
+
+            public Object getLeafBean()
+            {
+                return wrapped.getLeafBean();
+            }
+
+            public Path getPropertyPath()
+            {
+                return wrapped.getPropertyPath();
+            }
+
+            public Object getInvalidValue()
+            {
+                return wrapped.getInvalidValue();
+            }
+
+            public ConstraintDescriptor getConstraintDescriptor()
+            {
+                return wrapped.getConstraintDescriptor();
+            }
+        };
 
-        ValidatorException validatorException = createValidatorException(violationMessage);
 
-        FacesContext facesContext = FacesContext.getCurrentInstance();
         UIComponent uiComponent = null;
         String clientId = null;
 
         if (displayAtComponent)
         {
             uiComponent = modelValidationEntry.getComponent();
-            clientId = modelValidationEntry.getComponent().getClientId(facesContext);
+            clientId = uiComponent.getClientId(FacesContext.getCurrentInstance());
         }
 
-        tryToChangeViolationMessage(modelValidationEntry, validationTarget, violation, validatorException);
-        executeValidationExceptionInterceptors(uiComponent, validationTarget, validatorException);
-        addViolationMessage(facesContext, clientId, violationMessage, validatorException);
-    }
-
-    private ValidatorException createValidatorException(String violationMessage)
-    {
-        return new ValidatorException(
-                ExtValUtils.createFacesMessage(FacesMessage.SEVERITY_ERROR, violationMessage, violationMessage));
+        FacesMessageHolder result = new FacesMessageHolder(BeanValidationUtils
+                .createFacesMessageForConstraintViolation(uiComponent, validationTarget, newConstraintViolation));
+        result.setClientId(clientId);
+        return result;
     }
 
-    private void tryToChangeViolationMessage(ModelValidationEntry modelValidationEntry,
-                                    Object validationTarget,
-                                    ConstraintViolation violation,
-                                    ValidatorException validatorException)
+    private String tryToChangeViolationMessage(ModelValidationEntry modelValidationEntry,
+                                               Object validationTarget,
+                                               ConstraintViolation violation)
     {
         if (!isDefaultMessage(modelValidationEntry))
         {
-            String newValidationErrorMessage = interpolateValidationErrorMessage(
-                    modelValidationEntry, validationTarget, violation);
-
-            changeViolationMessage(validatorException.getFacesMessage(), newValidationErrorMessage);
+            return interpolateValidationErrorMessage(
+                    modelValidationEntry.getMetaData().message(), validationTarget, violation);
         }
+        return violation.getMessage();
     }
 
     private boolean isDefaultMessage(ModelValidationEntry modelValidationEntry)
@@ -177,11 +234,12 @@
         return ModelValidation.DEFAULT_MESSAGE.equals(modelValidationEntry.getMetaData().message());
     }
 
-    private String interpolateValidationErrorMessage(ModelValidationEntry modelValidationEntry,
+    private String interpolateValidationErrorMessage(String extValInlineMessage,
                                                      final Object validationTarget, final ConstraintViolation violation)
     {
         return ExtValBeanValidationContext.getCurrentInstance().getMessageInterpolator()
-                .interpolate(modelValidationEntry.getMetaData().message(),
+                .interpolate(
+                        extValInlineMessage,
                         new MessageInterpolator.Context()
                         {
                             public ConstraintDescriptor<?> getConstraintDescriptor()
@@ -197,45 +255,12 @@
                 );
     }
 
-    private void changeViolationMessage(FacesMessage facesMessage, String newMessage)
+    private void processViolations(FacesContext facesContext, Map<String, ModelValidationResult> results)
     {
-        facesMessage.setSummary(newMessage);
-        facesMessage.setDetail(newMessage);
-    }
-
-    @ToDo(value = Priority.HIGH, description = "test compatibility")
-    private void executeValidationExceptionInterceptors(
-            UIComponent uiComponent, Object validationTarget, ValidatorException validatorException)
-    {
-        ExtValUtils.executeAfterThrowingInterceptors(
-                uiComponent,
-                null,
-                validationTarget,
-                validatorException,
-                null);
-    }
-
-    private void addViolationMessage(
-            FacesContext facesContext, String clientId, String violationMessage, ValidatorException validatorException)
-    {
-        if (isMessageTextUnchanged(validatorException, violationMessage))
+        for (ModelValidationResult result : results.values())
         {
-            //use old message text
-            facesContext.addMessage(clientId,
-                    ExtValUtils.createFacesMessage(validatorException.getFacesMessage().getSeverity(),
-                            violationMessage, violationMessage));
+            BeanValidationUtils.processViolationMessages(facesContext, result.getFacesMessageHolderList(), false);
         }
-        else
-        {
-            //use new message text
-            facesContext.addMessage(clientId, validatorException.getFacesMessage());
-        }
-    }
-
-    private boolean isMessageTextUnchanged(ValidatorException validatorException, String violationMessage)
-    {
-        return violationMessage.equals(validatorException.getFacesMessage().getSummary()) ||
-                violationMessage.equals(validatorException.getFacesMessage().getDetail());
     }
 
     public void beforePhase(PhaseEvent phaseEvent)
@@ -247,4 +272,4 @@
     {
         return PhaseId.UPDATE_MODEL_VALUES;
     }
-}
\ No newline at end of file
+}

Added: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationResult.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationResult.java?rev=827906&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationResult.java (added)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationResult.java Wed Oct 21 07:13:11 2009
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.myfaces.extensions.validator.beanval.validation;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.beanval.validation.message.FacesMessageHolder;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Gerhard Petracek
+ * @since x.x.3
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+class ModelValidationResult
+{
+    private List<FacesMessageHolder> facesMessageHolderList = new ArrayList<FacesMessageHolder>();
+
+    public void addFacesMessageHolder(FacesMessageHolder facesMessageHolder)
+    {
+        this.facesMessageHolderList.add(facesMessageHolder);
+    }
+
+    public List<FacesMessageHolder> getFacesMessageHolderList()
+    {
+        return facesMessageHolderList;
+    }
+}

Added: myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/FacesMessageHolder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/FacesMessageHolder.java?rev=827906&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/FacesMessageHolder.java (added)
+++ myfaces/extensions/validator/branches/trunk_severity_test/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/FacesMessageHolder.java Wed Oct 21 07:13:11 2009
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.myfaces.extensions.validator.beanval.validation.message;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+import javax.faces.application.FacesMessage;
+
+/**
+ * @author Gerhard Petracek
+ * @since x.x.3
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public class FacesMessageHolder
+{
+    private FacesMessage wrappedMessage;
+    private String clientId;
+
+    public FacesMessageHolder(FacesMessage wrappedMessage)
+    {
+        this.wrappedMessage = wrappedMessage;
+    }
+
+    public FacesMessage getFacesMessage()
+    {
+        return wrappedMessage;
+    }
+
+    public String getClientId()
+    {
+        return clientId;
+    }
+
+    public void setClientId(String clientId)
+    {
+        this.clientId = clientId;
+    }
+}