Author: drazzib
Date: 2010-08-24 22:28:56 +0000 (Tue, 24 Aug 2010)
New Revision: 12939
Added:
trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff
Modified:
trunk/libspring-java/debian/build-classpath
trunk/libspring-java/debian/changelog
trunk/libspring-java/debian/control
trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff
trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff
trunk/libspring-java/debian/patches/0005_commonj.diff
trunk/libspring-java/debian/patches/0007_no_jruby.diff
trunk/libspring-java/debian/patches/series
Log:
New upstream release && upload to experimental
Modified: trunk/libspring-java/debian/build-classpath
===================================================================
--- trunk/libspring-java/debian/build-classpath 2010-08-24 22:22:56 UTC (rev
12938)
+++ trunk/libspring-java/debian/build-classpath 2010-08-24 22:28:56 UTC (rev
12939)
@@ -48,6 +48,7 @@
/usr/share/java/hibernate-annotations.jar
/usr/share/java/hibernate-core.jar
/usr/share/java/hibernate-entitymanager.jar
+#/usr/share/java/hibernate-validator.jar
/usr/share/java/ibatis.jar
/usr/share/java/itext.jar
/usr/share/java/jackson-core.jar
Modified: trunk/libspring-java/debian/changelog
===================================================================
--- trunk/libspring-java/debian/changelog 2010-08-24 22:22:56 UTC (rev
12938)
+++ trunk/libspring-java/debian/changelog 2010-08-24 22:28:56 UTC (rev
12939)
@@ -1,4 +1,4 @@
-libspring-java (3.0.3.RELEASE-1) UNRELEASED; urgency=low
+libspring-java (3.0.4.RELEASE-1) experimental; urgency=low
* New major upstream release.
- rename packages to match libspring-*-java convention
@@ -11,7 +11,7 @@
* Use mh_clean in clean target:
- Build-Depends on maven-repo-helper >= 1.1
- -- Damien Raude-Morvan <[email protected]> Mon, 05 Jul 2010 21:21:49 +0200
+ -- Damien Raude-Morvan <[email protected]> Tue, 24 Aug 2010 22:54:05 +0200
libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
Modified: trunk/libspring-java/debian/control
===================================================================
--- trunk/libspring-java/debian/control 2010-08-24 22:22:56 UTC (rev 12938)
+++ trunk/libspring-java/debian/control 2010-08-24 22:28:56 UTC (rev 12939)
@@ -19,7 +19,7 @@
libquartz-java, librome-java, libservlet2.5-java, libspring-build-java,
libstruts1.2-java,
libtiles-java, libtomcat6-java, libvelocity-tools-java, libxmlbeans-java,
libxstream-java,
testng, velocity
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://springframework.org/about
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-java/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-java/
Modified: trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff
===================================================================
--- trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff
2010-08-24 22:22:56 UTC (rev 12938)
+++ trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff
2010-08-24 22:28:56 UTC (rev 12939)
@@ -193,8 +193,8 @@
</ivy-module>
--- a/projects/org.springframework.context/ivy.xml
+++ b/projects/org.springframework.context/ivy.xml
-@@ -48,7 +48,7 @@
- <dependency org="org.codehaus.groovy"
name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="optional,
groovy->compile"/>
+@@ -49,7 +49,7 @@
+ <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"/>
Modified: trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff
===================================================================
--- trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff
2010-08-24 22:22:56 UTC (rev 12938)
+++ trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff
2010-08-24 22:28:56 UTC (rev 12939)
@@ -45,15 +45,15 @@
<dependency org="edu.emory.mathcs.backport"
name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="optional,
backport-util-concurrent->compile"/>
<dependency org="javax.annotation"
name="com.springsource.javax.annotation" rev="1.0.0" conf="provided,
ejb->compile"/>
<dependency org="javax.ejb" name="com.springsource.javax.ejb"
rev="3.0.0" conf="provided, ejb->compile"/>
-@@ -48,6 +49,7 @@
- <dependency org="org.codehaus.groovy"
name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="optional,
groovy->compile"/>
+@@ -49,6 +50,7 @@
+ <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"/>-->
<dependency org="org.springframework"
name="org.springframework.aop" rev="latest.integration"
conf="compile->compile"/>
<dependency org="org.springframework"
name="org.springframework.beans" rev="latest.integration"
conf="compile->compile"/>
-@@ -55,7 +57,9 @@
+@@ -56,7 +58,9 @@
<dependency org="org.springframework"
name="org.springframework.expression" rev="latest.integration"
conf="compile->compile"/>
<dependency org="org.springframework"
name="org.springframework.instrument" rev="latest.integration" conf="optional,
instrumentation->compile"/>
<!-- test dependencies -->
@@ -332,7 +332,7 @@
<dependency org="org.springframework"
name="org.springframework.context.support" rev="latest.integration"
conf="test->runtime"/>
<dependency org="org.junit" name="com.springsource.org.junit"
rev="${org.junit.version}" conf="test->compile"/>
+<!--
- <dependency org="javax.persistence"
name="com.springsource.javax.persistence" rev="1.0.0" conf="optional,
compile->compile"/>
+ <dependency org="javax.persistence"
name="com.springsource.javax.persistence" rev="1.0.0" conf="provided->compile"/>
+-->
<dependency org="javax.mail" name="com.springsource.javax.mail"
rev="1.4.0" conf="test->compile"/>
</dependencies>
Modified: trunk/libspring-java/debian/patches/0005_commonj.diff
===================================================================
--- trunk/libspring-java/debian/patches/0005_commonj.diff 2010-08-24
22:22:56 UTC (rev 12938)
+++ trunk/libspring-java/debian/patches/0005_commonj.diff 2010-08-24
22:28:56 UTC (rev 12939)
@@ -7,9 +7,9 @@
Last-Update: 2010-07-04
Forwarded: no
----
libspring-java-3.0.3.RELEASE.orig/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
-+++
libspring-java-3.0.3.RELEASE/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
-@@ -146,20 +146,22 @@ public class WorkManagerTaskExecutor ext
+---
a/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
++++
b/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
+@@ -146,20 +146,22 @@
public void execute(Runnable task) {
Assert.state(this.workManager != null, "No WorkManager
specified");
Work work = new DelegatingWork(task);
@@ -34,7 +34,7 @@
}
public void execute(Runnable task, long startTimeout) {
-@@ -191,13 +193,13 @@ public class WorkManagerTaskExecutor ext
+@@ -191,13 +193,13 @@
//-------------------------------------------------------------------------
public WorkItem schedule(Work work)
Modified: trunk/libspring-java/debian/patches/0007_no_jruby.diff
===================================================================
--- trunk/libspring-java/debian/patches/0007_no_jruby.diff 2010-08-24
22:22:56 UTC (rev 12938)
+++ trunk/libspring-java/debian/patches/0007_no_jruby.diff 2010-08-24
22:28:56 UTC (rev 12939)
@@ -3,8 +3,8 @@
Forwarded: not-needed
Last-Update: 2010-07-01
----
libspring-java-3.0.3.RELEASE.orig/projects/org.springframework.context/build.xml
-+++ libspring-java-3.0.3.RELEASE/projects/org.springframework.context/build.xml
+--- a/projects/org.springframework.context/build.xml
++++ b/projects/org.springframework.context/build.xml
@@ -4,4 +4,15 @@
<property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
Added: trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff
===================================================================
--- trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff
(rev 0)
+++ trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff
2010-08-24 22:28:56 UTC (rev 12939)
@@ -0,0 +1,97 @@
+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 <[email protected]>
+Forwarded: not-needed
+Last-Update: 2010-08-24
+---
a/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
++++
b/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
+@@ -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));
+ }
+- }
++ }*/
+
+ }
+---
a/projects/org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
++++ /dev/null
+@@ -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);
+- }
+-
+-}
Modified: trunk/libspring-java/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series 2010-08-24 22:22:56 UTC (rev
12938)
+++ trunk/libspring-java/debian/patches/series 2010-08-24 22:28:56 UTC (rev
12939)
@@ -6,3 +6,4 @@
0006_aspectj_classpath.diff
0007_no_jruby.diff
0008_jpa_20_api.diff
+0009_hibernate_validator_41.diff
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
