[pkg-java] r13671 - in tags/libspring-2.5-java: . 2.5.6.SEC02-4/debian 2.5.6.SEC02-4/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat May 7 23:46:17 UTC 2011
Author: drazzib
Date: 2011-05-07 23:46:16 +0000 (Sat, 07 May 2011)
New Revision: 13671
Added:
tags/libspring-2.5-java/2.5.6.SEC02-4/
tags/libspring-2.5-java/2.5.6.SEC02-4/debian/changelog
tags/libspring-2.5-java/2.5.6.SEC02-4/debian/control
tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/18_hibernate_36.diff
tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/series
Removed:
tags/libspring-2.5-java/2.5.6.SEC02-4/debian/changelog
tags/libspring-2.5-java/2.5.6.SEC02-4/debian/control
tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/series
Log:
[svn-buildpackage] Tagging libspring-2.5-java 2.5.6.SEC02-4
Deleted: tags/libspring-2.5-java/2.5.6.SEC02-4/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog 2011-05-03 22:11:29 UTC (rev 13642)
+++ tags/libspring-2.5-java/2.5.6.SEC02-4/debian/changelog 2011-05-07 23:46:16 UTC (rev 13671)
@@ -1,247 +0,0 @@
-libspring-2.5-java (2.5.6.SEC02-3) unstable; urgency=low
-
- * d/control: Drop all Depends on JRE packages since libspring-*-java
- are libraries (conform to latest Debian Java Policy).
- * d/patches/17_velocitytools2.diff: New patch to drop old code needed
- only for (really) old velocity-tools. Fix FTBFS (Closes: #617868).
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 14 Mar 2011 20:25:26 +0100
-
-libspring-2.5-java (2.5.6.SEC02-2) unstable; urgency=low
-
- [ Miguel Landaeta ]
- * Remove nonexistant B-D on libhibernate-entitymanager-java. (Closes: #593028).
- * Bump Standards-Version to 3.9.1. No changes were needed.
-
- [ Damien Raude-Morvan ]
- * Upload to unstable.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 16 Aug 2010 11:58:34 +0200
-
-libspring-2.5-java (2.5.6.SEC02-1) unstable; urgency=high
-
- [ Miguel Landaeta ]
- * Enable support for JavaServer Faces API. (Closes: #587835).
- * Bump Standards-Version to 3.9.0. No changes were needed.
-
- [ Damien Raude-Morvan ]
- * New upstream security release (hence urgency=high)
- - [SECURITY] Include fix for CVE-2010-1622:
- Spring Framework execution of arbitrary code
- * Enable support for Hessian API.
- - Add B-D on libhessian-java
- * Enable support for CommonJ API.
- - Add B-D on libgeronimo-commonj-spec-java
- * Enable support for JPA 1.0 API.
- - Add B-D on libhibernate-entitymanager-java, libeclipselink-java
- and libopenjpa-java
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Jul 2010 01:28:57 +0200
-
-libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
-
- [ Onkar Shinde ]
- * asm2 -> asm3 transition.
- * Build a new package libspring-aspects-2.5-java and include
- spring-aspects.jar file in it. This is needed to build xwork2.
- (Closes: #582510)
-
- [ Damien Raude-Morvan ]
- * Upload to unstable
- * Describe asm2 -> asm3 transition in d/README.Debian and in
- d/patches/15_fix_build_with_asm3.diff
-
- -- Damien Raude-Morvan <drazzib at debian.org> Wed, 16 Jun 2010 21:17:02 +0200
-
-libspring-2.5-java (2.5.6.SEC01-9) unstable; urgency=low
-
- [ Miguel Landaeta ]
- * Enable support for Portlet API. (Closes: #578718).
-
- [ Damien Raude-Morvan ]
- * Upload to unstable.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 26 Apr 2010 22:53:11 +0200
-
-libspring-2.5-java (2.5.6.SEC01-8) unstable; urgency=low
-
- * New libspring-webmvc-struts-2.5-java binary package
- for webmvc-struts.jar. (Closes: #570533)
- Thanks to Arnaud Fontaine <arnau at debian.org>
- * Fix debian/watch to track upstream 2.x releases from
- spring-maintenance SVN tags.
- Thanks to Per Wawra <debian.perfide at safersignup.com>.
- * Replace B-D/D on glassfish-appserv by glassfish-javaee since
- glassfish-appserv-jstl.jar is now in glassfish-appserv.
- * Standards-Version to 3.8.4.
- * Source format 3.0 (quilt).
- * Move package duty under Debian Java Maintainers umbrella
- and add myself to Uploaders.
- * Disable JRuby scripting module and remove B-D since jruby Debian
- package has moved to non-free archive.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Fri, 26 Feb 2010 20:26:51 +0100
-
-libspring-2.5-java (2.5.6.SEC01-7) unstable; urgency=low
-
- * Fix compat with tiles 2.2.1 (split of modules)
- - Build-Depends on libtiles-java >= 2.2.1
- - Fix debian/classpath-debian
- * Upgrade debian/copyright to DEP5
- * Bump debhelper version to >= 7
- - Replace dh_clean -k by dh_prep
- - Refactor debian/rules by using "dh"
- * Maven POMs:
- - Add a Build-Depends-Indep dependency on maven-repo-helper
- - Use mh_installpoms and mh_installjar to install the POM and the jar to the
- Maven repository
- - Remove useless debian/*.{links,install} files
- - debian/poms/*.xml: Debian crafted pom.xml files
- - debian/rules: new get-orig-pom to update debian/poms/*.xml at new upstream
- release.
- * Replace Depends and Build-Depends on "jruby1.2" by "jruby" (1.4)
- * Switch to quilt as patch system
- - Build-Depends on quilt and remove dpatch
- - Rewrite debian/README.source
- - Use dh --with quilt
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 12 Dec 2009 15:03:37 +0100
-
-libspring-2.5-java (2.5.6.SEC01-6) unstable; urgency=low
-
- * New 13_tiles_22 patch for compatibility with Tiles 2.2
- - Describe this change in README.Debian
- - Bump Build-Depends on libtiles-java (>= 2.2.0)
- * Also bump Build-Depends on aspectj (>= 1.6.4)
- * Remove unneeded Build-Depends on libservlet2.4-java
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 24 Oct 2009 20:46:45 +0200
-
-libspring-2.5-java (2.5.6.SEC01-5) unstable; urgency=low
-
- * cglib2.1 (2.1.3) to cglib (2.2) transition:
- - Build-Depends and Depends on libcglib-java instead of libcglib2.1-java
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 10 Oct 2009 21:49:08 +0200
-
-libspring-2.5-java (2.5.6.SEC01-4) unstable; urgency=low
-
- * Migrate to JRuby 1.2 (JRuby 1.1 will be removed from unstable soon)
- Thanks to Sebastien Delafond for report (Closes: #548807).
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 29 Sep 2009 21:40:09 +0200
-
-libspring-2.5-java (2.5.6.SEC01-3) unstable; urgency=low
-
- * Now build with jasperreports and aspectj helpers
- - Add Build-Depends on libjasperreports-java and aspectj
- in debian/control
- - Add Recommends on aspectj for libspring-aop-2.5-java
- - Update debian/excludesfiles/{main,tiger,tigermock} accordingly
- - Add this JARs to debian/classpath-debian for build
- - Update exclusion list in README.Debian
- - Remove 07_no_aspectj patch
- * New 12_aspectj_164 patch for compatibility with AspectJ version in Debian
- * Downgrade glassfish-appserv to Suggests for libspring-web-2.5-java package
- (Closes: #545500)
- * Bump Standards-Version to 3.8.3: no changes needed
- * Update my email address
- * Set myself as Maintainer and move Andreas Schildbach to Uploaders
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 24 Sep 2009 21:26:10 +0200
-
-libspring-2.5-java (2.5.6.SEC01-2) unstable; urgency=low
-
- [ Damien Raude-Morvan ]
- * Update Vcs-* fields to pkg-java SVN repository
- * Bump Standards-Version to 3.8.2:
- - Update README.source to describe dpatch patch system
-
- [ Andreas Schildbach ]
- * Migrated Tomcat instrumentation dependency from libtomcat5.5-java
- to libtomcat6-java, as Tomcat 5.5 is no more (Closes: #543122)
-
- -- Andreas Schildbach <debian.org at schildbach.de> Sun, 23 Aug 2009 09:43:10 +0000
-
-libspring-2.5-java (2.5.6.SEC01-1) unstable; urgency=low
-
- * New upstream release.
- - [SECURITY] Include fix for CVE-2009-1190:
- Spring Framework Remote Denial of Service Vulnerability
- * Refresh all debian/patches to handle Spring linefeed change
- * New patch 11_servlet_api_api to handle compat with
- Servlet 2.5 and JSP 2.1 API's. Remove MockPageContext
- from exclusion list in debian/excludesfiles/mainmock
- * Use JRuby 1.1 instead of 1.0:
- - debian/classpath-debian: replace jruby1.0 by jruby1.1
- - debian/control: change Build-Depends for jruby1.1 package
- and Suggest for spring-context package
- - debian/patches/10_jruby_11.dpatch: update Spring
- source code to be compliant with jruby 1.1
- * Now build with testng:
- - Add Build-Depends on testng in debian/control
- - Add Recommends on testng to spring-test module
- - Update debian/excludesfiles/tigermock
- - Add this testng.jar to debian/classpath-debian
- * debian/watch:
- - new upstream releases are not on sf.net anymore
- - upstream download site is not checkeable by uscan
- (need POST request - form submit - to access to download area)
- * debian/README.Debian: complete list of changes regarding upstream modules
- * debian/copyright: Debian packaging should be licenced under same licence as
- upstream. Clarify Apache 2.0 licence copyright attribution.
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 20:25:01 +0200
-
-libspring-2.5-java (2.5.5-2) UNRELEASED; urgency=low
-
- [ Damien Raude-Morvan ]
- * Now build with tiles and velocity-tools helpers:
- - Add Build-Depends on libtiles-java and libvelocity-tools-java
- in debian/control
- - Update debian/excludesfiles/main accordingly
- - Add this JAR to debian/classpath-debian to build
- * New libspring-2.5-test-java debian package (include mock tools):
- - Re-activate buildmock target in 01_build_xml patch
- - Build-Depends on junit4 (>= 4.5) in debian/control
- - New 09_junit_45 patch to build Spring 2.5 with JUnit 4.5
- - Add debian/excludesfiles/tigermock and debian/excludesfiles/mainmock
- to exclude some classes from build
- - Update 02_read_excludefile_build_xml patch to read these files
- - Add libspring-test-2.5-java.links and libspring-test-2.5-java.install
- * Bump Standards-Version to 3.8.1 (no changes needed)
- * Move all libspring2.5-* to "java" section
-
- [ Andreas Schildbach ]
- * Removed comment in debian/control, as it seems to confuse pbuilder
-
- [ Damien Raude-Morvan ]
- * Fix policy issue : Remove aspectj from libspring-2.5-aop-java Recommends
- since this package is not in main yet.
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 15:41:19 +0200
-
-libspring-2.5-java (2.5.5-1) unstable; urgency=low
-
- [ Andreas Schildbach ]
- * Initial release (Closes: #426259)
- * Created README.source, documenting preparation of original source archive
-
- [ Damien Raude-Morvan ]
- * Use dpath as patch system for packaging (debian/rules and debian/control)
- - 01_build_xml: Create /usr/share/java based classpath
- - 02_read_excludefile_build_xml: Read some excludesfile to exclude
- some java source file from build
- - 03_use_debian_asm2: Use debian ASM2 JAR instead of CGLIB-nodep version
- - 05_remove_glassfish_weaving: Remove usage of GlassFishLoadTimeWeaver
- - 06_no_jsf: There is no DFSG-free Java Server Faces so disable
- - 07_no_aspectj: AspectJ is not in main, so disable it
- - 08_glassfish_toplink: Use Toplink Essentials from Glassfish package
- * debian/watch: use Debian QA Sourceforge redirector for downloading from SF
- * debian/rules: create get-orig-source make rule for preparation of debian
- orig.tar.gz from upstream archives (as documented in README.source)
- * debian/control: Prepare all spring modules in separates packages
- - every Spring module would get is own Debian package
- - set Depends for all packages (based on Maven pom.xml dependencies)
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Sat, 14 Feb 2009 14:51:44 +0100
Copied: tags/libspring-2.5-java/2.5.6.SEC02-4/debian/changelog (from rev 13670, trunk/libspring-2.5-java/debian/changelog)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-4/debian/changelog (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-4/debian/changelog 2011-05-07 23:46:16 UTC (rev 13671)
@@ -0,0 +1,257 @@
+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
+ are libraries (conform to latest Debian Java Policy).
+ * d/patches/17_velocitytools2.diff: New patch to drop old code needed
+ only for (really) old velocity-tools. Fix FTBFS (Closes: #617868).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 14 Mar 2011 20:25:26 +0100
+
+libspring-2.5-java (2.5.6.SEC02-2) unstable; urgency=low
+
+ [ Miguel Landaeta ]
+ * Remove nonexistant B-D on libhibernate-entitymanager-java. (Closes: #593028).
+ * Bump Standards-Version to 3.9.1. No changes were needed.
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 16 Aug 2010 11:58:34 +0200
+
+libspring-2.5-java (2.5.6.SEC02-1) unstable; urgency=high
+
+ [ Miguel Landaeta ]
+ * Enable support for JavaServer Faces API. (Closes: #587835).
+ * Bump Standards-Version to 3.9.0. No changes were needed.
+
+ [ Damien Raude-Morvan ]
+ * New upstream security release (hence urgency=high)
+ - [SECURITY] Include fix for CVE-2010-1622:
+ Spring Framework execution of arbitrary code
+ * Enable support for Hessian API.
+ - Add B-D on libhessian-java
+ * Enable support for CommonJ API.
+ - Add B-D on libgeronimo-commonj-spec-java
+ * Enable support for JPA 1.0 API.
+ - Add B-D on libhibernate-entitymanager-java, libeclipselink-java
+ and libopenjpa-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Jul 2010 01:28:57 +0200
+
+libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
+
+ [ Onkar Shinde ]
+ * asm2 -> asm3 transition.
+ * Build a new package libspring-aspects-2.5-java and include
+ spring-aspects.jar file in it. This is needed to build xwork2.
+ (Closes: #582510)
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable
+ * Describe asm2 -> asm3 transition in d/README.Debian and in
+ d/patches/15_fix_build_with_asm3.diff
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 16 Jun 2010 21:17:02 +0200
+
+libspring-2.5-java (2.5.6.SEC01-9) unstable; urgency=low
+
+ [ Miguel Landaeta ]
+ * Enable support for Portlet API. (Closes: #578718).
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 26 Apr 2010 22:53:11 +0200
+
+libspring-2.5-java (2.5.6.SEC01-8) unstable; urgency=low
+
+ * New libspring-webmvc-struts-2.5-java binary package
+ for webmvc-struts.jar. (Closes: #570533)
+ Thanks to Arnaud Fontaine <arnau at debian.org>
+ * Fix debian/watch to track upstream 2.x releases from
+ spring-maintenance SVN tags.
+ Thanks to Per Wawra <debian.perfide at safersignup.com>.
+ * Replace B-D/D on glassfish-appserv by glassfish-javaee since
+ glassfish-appserv-jstl.jar is now in glassfish-appserv.
+ * Standards-Version to 3.8.4.
+ * Source format 3.0 (quilt).
+ * Move package duty under Debian Java Maintainers umbrella
+ and add myself to Uploaders.
+ * Disable JRuby scripting module and remove B-D since jruby Debian
+ package has moved to non-free archive.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 26 Feb 2010 20:26:51 +0100
+
+libspring-2.5-java (2.5.6.SEC01-7) unstable; urgency=low
+
+ * Fix compat with tiles 2.2.1 (split of modules)
+ - Build-Depends on libtiles-java >= 2.2.1
+ - Fix debian/classpath-debian
+ * Upgrade debian/copyright to DEP5
+ * Bump debhelper version to >= 7
+ - Replace dh_clean -k by dh_prep
+ - Refactor debian/rules by using "dh"
+ * Maven POMs:
+ - Add a Build-Depends-Indep dependency on maven-repo-helper
+ - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+ Maven repository
+ - Remove useless debian/*.{links,install} files
+ - debian/poms/*.xml: Debian crafted pom.xml files
+ - debian/rules: new get-orig-pom to update debian/poms/*.xml at new upstream
+ release.
+ * Replace Depends and Build-Depends on "jruby1.2" by "jruby" (1.4)
+ * Switch to quilt as patch system
+ - Build-Depends on quilt and remove dpatch
+ - Rewrite debian/README.source
+ - Use dh --with quilt
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 12 Dec 2009 15:03:37 +0100
+
+libspring-2.5-java (2.5.6.SEC01-6) unstable; urgency=low
+
+ * New 13_tiles_22 patch for compatibility with Tiles 2.2
+ - Describe this change in README.Debian
+ - Bump Build-Depends on libtiles-java (>= 2.2.0)
+ * Also bump Build-Depends on aspectj (>= 1.6.4)
+ * Remove unneeded Build-Depends on libservlet2.4-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 24 Oct 2009 20:46:45 +0200
+
+libspring-2.5-java (2.5.6.SEC01-5) unstable; urgency=low
+
+ * cglib2.1 (2.1.3) to cglib (2.2) transition:
+ - Build-Depends and Depends on libcglib-java instead of libcglib2.1-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 10 Oct 2009 21:49:08 +0200
+
+libspring-2.5-java (2.5.6.SEC01-4) unstable; urgency=low
+
+ * Migrate to JRuby 1.2 (JRuby 1.1 will be removed from unstable soon)
+ Thanks to Sebastien Delafond for report (Closes: #548807).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 29 Sep 2009 21:40:09 +0200
+
+libspring-2.5-java (2.5.6.SEC01-3) unstable; urgency=low
+
+ * Now build with jasperreports and aspectj helpers
+ - Add Build-Depends on libjasperreports-java and aspectj
+ in debian/control
+ - Add Recommends on aspectj for libspring-aop-2.5-java
+ - Update debian/excludesfiles/{main,tiger,tigermock} accordingly
+ - Add this JARs to debian/classpath-debian for build
+ - Update exclusion list in README.Debian
+ - Remove 07_no_aspectj patch
+ * New 12_aspectj_164 patch for compatibility with AspectJ version in Debian
+ * Downgrade glassfish-appserv to Suggests for libspring-web-2.5-java package
+ (Closes: #545500)
+ * Bump Standards-Version to 3.8.3: no changes needed
+ * Update my email address
+ * Set myself as Maintainer and move Andreas Schildbach to Uploaders
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 24 Sep 2009 21:26:10 +0200
+
+libspring-2.5-java (2.5.6.SEC01-2) unstable; urgency=low
+
+ [ Damien Raude-Morvan ]
+ * Update Vcs-* fields to pkg-java SVN repository
+ * Bump Standards-Version to 3.8.2:
+ - Update README.source to describe dpatch patch system
+
+ [ Andreas Schildbach ]
+ * Migrated Tomcat instrumentation dependency from libtomcat5.5-java
+ to libtomcat6-java, as Tomcat 5.5 is no more (Closes: #543122)
+
+ -- Andreas Schildbach <debian.org at schildbach.de> Sun, 23 Aug 2009 09:43:10 +0000
+
+libspring-2.5-java (2.5.6.SEC01-1) unstable; urgency=low
+
+ * New upstream release.
+ - [SECURITY] Include fix for CVE-2009-1190:
+ Spring Framework Remote Denial of Service Vulnerability
+ * Refresh all debian/patches to handle Spring linefeed change
+ * New patch 11_servlet_api_api to handle compat with
+ Servlet 2.5 and JSP 2.1 API's. Remove MockPageContext
+ from exclusion list in debian/excludesfiles/mainmock
+ * Use JRuby 1.1 instead of 1.0:
+ - debian/classpath-debian: replace jruby1.0 by jruby1.1
+ - debian/control: change Build-Depends for jruby1.1 package
+ and Suggest for spring-context package
+ - debian/patches/10_jruby_11.dpatch: update Spring
+ source code to be compliant with jruby 1.1
+ * Now build with testng:
+ - Add Build-Depends on testng in debian/control
+ - Add Recommends on testng to spring-test module
+ - Update debian/excludesfiles/tigermock
+ - Add this testng.jar to debian/classpath-debian
+ * debian/watch:
+ - new upstream releases are not on sf.net anymore
+ - upstream download site is not checkeable by uscan
+ (need POST request - form submit - to access to download area)
+ * debian/README.Debian: complete list of changes regarding upstream modules
+ * debian/copyright: Debian packaging should be licenced under same licence as
+ upstream. Clarify Apache 2.0 licence copyright attribution.
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 20:25:01 +0200
+
+libspring-2.5-java (2.5.5-2) UNRELEASED; urgency=low
+
+ [ Damien Raude-Morvan ]
+ * Now build with tiles and velocity-tools helpers:
+ - Add Build-Depends on libtiles-java and libvelocity-tools-java
+ in debian/control
+ - Update debian/excludesfiles/main accordingly
+ - Add this JAR to debian/classpath-debian to build
+ * New libspring-2.5-test-java debian package (include mock tools):
+ - Re-activate buildmock target in 01_build_xml patch
+ - Build-Depends on junit4 (>= 4.5) in debian/control
+ - New 09_junit_45 patch to build Spring 2.5 with JUnit 4.5
+ - Add debian/excludesfiles/tigermock and debian/excludesfiles/mainmock
+ to exclude some classes from build
+ - Update 02_read_excludefile_build_xml patch to read these files
+ - Add libspring-test-2.5-java.links and libspring-test-2.5-java.install
+ * Bump Standards-Version to 3.8.1 (no changes needed)
+ * Move all libspring2.5-* to "java" section
+
+ [ Andreas Schildbach ]
+ * Removed comment in debian/control, as it seems to confuse pbuilder
+
+ [ Damien Raude-Morvan ]
+ * Fix policy issue : Remove aspectj from libspring-2.5-aop-java Recommends
+ since this package is not in main yet.
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 15:41:19 +0200
+
+libspring-2.5-java (2.5.5-1) unstable; urgency=low
+
+ [ Andreas Schildbach ]
+ * Initial release (Closes: #426259)
+ * Created README.source, documenting preparation of original source archive
+
+ [ Damien Raude-Morvan ]
+ * Use dpath as patch system for packaging (debian/rules and debian/control)
+ - 01_build_xml: Create /usr/share/java based classpath
+ - 02_read_excludefile_build_xml: Read some excludesfile to exclude
+ some java source file from build
+ - 03_use_debian_asm2: Use debian ASM2 JAR instead of CGLIB-nodep version
+ - 05_remove_glassfish_weaving: Remove usage of GlassFishLoadTimeWeaver
+ - 06_no_jsf: There is no DFSG-free Java Server Faces so disable
+ - 07_no_aspectj: AspectJ is not in main, so disable it
+ - 08_glassfish_toplink: Use Toplink Essentials from Glassfish package
+ * debian/watch: use Debian QA Sourceforge redirector for downloading from SF
+ * debian/rules: create get-orig-source make rule for preparation of debian
+ orig.tar.gz from upstream archives (as documented in README.source)
+ * debian/control: Prepare all spring modules in separates packages
+ - every Spring module would get is own Debian package
+ - set Depends for all packages (based on Maven pom.xml dependencies)
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Sat, 14 Feb 2009 14:51:44 +0100
Deleted: tags/libspring-2.5-java/2.5.6.SEC02-4/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control 2011-05-03 22:11:29 UTC (rev 13642)
+++ tags/libspring-2.5-java/2.5.6.SEC02-4/debian/control 2011-05-07 23:46:16 UTC (rev 13671)
@@ -1,194 +0,0 @@
-Source: libspring-2.5-java
-Section: java
-Priority: extra
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Schildbach <debian.org at schildbach.de>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
-Build-Depends-Indep: libcommons-logging-java, libcommons-attributes-java (>= 2.2-4), libaopalliance-java,
- libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm3-java,
- libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
- libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
- libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
- 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,
- 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
-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/
-
-Package: libspring-core-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libasm3-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
-Recommends: libcommons-attributes-java
-Description: modular Java/J2EE application framework - Core
- 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
- common practices in the industry.
- .
- This package provide spring-core.jar : Core abstractions and utilities,
- source-level metadata support.
-
-Package: libspring-beans-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-2.5-java, libcglib-java
-Description: modular Java/J2EE application framework - Beans
- 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
- common practices in the industry.
- .
- This package provide spring-beans.jar : JavaBeans support and bean container.
-
-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
-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
- common practices in the industry.
- .
- This package provide spring-aop.jar : Aspect-oriented programming framework.
-
-Package: libspring-context-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-beans-2.5-java
-Recommends: libspring-aop-2.5-java, glassfish-javaee
-Suggests: bsh, groovy
-Description: modular Java/J2EE application framework - Context
- 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
- common practices in the industry.
- .
- This package provide spring-context.jar : application context, JNDI, JMX,
- instrumentation, remoting, scripting, scheduling and validation
-
-Package: libspring-context-support-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-context-2.5-java
-Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity,
- libgeronimo-commonj-spec-java
-Description: modular Java/J2EE application framework - Context Support
- 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
- common practices in the industry.
- .
- This package provide spring-context-support.jar : Quartz/CommonJ scheduling,
- UI templating, mail and caching
-
-Package: libspring-web-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-context-2.5-java
-Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java, libjsf-api-java, libhessian-java
-Suggests: glassfish-javaee
-Description: modular Java/J2EE application framework - Web
- 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
- common practices in the industry.
- .
- This package provide spring-web.jar : web application context, multipart
- resolver, HTTP-based remoting support
-
-Package: libspring-webmvc-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-web-2.5-java
-Recommends: libspring-context-support-2.5-java, libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
-Description: modular Java/J2EE application framework - MVC
- 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
- common practices in the industry.
- .
- This package provide spring-webmvc.jar : framework servlets, web MVC framework,
- web controllers, web views for JSP, Velocity, Tiles, iText and POI
-
-Package: libspring-webmvc-struts-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-webmvc-2.5-java, libstruts1.2-java
-Description: modular Java/J2EE application framework - Struts MVC
- 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
- common practices in the industry.
- .
- This package provide spring-webmvc-struts.jar : integrate a Struts
- application with Spring
-
-Package: libspring-webmvc-portlet-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-webmvc-2.5-java, libportlet-api-2.0-spec-java, libcommons-fileupload-java
-Description: modular Java/J2EE application framework - Portlet MVC
- 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
- common practices in the industry.
- .
- This package provide spring-webmvc-portlet.jar : support development of Portlet
- applications with Spring
-
-Package: libspring-test-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-2.5-java
-Recommends: junit4 (>= 4.5), testng
-Description: modular Java/J2EE application framework - Test helpers
- 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
- common practices in the industry.
- .
- This package provide spring-test.jar : unit-testing helpers and mock
- classes
-
-Package: libspring-tx-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-2.5-java
-Recommends: libspring-aop-2.5-java, libspring-context-2.5-java, glassfish-javaee
-Description: modular Java/J2EE application framework - transaction
- 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
- common practices in the industry.
- .
- This package provide spring-tx.jar : transaction infrastructure, JCA support,
- DAO support
-
-Package: libspring-jdbc-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-beans-2.5-java, libspring-tx-2.5-java, libc3p0-java
-Description: modular Java/J2EE application framework - JDBC tools
- 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
- common practices in the industry.
- .
- This package provide spring-jdbc.jar : Java DataBase Connectivity support
-
-Package: libspring-jms-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-beans-2.5-java, libspring-tx-2.5-java, glassfish-javaee
-Description: modular Java/J2EE application framework - JMS tools
- 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
- common practices in the industry.
- .
- This package provide spring-jms.jar : Java Message Service 1.0.2/1.1 support
-
-Package: libspring-orm-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-jdbc-2.5-java
-Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
- libeclipselink-java, libopenjpa-java
-Description: modular Java/J2EE application framework - ORM tools
- 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
- common practices in the industry.
- .
- This package provide spring-orm.jar : JDO support, JPA support, Hibernate
- support, TopLink support, iBATIS support
-
-Package: libspring-aspects-2.5-java
-Architecture: all
-Depends: ${misc:Depends}
-Description: modular Java/J2EE application framework - Bundled aspects
- 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
- common practices in the industry.
- .
- This package provide spring-aspects.jar.
Copied: tags/libspring-2.5-java/2.5.6.SEC02-4/debian/control (from rev 13670, trunk/libspring-2.5-java/debian/control)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-4/debian/control (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-4/debian/control 2011-05-07 23:46:16 UTC (rev 13671)
@@ -0,0 +1,194 @@
+Source: libspring-2.5-java
+Section: java
+Priority: extra
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Andreas Schildbach <debian.org at schildbach.de>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
+Build-Depends-Indep: libcommons-logging-java, libcommons-attributes-java (>= 2.2-4), libaopalliance-java,
+ libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm3-java,
+ libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
+ libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
+ libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
+ 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, 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.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/
+
+Package: libspring-core-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libasm3-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
+Recommends: libcommons-attributes-java
+Description: modular Java/J2EE application framework - Core
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-core.jar : Core abstractions and utilities,
+ source-level metadata support.
+
+Package: libspring-beans-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-2.5-java, libcglib-java
+Description: modular Java/J2EE application framework - Beans
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-beans.jar : JavaBeans support and bean container.
+
+Package: libspring-aop-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
+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
+ common practices in the industry.
+ .
+ This package provide spring-aop.jar : Aspect-oriented programming framework.
+
+Package: libspring-context-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-beans-2.5-java
+Recommends: libspring-aop-2.5-java, glassfish-javaee
+Suggests: bsh, groovy
+Description: modular Java/J2EE application framework - Context
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-context.jar : application context, JNDI, JMX,
+ instrumentation, remoting, scripting, scheduling and validation
+
+Package: libspring-context-support-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-context-2.5-java
+Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity,
+ libgeronimo-commonj-spec-java
+Description: modular Java/J2EE application framework - Context Support
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-context-support.jar : Quartz/CommonJ scheduling,
+ UI templating, mail and caching
+
+Package: libspring-web-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-context-2.5-java
+Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java, libjsf-api-java, libhessian-java
+Suggests: glassfish-javaee
+Description: modular Java/J2EE application framework - Web
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-web.jar : web application context, multipart
+ resolver, HTTP-based remoting support
+
+Package: libspring-webmvc-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-web-2.5-java
+Recommends: libspring-context-support-2.5-java, libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
+Description: modular Java/J2EE application framework - MVC
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-webmvc.jar : framework servlets, web MVC framework,
+ web controllers, web views for JSP, Velocity, Tiles, iText and POI
+
+Package: libspring-webmvc-struts-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-webmvc-2.5-java, libstruts1.2-java
+Description: modular Java/J2EE application framework - Struts MVC
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-webmvc-struts.jar : integrate a Struts
+ application with Spring
+
+Package: libspring-webmvc-portlet-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-webmvc-2.5-java, libportlet-api-2.0-spec-java, libcommons-fileupload-java
+Description: modular Java/J2EE application framework - Portlet MVC
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-webmvc-portlet.jar : support development of Portlet
+ applications with Spring
+
+Package: libspring-test-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-2.5-java
+Recommends: junit4 (>= 4.5), testng
+Description: modular Java/J2EE application framework - Test helpers
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-test.jar : unit-testing helpers and mock
+ classes
+
+Package: libspring-tx-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-2.5-java
+Recommends: libspring-aop-2.5-java, libspring-context-2.5-java, glassfish-javaee
+Description: modular Java/J2EE application framework - transaction
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-tx.jar : transaction infrastructure, JCA support,
+ DAO support
+
+Package: libspring-jdbc-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-beans-2.5-java, libspring-tx-2.5-java, libc3p0-java
+Description: modular Java/J2EE application framework - JDBC tools
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-jdbc.jar : Java DataBase Connectivity support
+
+Package: libspring-jms-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-beans-2.5-java, libspring-tx-2.5-java, glassfish-javaee
+Description: modular Java/J2EE application framework - JMS tools
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-jms.jar : Java Message Service 1.0.2/1.1 support
+
+Package: libspring-orm-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-jdbc-2.5-java
+Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
+ libeclipselink-java, libopenjpa-java
+Description: modular Java/J2EE application framework - ORM tools
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-orm.jar : JDO support, JPA support, Hibernate
+ support, TopLink support, iBATIS support
+
+Package: libspring-aspects-2.5-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: modular Java/J2EE application framework - Bundled aspects
+ 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
+ common practices in the industry.
+ .
+ This package provide spring-aspects.jar.
Copied: tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/18_hibernate_36.diff (from rev 13670, trunk/libspring-2.5-java/debian/patches/18_hibernate_36.diff)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/18_hibernate_36.diff (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/18_hibernate_36.diff 2011-05-07 23:46:16 UTC (rev 13671)
@@ -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 {
Deleted: tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series 2011-05-03 22:11:29 UTC (rev 13642)
+++ tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/series 2011-05-07 23:46:16 UTC (rev 13671)
@@ -1,16 +0,0 @@
-01_build_xml.diff
-02_read_excludefile_build_xml.diff
-03_use_debian_asm2.diff
-04_remove_oc4j_weaving.diff
-05_remove_glassfish_weaving.diff
-#06_no_jsf.diff
-08_use_glasshfish_toplink.diff
-09_junit_45.diff
-#10_jruby_11.diff
-11_servlet_jsp_api.diff
-12_aspectj_164.diff
-13_tiles_22.diff
-14_portlet_api.diff
-15_fix_build_with_asm3.diff
-16_commonj.diff
-17_velocitytools2.diff
Copied: tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/series (from rev 13670, trunk/libspring-2.5-java/debian/patches/series)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/series (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-4/debian/patches/series 2011-05-07 23:46:16 UTC (rev 13671)
@@ -0,0 +1,17 @@
+01_build_xml.diff
+02_read_excludefile_build_xml.diff
+03_use_debian_asm2.diff
+04_remove_oc4j_weaving.diff
+05_remove_glassfish_weaving.diff
+#06_no_jsf.diff
+08_use_glasshfish_toplink.diff
+09_junit_45.diff
+#10_jruby_11.diff
+11_servlet_jsp_api.diff
+12_aspectj_164.diff
+13_tiles_22.diff
+14_portlet_api.diff
+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