[richfaces-svn-commits] JBoss Rich Faces SVN: r22391 - in branches/4.0.X: cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component and 14 other directories.

Author: alexsmirnov Date: 2011-04-07 16:34:09 -0400 (Thu, 07 Apr 2011) New Revision: 22391 Modified: branches/4.0.X/ branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java branches/4.0.X/cdk/maven-javascript-plugin/ branches/4.0.X/core/api/src/main/java/org/richfaces/el/ELContextWrapper.java branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java branches/4.0.X/ui/core/ui/src/test-old/java/org/ajax4jsf/component/QueueScriptedTest.java branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml branches/4.0.X/ui/validator/ branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java Log: merge from trunk: RESOLVED - issue RF-10434: CSV: validatorMessage defined at component not influece the message for client validation. Property changes on: branches/4.0.X ___________________________________________________________________ Added: svn:mergeinfo + /trunk:22383 Modified: branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java =================================================================== --- branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -35,9 +35,11 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.event.ValueChangeListener; +import org.richfaces.cdk.annotations.Alias; import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.Description; import org.richfaces.cdk.annotations.Event; +import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.Facet; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.JsfRenderer; @@ -102,8 +104,19 @@ @Attribute public abstract void setBarValue(List<Object> bar); - @Attribute(signature = @Signature(parameters = String.class, returnType = Boolean.class)) - public abstract MethodExpression getMethodExpressionListener(); + @Attribute( + aliases={@Alias("getAction")}, + defaultValue="", + description=@Description(), + events={@EventName(value="click",defaultEvent=true)}, + hidden=false, + literal=false, + passThrough=false, + readOnly=true, + required=false, + suggestedValue="#{foo}", + signature = @Signature(parameters = String.class, returnType = Boolean.class)) + public abstract MethodExpression getMethodExpression(); @Attribute(signature = @Signature(parameters = {String.class,Integer.class}, returnType = int.class)) public abstract MethodBinding getMethodBindingListener(); Modified: branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java =================================================================== --- branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -26,6 +26,7 @@ import javax.faces.component.UIComponent; import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.Description; import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.Facet; @@ -48,7 +49,7 @@ AUTO } - @Facet + @Facet(generate=true,description=@Description()) UIComponent getHeader(); /** * @return Property changes on: branches/4.0.X/cdk/maven-javascript-plugin ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/core/api/src/main/java/org/richfaces/el/ELContextWrapper.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml =================================================================== --- branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-04-07 20:34:09 UTC (rev 22391) @@ -23,9 +23,9 @@ </h:inputText> <h:outputText id="out" value="#{test.value}"></h:outputText> <csv:message id="uiMessage" for="text" /> - <h:outputLabel for="number" value="Four annotations for number"/> - <h:inputText id="number" value="#{test.numbers}"> - <csv:validator onbeforesubmit="alert('Before')"/> + <h:outputLabel for="number" value="Four annotations for number, with custom msg"/> + <h:inputText id="number" value="#{test.numbers}" converterMessage="Nor a number" validatorMessage="Wrong number"> + <csv:validator event="blur"/> </h:inputText> <h:outputText id="outNum" value="#{test.numbers}"></h:outputText> <csv:message id="uiNumMessage" for="number" /> Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml =================================================================== --- branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml 2011-04-07 20:34:09 UTC (rev 22391) @@ -31,8 +31,8 @@ <h:outputText id="dblrangeOut" value="#{test.doubleValue}"></h:outputText> <csv:message for="dblrange" /> - <h:outputLabel for="longrange" value="Text long range from 2 to 5:" /> - <h:inputText id="longrange" value="#{test.longValue}"> + <h:outputLabel for="longrange" value="Text long range from 2 to 5, custom msg:" /> + <h:inputText id="longrange" value="#{test.longValue}" converterMessage="Nor a number" validatorMessage="Wrong number"> <f:validateLongRange minimum="2" maximum="5" /> <csv:validator event="blur" /> </h:inputText> @@ -44,7 +44,7 @@ <csv:validator/> </h:commandButton> <a4j:commandButton value="AJAX Submit with client-side validation" render="lengthOut,dblrangeOut,longrangeOut"> - <csv:validator/> + <csv:validator event="click"/> </a4j:commandButton> </h:form> <csv:messages /> Property changes on: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/core/ui/src/test-old/java/org/ajax4jsf/component/QueueScriptedTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/4.0.X/ui/validator ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/ui/validator:22079 + /trunk/ui/validator:22079,22383 Modified: branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java =================================================================== --- branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -17,9 +17,10 @@ * <p class="changed_added_4_0">Get all constrains for given EL-expression</p> * @param context * @param expression + * @param message TODO * @return */ - Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,Class<?> ...groups); + Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,String message, Class<?> ...groups); /** * <p class="changed_added_4_0">Validate expression for a new value.</p> Modified: branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java =================================================================== --- branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -12,6 +12,6 @@ */ public interface FacesConverterService { - ConverterDescriptor getConverterDescription(FacesContext context,EditableValueHolder input, Converter converter); + ConverterDescriptor getConverterDescription(FacesContext context,EditableValueHolder input, Converter converter, String converterMessage); } Modified: branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java =================================================================== --- branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -7,5 +7,5 @@ public interface FacesValidatorService { - ValidatorDescriptor getValidatorDescription(FacesContext context,EditableValueHolder component, Validator validator); + ValidatorDescriptor getValidatorDescription(FacesContext context,EditableValueHolder component, Validator validator, String message); } Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -245,7 +245,8 @@ } if(null != converter){ FacesConverterService converterService = ServiceTracker.getService(facesContext, FacesConverterService.class); - return converterService.getConverterDescription(facesContext, input, converter); + String converterMessage = (String) component.getAttributes().get("converterMessage"); + return converterService.getConverterDescription(facesContext, input, converter, converterMessage); } else { return null; } @@ -282,6 +283,7 @@ Validator[] facesValidators = input.getValidators(); FacesContext facesContext = context.getFacesContext(); if (facesValidators.length > 0) { + String validatorMessage = (String) component.getAttributes().get("validatorMessage"); boolean beanValidatorsProcessed = false; FacesValidatorService facesValidatorService = ServiceTracker.getService(facesContext, FacesValidatorService.class); @@ -291,11 +293,11 @@ if (null != valueExpression && !beanValidatorsProcessed) { BeanValidatorService beanValidatorService = ServiceTracker.getService(facesContext, BeanValidatorService.class); - validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression, getGroups())); + validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression, validatorMessage, getGroups())); beanValidatorsProcessed = true; } } else { - validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator)); + validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator, validatorMessage)); } } } Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -24,6 +24,7 @@ import javax.validation.metadata.ElementDescriptor.ConstraintFinder; import javax.validation.metadata.PropertyDescriptor; +import org.richfaces.component.util.Strings; import org.richfaces.el.ValueDescriptor; import org.richfaces.el.ValueExpressionAnalayser; @@ -54,7 +55,7 @@ * javax.el.ValueExpression, java.lang.Class<?>[]) */ public Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression, - Class<?>... groups) { + String message, Class<?>... groups) { try { ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(context, expression); @@ -62,7 +63,7 @@ return Collections.emptySet(); } - return processBeanAttribute(context, propertyDescriptor, groups); + return processBeanAttribute(context, propertyDescriptor, message, groups); } catch (ELException e) { return Collections.emptySet(); } @@ -73,7 +74,7 @@ } Collection<ValidatorDescriptor> processBeanAttribute(FacesContext context, ValueDescriptor descriptor, - Class<?>... groups) { + String msg, Class<?>... groups) { PropertyDescriptor constraintsForProperty = getValidator(context).getConstraintsForClass(descriptor.getBeanType()).getConstraintsForProperty( descriptor.getName()); @@ -87,23 +88,23 @@ .getConstraintDescriptors(); // ContextHolder is an arbitrary object, it will depend on the implementation - Set<ValidatorDescriptor> descriptors = new HashSet<ValidatorDescriptor>(constraints.size()); - processConstraints(context, constraints, descriptors); - return descriptors; + FacesMessage message = Strings.isEmpty(msg)?null:new FacesMessage(FacesMessage.SEVERITY_ERROR,msg,msg); + return processConstraints(context, constraints, message); } else { return Collections.emptySet(); } } - void processConstraints(FacesContext context, Set<ConstraintDescriptor<?>> constraints, - Collection<ValidatorDescriptor> descriptors) { + Collection<ValidatorDescriptor> processConstraints(FacesContext context, Set<ConstraintDescriptor<?>> constraints, + FacesMessage msg) { + Set<ValidatorDescriptor> descriptors = new HashSet<ValidatorDescriptor>(constraints.size()); for (ConstraintDescriptor<?> cd : constraints) { Annotation a = cd.getAnnotation(); Map<String, Object> parameters = cd.getAttributes(); // TODO if cd.isReportedAsSingleConstraint() make sure than only the root constraint raises an error message // if one or several of the composing constraints are invalid) - FacesMessage message = validatorFactory.interpolateMessage(context, cd); + FacesMessage message = null == msg?validatorFactory.interpolateMessage(context, cd):msg; Class<? extends Annotation> validatorClass = findAnnotationClass(a); BeanValidatorDescriptor beanValidatorDescriptor = new BeanValidatorDescriptor(validatorClass, message); for (Map.Entry<String, Object> entry : parameters.entrySet()) { @@ -125,8 +126,9 @@ } beanValidatorDescriptor.makeImmutable(); descriptors.add(beanValidatorDescriptor); - processConstraints(context, cd.getComposingConstraints(), descriptors); // process the composing constraints + descriptors.addAll(processConstraints(context, cd.getComposingConstraints(), msg)); // process the composing constraints } + return descriptors; } private Class<? extends Annotation> findAnnotationClass(Annotation a) { Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -38,9 +38,9 @@ * @see org.richfaces.validator.FacesConverterService#getConverterDescription(javax.faces.context.FacesContext, * javax.faces.convert.Converter) */ - public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter) { + public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter, String converterMessage) { // determine converter message. - FacesMessage message = getMessage(context, converter, input); + FacesMessage message = getMessage(context, converter, input,converterMessage); ConverterDescriptorImpl descriptor = new ConverterDescriptorImpl(converter.getClass(), message); fillParameters(descriptor, converter); descriptor.makeImmutable(); Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -19,7 +19,7 @@ * @see org.richfaces.validator.BeanValidatorService#getConstrains(javax.faces.context.FacesContext, javax.el.ValueExpression, java.lang.Class<?>[]) */ public Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression, - Class<?>... groups) { + String message, Class<?>... groups) { return Collections.emptySet(); } Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -53,14 +53,18 @@ * @param context * @param component * @param input TODO + * @param msg * @return */ - public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input) { - String messageId = getMessageId(component); - return MessageFactory.createMessage(context, messageId); + public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input, String msg) { + if (null == msg) { + String messageId = getMessageId(component); + return MessageFactory.createMessage(context, messageId); + } else { + return new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg); + } } - protected void setLabelParameter(EditableValueHolder input, FacesValidatorDescriptor descriptor) { if (input instanceof UIComponent) { UIComponent component = (UIComponent) input; Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -30,8 +30,8 @@ * @see org.richfaces.validator.FacesValidatorService#getValidatorDescription(javax.faces.context.FacesContext, * javax.faces.validator.Validator) */ - public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator) { - FacesMessage message = getMessage(context, validator, input); + public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator, String validatorMessage) { + FacesMessage message = getMessage(context, validator, input,validatorMessage); FacesValidatorDescriptor descriptor = new FacesValidatorDescriptor(validator.getClass(), message); setLabelParameter(input, descriptor); fillParameters(descriptor, validator); Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -3,10 +3,13 @@ import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import java.util.Collections; + import javax.faces.convert.Converter; import javax.faces.convert.NumberConverter; import org.easymock.Capture; +import org.easymock.EasyMock; import org.jboss.test.faces.mock.Mock; import org.jboss.test.faces.mock.MockTestRunner; import org.jboss.test.faces.mock.Stub; @@ -45,7 +48,7 @@ public void setupService() { expect(factory.getInstance(FacesConverterService.class)).andStubReturn(converterService); converterCapture = new Capture<Converter>(); - expect(converterService.getConverterDescription(same(environment.getFacesContext()), same(input), capture(converterCapture))) + expect(converterService.getConverterDescription(same(environment.getFacesContext()), same(input), capture(converterCapture), EasyMock.<String>isNull())) .andStubReturn(descriptor); ServiceTracker.setFactory(factory); } @@ -66,6 +69,7 @@ public void testGetClientConverterFromComponent() throws Exception { NumberConverter converter = new NumberConverter(); expect(input.getConverter()).andReturn(converter); + expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap()); checkConverter(converter); } @@ -79,6 +83,7 @@ @Test public void testGetClientConverterByType() throws Exception { setupConverterFromApplication(converter); + expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap()); checkConverter(converter); } Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -4,6 +4,7 @@ import static org.junit.Assert.*; import java.util.Collection; +import java.util.Collections; import javax.el.ValueExpression; import javax.faces.validator.BeanValidator; @@ -96,7 +97,7 @@ private void setupBeanValidator(ValidatorDescriptor... validators) { expect(input.getValidators()).andStubReturn(new Validator[]{new BeanValidator()}); - expect(validatorService.getConstrains(environment.getFacesContext(), expression, DEFAULT_GROUP)).andStubReturn( + expect(validatorService.getConstrains(environment.getFacesContext(), expression, null, DEFAULT_GROUP)).andStubReturn( Lists.newArrayList(validators)); } @@ -107,7 +108,7 @@ ValidatorDescriptor validatorDescriptor = environment.createMock(ValidatorDescriptor.class); expect((Class) validatorDescriptor.getImplementationClass()).andStubReturn(validator.getClass()); expect(validatorDescriptor.getMessage()).andStubReturn(VALIDATION_ERROR); - expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator)) + expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator, null)) .andStubReturn(validatorDescriptor); } } @@ -123,6 +124,7 @@ public void testComponentValidator() throws Exception { setupComponentValidator(validator); setupBeanValidator(); + expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap()); Collection<ValidatorDescriptor> validators = checkValidator(); assertEquals(1, validators.size()); ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators); @@ -134,6 +136,7 @@ @Test public void testBeanValidators() throws Exception { setupBeanValidator(beanValidatorDescriptor); + expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap()); Collection<ValidatorDescriptor> validators = checkValidator(); assertEquals(1, validators.size()); ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators); Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -63,7 +63,7 @@ private Object getErrorMessage(Converter converter) { ConverterServiceImpl converterService = new ConverterServiceImpl(); - FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input); + FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input,null); return new Message(message); } Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -80,7 +80,7 @@ private Object getErrorMessage(Validator validator) { FacesValidatorServiceImpl validatorService = new FacesValidatorServiceImpl(); - FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input); + FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input,null); return new Message(message); } Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -103,7 +103,7 @@ private Collection<ValidatorDescriptor> expectValidatorsWithGroups(Class<?>[] groups, Class<? extends Annotation>... validators) { controller.replay(); - Collection<ValidatorDescriptor> constrains = validatorService.getConstrains(environment.getFacesContext(), expression,groups); + Collection<ValidatorDescriptor> constrains = validatorService.getConstrains(environment.getFacesContext(), expression,null, groups); controller.verify(); assertEquals(validators.length, constrains.size()); for (final Class<? extends Annotation> class1 : validators) { Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -70,7 +70,7 @@ public void getConverterClass() throws Exception { converter = new BooleanConverter(); controller.replay(); - ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter); + ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null); assertEquals(converter.getClass(), converterDescription.getImplementationClass()); } @@ -85,7 +85,7 @@ facesMessage = e.getFacesMessage(); } assertNotNull(facesMessage); - ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter); + ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null); String summary = converterDescription.getMessage().getSummary(); summary = summary.replace("{2}", "foo"); summary = summary.replace("'{0}'", "abc"); @@ -102,7 +102,7 @@ converter.setType("both"); converter.setTimeZone(TimeZone.getTimeZone("EST")); controller.replay(); - ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter); + ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null); Map<String, ? extends Object> additionalParameters = converterDescription.getAdditionalParameters(); assertEquals("short", additionalParameters.get("dateStyle")); assertEquals("MM/DD/YYYY", additionalParameters.get("pattern")); Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2011-04-07 15:37:35 UTC (rev 22390) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2011-04-07 20:34:09 UTC (rev 22391) @@ -65,7 +65,7 @@ public void getConverterClass() throws Exception { validator = new LengthValidator(); controller.replay(); - ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator); + ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator, null); assertEquals(validator.getClass(), validatorDescription.getImplementationClass()); } @@ -80,7 +80,7 @@ facesMessage = e.getFacesMessage(); } assertNotNull(facesMessage); - ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator); + ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator, null); String summary = validatorDescription.getMessage().getSummary(); summary = summary.replace("{0}", "foo"); assertEquals(facesMessage.getSummary(), summary);