[libspring-java] 15/19: Removed the Hibernate Validator patch (the version 4.2 is now in Debian)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libspring-java.

commit 224816d6a95ebfda9ad33cf4832ed682356378d4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 3 15:32:54 2014 +0100

    Removed the Hibernate Validator patch (the version 4.2 is now in Debian)
---
 debian/patches/0009_hibernate_validator_41.diff | 101 ------------------------
 debian/patches/series                           |   1 -
 2 files changed, 102 deletions(-)

diff --git a/debian/patches/0009_hibernate_validator_41.diff b/debian/patches/0009_hibernate_validator_41.diff
deleted file mode 100644
index 9d75430..0000000
--- a/debian/patches/0009_hibernate_validator_41.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Remove some code which only compile with Hibernate Validator 4.1
- This should be re-enabled when Hibernate Validator 4.1 enter Debian.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2010-08-24
-Index: libspring-java/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
-===================================================================
---- libspring-java.orig/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java	2010-10-20 16:29:40.000000000 -0430
-+++ libspring-java/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java	2010-11-05 16:06:32.000000000 -0430
-@@ -30,7 +30,7 @@
- import javax.validation.ValidatorFactory;
- import javax.validation.spi.ValidationProvider;
- 
--import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
-+//import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
- 
- import org.springframework.beans.factory.InitializingBean;
- import org.springframework.context.ApplicationContext;
-@@ -113,7 +113,7 @@
- 	 * @see MessageSourceResourceBundleLocator
- 	 */
- 	public void setValidationMessageSource(MessageSource messageSource) {
--		this.messageInterpolator = HibernateValidatorDelegate.buildMessageInterpolator(messageSource);
-+		//this.messageInterpolator = HibernateValidatorDelegate.buildMessageInterpolator(messageSource);
- 	}
- 
- 	/**
-@@ -245,11 +245,11 @@
- 	/**
- 	 * Inner class to avoid a hard-coded Hibernate Validator 4.1 dependency.
- 	 */
--	private static class HibernateValidatorDelegate {
-+	/*private static class HibernateValidatorDelegate {
- 
- 		public static MessageInterpolator buildMessageInterpolator(MessageSource messageSource) {
- 			return new ResourceBundleMessageInterpolator(new MessageSourceResourceBundleLocator(messageSource));
- 		}
--	}
-+	}*/
- 
- }
-Index: libspring-java/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
-===================================================================
---- libspring-java.orig/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java	2010-10-20 16:29:40.000000000 -0430
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,55 +0,0 @@
--/*
-- * 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);
--	}
--
--}
diff --git a/debian/patches/series b/debian/patches/series
index 32c04d6..16c080d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 0005_commonj.diff
 0007_remove_backport_util_concurrent.patch
 0008_jpa_20_api.diff
-0009_hibernate_validator_41.diff
 0010_velocity_17.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git