added "validationMessageSource" property to LocalValidatorFactoryBean, for...

added "validationMessageSource" property to LocalValidatorFactoryBean, for Spring-based messages (SPR-7307)

org.springframework.context/context.iml

@@ -113,44 +113,44 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.6.5/com.springsource.org.codehaus.groovy-1.6.5.jar!/" />
+          <root url="jar://$IVY_CACHE$/javax.inject/com.springsource.org.atinject.tck/1.0.0/com.springsource.org.atinject.tck-1.0.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.6.5/com.springsource.org.codehaus.groovy-sources-1.6.5.jar!/" />
+          <root url="jar://$IVY_CACHE$/javax.inject/com.springsource.org.atinject.tck/1.0.0/com.springsource.org.atinject.tck-sources-1.0.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.4.0/com.springsource.org.jruby-1.4.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.6.5/com.springsource.org.codehaus.groovy-1.6.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.4.0/com.springsource.org.jruby-sources-1.4.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.6.5/com.springsource.org.codehaus.groovy-sources-1.6.5.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.0.0.GA/com.springsource.org.hibernate.validator-4.0.0.GA.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.1.0.GA/com.springsource.org.hibernate.validator-4.1.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.0.0.GA/com.springsource.org.hibernate.validator-sources-4.0.0.GA.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.1.0.GA/com.springsource.org.hibernate.validator-sources-4.1.0.GA.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/javax.inject/com.springsource.org.atinject.tck/1.0.0/com.springsource.org.atinject.tck-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.4.0/com.springsource.org.jruby-1.4.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/javax.inject/com.springsource.org.atinject.tck/1.0.0/com.springsource.org.atinject.tck-sources-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.4.0/com.springsource.org.jruby-sources-1.4.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

org.springframework.context/ivy.xml

@@ -46,6 +46,7 @@
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
 		<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
 		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="optional, groovy->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="optional->compile"/>
 		<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>
 		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, jruby->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
@@ -62,7 +63,6 @@
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi" conf="test->runtime"/>
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
 	</dependencies>

org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java

 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,8 +71,11 @@ public class CustomValidatorBean extends SpringValidatorAdapter implements Valid
 		}
 
 		ValidatorContext validatorContext = this.validatorFactory.usingContext();
-		validatorContext.messageInterpolator(new LocaleContextMessageInterpolator(
-				this.messageInterpolator, this.validatorFactory.getMessageInterpolator()));
+		MessageInterpolator targetInterpolator = this.messageInterpolator;
+		if (targetInterpolator == null) {
+			targetInterpolator = this.validatorFactory.getMessageInterpolator();
+		}
+		validatorContext.messageInterpolator(new LocaleContextMessageInterpolator(targetInterpolator));
 		if (this.traversableResolver != null) {
 			validatorContext.traversableResolver(this.traversableResolver);
 		}

org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java

 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,12 @@ import javax.validation.ValidatorContext;
 import javax.validation.ValidatorFactory;
 import javax.validation.spi.ValidationProvider;
 
+import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.MessageSource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.CollectionUtils;
 
@@ -94,6 +97,25 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
 		this.messageInterpolator = messageInterpolator;
 	}
 
+	/**
+	 * Specify a custom Spring MessageSource for resolving validation messages,
+	 * instead of relying on JSR-303's default "ValidationMessages.properties" bundle
+	 * in the classpath. This may refer to a Spring context's shared "messageSource" bean,
+	 * or to some special MessageSource setup for validation purposes only.
+	 * <p><b>NOTE:</b> This feature requires Hibernate Validator 4.1 or higher on the classpath.
+	 * You may nevertheless use a different validation provider but Hibernate Validator's
+	 * {@link ResourceBundleMessageInterpolator} class must be accessible during configuration.
+	 * <p>Specify either this property or {@link #setMessageInterpolator "messageInterpolator"},
+	 * not both. If you would like to build a custom MessageInterpolator, consider deriving from
+	 * Hibernate Validator's {@link ResourceBundleMessageInterpolator} and passing in a
+	 * Spring {@link MessageSourceResourceBundleLocator} when constructing your interpolator.
+	 * @see ResourceBundleMessageInterpolator
+	 * @see MessageSourceResourceBundleLocator
+	 */
+	public void setValidationMessageSource(MessageSource messageSource) {
+		this.messageInterpolator = HibernateValidatorDelegate.buildMessageInterpolator(messageSource);
+	}
+
 	/**
 	 * Specify a custom TraversableResolver to use for this ValidatorFactory
 	 * and its exposed default Validator.
@@ -160,8 +182,11 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
 				Validation.byProvider(this.providerClass).configure() :
 				Validation.byDefaultProvider().configure());
 
-		configuration.messageInterpolator(new LocaleContextMessageInterpolator(
-				this.messageInterpolator, configuration.getDefaultMessageInterpolator()));
+		MessageInterpolator targetInterpolator = this.messageInterpolator;
+		if (targetInterpolator == null) {
+			targetInterpolator = configuration.getDefaultMessageInterpolator();
+		}
+		configuration.messageInterpolator(new LocaleContextMessageInterpolator(targetInterpolator));
 
 		if (this.traversableResolver != null) {
 			configuration.traversableResolver(this.traversableResolver);
@@ -216,4 +241,15 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
 		return this.validatorFactory.getConstraintValidatorFactory();
 	}
 
+
+	/**
+	 * Inner class to avoid a hard-coded Hibernate Validator 4.1 dependency.
+	 */
+	private static class HibernateValidatorDelegate {
+
+		public static MessageInterpolator buildMessageInterpolator(MessageSource messageSource) {
+			return new ResourceBundleMessageInterpolator(new MessageSourceResourceBundleLocator(messageSource));
+		}
+	}
+
 }

org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java

 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,10 +44,6 @@ public class LocaleContextMessageInterpolator implements MessageInterpolator {
 		this.targetInterpolator = targetInterpolator;
 	}
 
-	LocaleContextMessageInterpolator(MessageInterpolator customInterpolator, MessageInterpolator defaultInterpolator) {
-		this.targetInterpolator = (customInterpolator != null ? customInterpolator : defaultInterpolator);
-	}
-
 
 	public String interpolate(String message, Context context) {
 		return this.targetInterpolator.interpolate(message, context, LocaleContextHolder.getLocale());

org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java

+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.validation.beanvalidation;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.hibernate.validator.resourceloading.ResourceBundleLocator;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.support.MessageSourceResourceBundle;
+import org.springframework.util.Assert;
+
+/**
+ * Implementation of Hibernate Validator 4.1's {@link ResourceBundleLocator} interface,
+ * exposing a Spring {@link MessageSource} as localized {@link MessageSourceResourceBundle}.
+ *
+ * @author Juergen Hoeller
+ * @since 3.0.4
+ * @see ResourceBundleLocator
+ * @see MessageSource
+ * @see MessageSourceResourceBundle
+ */
+public class MessageSourceResourceBundleLocator implements ResourceBundleLocator {
+
+	private final MessageSource messageSource;
+
+	/**
+	 * Build a MessageSourceResourceBundleLocator for the given MessageSource.
+	 * @param messageSource the Spring MessageSource to wrap
+	 */
+	public MessageSourceResourceBundleLocator(MessageSource messageSource) {
+		Assert.notNull(messageSource, "MessageSource must not be null");
+		this.messageSource = messageSource;
+	}
+
+	public ResourceBundle getResourceBundle(Locale locale) {
+		return new MessageSourceResourceBundle(this.messageSource, locale);
+	}
+
+}

org.springframework.context/template.mf

@@ -27,6 +27,7 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.aspectj.weaver.*;version=${aj.osgi.range};resolution:=optional,
  org.codehaus.groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
+ org.hibernate.validator.*;version="[4.1.0, 5.0.0)";resolution:=optional,
  org.joda.*;version="[1.6.0, 2.0.0)";resolution:=optional,
  org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.omg.CORBA.*;version="0";resolution:=optional,