[pkg-java] r13670 - in trunk/libspring-2.5-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat May 7 23:46:00 UTC 2011
Author: drazzib
Date: 2011-05-07 23:45:59 +0000 (Sat, 07 May 2011)
New Revision: 13670
Added:
trunk/libspring-2.5-java/debian/patches/18_hibernate_36.diff
Modified:
trunk/libspring-2.5-java/debian/changelog
trunk/libspring-2.5-java/debian/control
trunk/libspring-2.5-java/debian/patches/series
Log:
* B-D and Suggests libaspectj-java instead of aspectj (ie. so no JRE
in dependencies graph).
* Bump Standards-Version to 3.9.2 (no changes needed).
* d/patches/18_hibernate_36.diff: Fix FTBFS with Hibernate 3.6 by backporting
some code from libspring-java 3.x (Closes: #625987).
Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog 2011-05-07 22:57:40 UTC (rev 13669)
+++ trunk/libspring-2.5-java/debian/changelog 2011-05-07 23:45:59 UTC (rev 13670)
@@ -1,3 +1,13 @@
+libspring-2.5-java (2.5.6.SEC02-4) unstable; urgency=low
+
+ * B-D and Suggests libaspectj-java instead of aspectj (ie. so no JRE
+ in dependencies graph).
+ * Bump Standards-Version to 3.9.2 (no changes needed).
+ * d/patches/18_hibernate_36.diff: Fix FTBFS with Hibernate 3.6 by backporting
+ some code from libspring-java 3.x (Closes: #625987).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 08 May 2011 01:35:24 +0200
+
libspring-2.5-java (2.5.6.SEC02-3) unstable; urgency=low
* d/control: Drop all Depends on JRE packages since libspring-*-java
Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control 2011-05-07 22:57:40 UTC (rev 13669)
+++ trunk/libspring-2.5-java/debian/control 2011-05-07 23:45:59 UTC (rev 13670)
@@ -12,10 +12,10 @@
libcglib-java, bsh, glassfish-javaee, libqdox-java, libjarjar-java,
libhibernate3-java (>= 3.5), libhibernate-commons-annotations-java, libhibernate-annotations-java,
libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java (>= 2.2.1), libvelocity-tools-java,
- glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, aspectj (>= 1.6.4), libjasperreports-java,
+ glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, libaspectj-java (>= 1.6.4), libjasperreports-java,
maven-repo-helper, libportlet-api-2.0-spec-java, libjsf-api-java, libhessian-java, libgeronimo-commonj-spec-java,
libeclipselink-java, libopenjpa-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://springframework.org/about
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-2.5-java/
@@ -45,7 +45,7 @@
Package: libspring-aop-2.5-java
Architecture: all
Depends: ${misc:Depends}, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
-Recommends: libaopalliance-java, aspectj
+Recommends: libaopalliance-java, libaspectj-java
Description: modular Java/J2EE application framework - AOP
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
Added: trunk/libspring-2.5-java/debian/patches/18_hibernate_36.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/18_hibernate_36.diff (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/18_hibernate_36.diff 2011-05-07 23:45:59 UTC (rev 13670)
@@ -0,0 +1,68 @@
+Description: Fix FTBFS with Hibernate 3.6 by using code
+ by backporting spring framework 3.x
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-05-08
+Bug: http://bugs.debian.org/625987
+--- a/src/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
++++ b/src/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
+@@ -16,17 +16,20 @@
+
+ package org.springframework.orm.hibernate3;
+
++import java.lang.reflect.Method;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.Properties;
+
+ import org.hibernate.engine.FilterDefinition;
++import org.hibernate.type.Type;
+ import org.hibernate.type.TypeFactory;
+
+ import org.springframework.beans.factory.BeanNameAware;
+ import org.springframework.beans.factory.FactoryBean;
+ import org.springframework.beans.factory.InitializingBean;
++import org.springframework.util.ReflectionUtils;
+
+ /**
+ * Convenient FactoryBean for defining Hibernate FilterDefinitions.
+@@ -65,6 +68,30 @@
+ */
+ public class FilterDefinitionFactoryBean implements FactoryBean, BeanNameAware, InitializingBean {
+
++ private static Method heuristicTypeMethod;
++
++ private static Object typeResolver;
++
++ static {
++ // Hibernate 3.6 TypeResolver class available?
++ try {
++ Class trClass = FilterDefinitionFactoryBean.class.getClassLoader().loadClass(
++ "org.hibernate.type.TypeResolver");
++ heuristicTypeMethod = trClass.getMethod("heuristicType", new Class[] {String.class});
++ typeResolver = trClass.newInstance();
++ }
++ catch (Exception ex) {
++ try {
++ heuristicTypeMethod = TypeFactory.class.getMethod("heuristicType", new Class[] {String.class});
++ typeResolver = null;
++ }
++ catch (Exception ex2) {
++ throw new IllegalStateException("Cannot find Hibernate's heuristicType method", ex2);
++ }
++ }
++ }
++
++
+ private String filterName;
+
+ private Map parameterTypeMap = new HashMap();
+@@ -92,7 +119,7 @@
+ for (Enumeration names = parameterTypes.propertyNames(); names.hasMoreElements();) {
+ String paramName = (String) names.nextElement();
+ String typeName = parameterTypes.getProperty(paramName);
+- this.parameterTypeMap.put(paramName, TypeFactory.heuristicType(typeName));
++ this.parameterTypeMap.put(paramName, ReflectionUtils.invokeMethod(heuristicTypeMethod, typeResolver, new Object[] {typeName}));
+ }
+ }
+ else {
Modified: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series 2011-05-07 22:57:40 UTC (rev 13669)
+++ trunk/libspring-2.5-java/debian/patches/series 2011-05-07 23:45:59 UTC (rev 13670)
@@ -14,3 +14,4 @@
15_fix_build_with_asm3.diff
16_commonj.diff
17_velocitytools2.diff
+18_hibernate_36.diff
More information about the pkg-java-commits
mailing list