[pkg-java] r12942 - in tags/libspring-java: . 3.0.4.RELEASE-1/debian 3.0.4.RELEASE-1/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Tue Aug 24 22:35:34 UTC 2010
Author: drazzib
Date: 2010-08-24 22:35:34 +0000 (Tue, 24 Aug 2010)
New Revision: 12942
Added:
tags/libspring-java/3.0.4.RELEASE-1/
tags/libspring-java/3.0.4.RELEASE-1/debian/build-classpath
tags/libspring-java/3.0.4.RELEASE-1/debian/changelog
tags/libspring-java/3.0.4.RELEASE-1/debian/control
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0001_use_debian_asm3.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0002_ivy_dependencies.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0005_commonj.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0007_no_jruby.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0009_hibernate_validator_41.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/series
Removed:
tags/libspring-java/3.0.4.RELEASE-1/debian/build-classpath
tags/libspring-java/3.0.4.RELEASE-1/debian/changelog
tags/libspring-java/3.0.4.RELEASE-1/debian/control
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0001_use_debian_asm3.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0002_ivy_dependencies.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0005_commonj.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0007_no_jruby.diff
tags/libspring-java/3.0.4.RELEASE-1/debian/patches/series
Log:
[svn-buildpackage] Tagging libspring-java 3.0.4.RELEASE-1
Deleted: tags/libspring-java/3.0.4.RELEASE-1/debian/build-classpath
===================================================================
--- trunk/libspring-java/debian/build-classpath 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/build-classpath 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,80 +0,0 @@
-# Build system
-/usr/share/java/ivy.jar
-/usr/share/java/org.springframework.build.ant.jar
-/usr/share/java/ecj.jar
-
-# Global Classpath
-/usr/share/java/aopalliance.jar
-/usr/share/java/asm3-commons.jar
-/usr/share/java/asm3.jar
-/usr/share/java/aspectjrt.jar
-/usr/share/java/aspectjtools.jar
-/usr/share/java/aspectjweaver.jar
-/usr/share/java/atinject-jsr330-api.jar
-/usr/share/java/axis-jaxrpc.jar
-/usr/share/java/backport-util-concurrent.jar
-/usr/share/java/bsh.jar
-/usr/share/java/c3p0.jar
-/usr/share/java/castor-core.jar
-/usr/share/java/castor-xml.jar
-/usr/share/java/catalina.jar
-/usr/share/java/cglib.jar
-/usr/share/java/commons-beanutils.jar
-/usr/share/java/commons-collections3.jar
-/usr/share/java/commons-fileupload.jar
-/usr/share/java/commons-httpclient.jar
-/usr/share/java/commons-logging.jar
-/usr/share/java/commons-pool.jar
-/usr/share/java/dom4j.jar
-/usr/share/java/eclipselink.jar
-/usr/share/java/ehcache.jar
-/usr/share/java/el-api-2.1.jar
-/usr/share/java/freemarker.jar
-/usr/share/java/geronimo-commonj-spec.jar
-/usr/share/java/geronimo-ejb-3.0-spec.jar
-/usr/share/java/geronimo-interceptor-3.0-spec.jar
-/usr/share/java/geronimo-j2ee-connector-1.5-spec.jar
-/usr/share/java/geronimo-jms-1.1-spec.jar
-/usr/share/java/geronimo-jpa-2.0-spec.jar
-/usr/share/java/geronimo-validation.jar
-/usr/share/java/glassfish-appserv-jstl.jar
-# Just for javax.servlet.jsp.jstl.*
-/usr/share/java/glassfish-javaee.jar
-/usr/share/java/glassfish-jta.jar
-/usr/share/java/glassfish-mail.jar
-/usr/share/java/glassfish-toplink-essentials.jar
-/usr/share/java/groovy.jar
-/usr/share/java/hessian.jar
-/usr/share/java/hibernate-annotations.jar
-/usr/share/java/hibernate-core.jar
-/usr/share/java/hibernate-entitymanager.jar
-/usr/share/java/ibatis.jar
-/usr/share/java/itext.jar
-/usr/share/java/jackson-core.jar
-/usr/share/java/jackson-mapper.jar
-/usr/share/java/jakarta-poi.jar
-/usr/share/java/jamon.jar
-/usr/share/java/jasperreports.jar
-/usr/share/java/jboss-vfs.jar
-/usr/share/java/jdo2-api.jar
-/usr/share/java/jibx-run-1.2.1.jar
-/usr/share/java/joda-time.jar
-/usr/share/java/jsf-api.jar
-/usr/share/java/jsp-api-2.1.jar
-/usr/share/java/junit4.jar
-/usr/share/java/jxl.jar
-/usr/share/java/openjpa.jar
-/usr/share/java/portlet-api.jar
-/usr/share/java/quartz.jar
-/usr/share/java/rome.jar
-/usr/share/java/struts-1.2.jar
-/usr/share/java/testng.jar
-/usr/share/java/tiles-api.jar
-/usr/share/java/tiles-core.jar
-/usr/share/java/tiles-el.jar
-/usr/share/java/tiles-jsp.jar
-/usr/share/java/tiles-servlet.jar
-/usr/share/java/velocity.jar
-/usr/share/java/velocity-tools-view.jar
-/usr/share/java/xmlbeans.jar
-/usr/share/java/xstream.jar
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/build-classpath (from rev 12939, trunk/libspring-java/debian/build-classpath)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/build-classpath (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/build-classpath 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,81 @@
+# Build system
+/usr/share/java/ivy.jar
+/usr/share/java/org.springframework.build.ant.jar
+/usr/share/java/ecj.jar
+
+# Global Classpath
+/usr/share/java/aopalliance.jar
+/usr/share/java/asm3-commons.jar
+/usr/share/java/asm3.jar
+/usr/share/java/aspectjrt.jar
+/usr/share/java/aspectjtools.jar
+/usr/share/java/aspectjweaver.jar
+/usr/share/java/atinject-jsr330-api.jar
+/usr/share/java/axis-jaxrpc.jar
+/usr/share/java/backport-util-concurrent.jar
+/usr/share/java/bsh.jar
+/usr/share/java/c3p0.jar
+/usr/share/java/castor-core.jar
+/usr/share/java/castor-xml.jar
+/usr/share/java/catalina.jar
+/usr/share/java/cglib.jar
+/usr/share/java/commons-beanutils.jar
+/usr/share/java/commons-collections3.jar
+/usr/share/java/commons-fileupload.jar
+/usr/share/java/commons-httpclient.jar
+/usr/share/java/commons-logging.jar
+/usr/share/java/commons-pool.jar
+/usr/share/java/dom4j.jar
+/usr/share/java/eclipselink.jar
+/usr/share/java/ehcache.jar
+/usr/share/java/el-api-2.1.jar
+/usr/share/java/freemarker.jar
+/usr/share/java/geronimo-commonj-spec.jar
+/usr/share/java/geronimo-ejb-3.0-spec.jar
+/usr/share/java/geronimo-interceptor-3.0-spec.jar
+/usr/share/java/geronimo-j2ee-connector-1.5-spec.jar
+/usr/share/java/geronimo-jms-1.1-spec.jar
+/usr/share/java/geronimo-jpa-2.0-spec.jar
+/usr/share/java/geronimo-validation.jar
+/usr/share/java/glassfish-appserv-jstl.jar
+# Just for javax.servlet.jsp.jstl.*
+/usr/share/java/glassfish-javaee.jar
+/usr/share/java/glassfish-jta.jar
+/usr/share/java/glassfish-mail.jar
+/usr/share/java/glassfish-toplink-essentials.jar
+/usr/share/java/groovy.jar
+/usr/share/java/hessian.jar
+/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
+/usr/share/java/jackson-mapper.jar
+/usr/share/java/jakarta-poi.jar
+/usr/share/java/jamon.jar
+/usr/share/java/jasperreports.jar
+/usr/share/java/jboss-vfs.jar
+/usr/share/java/jdo2-api.jar
+/usr/share/java/jibx-run-1.2.1.jar
+/usr/share/java/joda-time.jar
+/usr/share/java/jsf-api.jar
+/usr/share/java/jsp-api-2.1.jar
+/usr/share/java/junit4.jar
+/usr/share/java/jxl.jar
+/usr/share/java/openjpa.jar
+/usr/share/java/portlet-api.jar
+/usr/share/java/quartz.jar
+/usr/share/java/rome.jar
+/usr/share/java/struts-1.2.jar
+/usr/share/java/testng.jar
+/usr/share/java/tiles-api.jar
+/usr/share/java/tiles-core.jar
+/usr/share/java/tiles-el.jar
+/usr/share/java/tiles-jsp.jar
+/usr/share/java/tiles-servlet.jar
+/usr/share/java/velocity.jar
+/usr/share/java/velocity-tools-view.jar
+/usr/share/java/xmlbeans.jar
+/usr/share/java/xstream.jar
Deleted: tags/libspring-java/3.0.4.RELEASE-1/debian/changelog
===================================================================
--- trunk/libspring-java/debian/changelog 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/changelog 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,222 +0,0 @@
-libspring-java (3.0.3.RELEASE-1) UNRELEASED; urgency=low
-
- * New major upstream release.
- - rename packages to match libspring-*-java convention
- - build using spring-build-script Ant+Ivy infrastructure
- - completely rework B-D and Depends for all packages
- based on Maven metadata
- * Drop Andreas from Uploaders
- * Add Miguel Landaeta as Uploaders
- * Bump Standards-Version to 3.9.0: no changes needed.
- * Use mh_clean in clean target:
- - Build-Depends on maven-repo-helper >= 1.1
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 05 Jul 2010 21:21:49 +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-java/3.0.4.RELEASE-1/debian/changelog (from rev 12939, trunk/libspring-java/debian/changelog)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/changelog (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/changelog 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,222 @@
+libspring-java (3.0.4.RELEASE-1) experimental; urgency=low
+
+ * New major upstream release.
+ - rename packages to match libspring-*-java convention
+ - build using spring-build-script Ant+Ivy infrastructure
+ - completely rework B-D and Depends for all packages
+ based on Maven metadata
+ * Drop Andreas from Uploaders
+ * Add Miguel Landaeta as Uploaders
+ * Bump Standards-Version to 3.9.0: no changes needed.
+ * Use mh_clean in clean target:
+ - Build-Depends on maven-repo-helper >= 1.1
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 24 Aug 2010 22:54:05 +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-java/3.0.4.RELEASE-1/debian/control
===================================================================
--- trunk/libspring-java/debian/control 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/control 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,230 +0,0 @@
-Source: libspring-java
-Section: java
-Priority: extra
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Miguel Landaeta <miguel at miguel.cc>
-Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
-Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts,
- aspectj, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials,
- groovy, junit4 (>= 4.5), libaopalliance-java, libasm3-java, libatinject-jsr330-api-java,
- libaxis-java, libbackport-util-concurrent-java, libc3p0-java, libcastor-core-java, libcastor-xml-java,
- libcglib-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java,
- libcommons-httpclient-java, libcommons-logging-java, libcommons-pool-java, libdom4j-java, libecj-java,
- libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java,
- libgeronimo-ejb-3.0-spec-java, libgeronimo-interceptor-3.0-spec-java, libgeronimo-j2ee-connector-1.5-spec-java,
- libgeronimo-jms-1.1-spec-java, libgeronimo-jpa-2.0-spec-java, libgeronimo-validation-1.0-spec-java, libhessian-java,
- libhibernate3-java (>= 3.5), libibatis-java, libitext-java, libjackson-json-java, libjakarta-poi-java,
- libjamon-java, libjasperreports-java, libjboss-vfs-java, libjdo-api-java (>= 2.2), libjexcelapi-java,
- libjibx1.2-java, libjoda-time-java, libjsf-api-java, libopenjpa-java, libportlet-api-2.0-spec-java,
- 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
-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/
-
-Package: libspring-core-java
-Architecture: all
-Depends: ${misc:Depends}, libasm3-java, libcommons-logging-java
-Suggests: libcommons-collections3-java, liblog4j1.2-java, aspectj, libjboss-vfs-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 org.springframework.core.jar : Core abstractions and
- utilities, source-level metadata support.
-
-Package: libspring-beans-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libservlet2.5-java, libatinject-jsr330-api-java
-Suggests: 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 org.springframework.beans.jar : JavaBeans support and
- bean container.
-
-Package: libspring-aop-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libaopalliance-java
-Suggests: libjamon-java, libcglib-java, aspectj, libcommons-pool-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 org.springframework.aop.jar and
- org.springframework.aspects.jar: Aspect-oriented programming
- framework.
-
-Package: libspring-context-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-aop-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-core-java (= ${source:Version}), libspring-expression-java (= ${source:Version})
-Recommends: libspring-instrument-java (= ${source:Version}), libbackport-util-concurrent-java, libtomcat6-java, libgeronimo-ejb-3.0-spec-java, libatinject-jsr330-api-java, glassfish-javaee,
- libjodatime-java, libasm3-java, libaopalliance-java, libcglib-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java
-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 org.springframework.context.jar : application context,
- JNDI, JMX, instrumentation, remoting, scripting, scheduling and validation
-
-Package: libspring-context-support-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version}), libspring-core-java (= ${source:Version})
-Recommends: libspring-jdbc-java (= ${source:Version}), libspring-transaction-java (= ${source:Version})
-Suggests: 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 org.springframework.context.support.jar : Quartz
- scheduling, UI templating, mail and caching
-
-Package: libspring-web-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version}), libspring-core-java (= ${source:Version})
-Recommends: libspring-aop-java (= ${source:Version}), libspring-oxm-java (= ${source:Version})
-Suggests: libhessian-java, libcommons-httpclient-java, libaxis-java, libcommons-fileupload-java,
- libjackson-json-java
-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 org.springframework.web.jar : web application context,
- multipart resolver, HTTP-based remoting support.
-
-Package: libspring-web-servlet-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-web-java (= ${source:Version}), libservlet2.5-java
-Recommends: libspring-context-support-java (= ${source:Version}), libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
-Description: modular Java/J2EE application framework - Web Portlet
- 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 org.springframework.web.servlet.jar : framework servlets,
- web MVC framework, web controllers, web views for JSP, Velocity, Tiles, iText
- and POI.
-
-Package: libspring-web-struts-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-web-servlet-java (= ${source:Version}), 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 org.springframework.web.struts.jar : integrate a Struts
- application with Spring.
-
-Package: libspring-web-portlet-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-web-servlet-java (= ${source:Version})
-Recommends: libportlet-api-2.0-spec-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 org.springframework.web.portlet.jar : integrate JSR 286
- and JSR 168 API with Spring.
-
-Package: libspring-test-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-java (= ${source:Version})
-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 org.springframework.test.jar : unit-testing helpers and
- mock classes.
-
-Package: libspring-transaction-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-java (= ${source:Version})
-Recommends: libspring-aop-java (= ${source:Version}), libspring-context-java (= ${source:Version}), 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-transaction.jar : transaction infrastructure,
- JCA support, DAO support.
-
-Package: libspring-jdbc-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-transaction-java (= ${source:Version}), 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-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-transaction-java (= ${source:Version}), 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-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-jdbc-java (= ${source:Version})
-Recommends: libspring-web-java (= ${source:Version}), libjdo-api-java (>= 2.2), glassfish-toplink-essentials, libibatis-java, libhibernate3-java (>= 3.5), libdom4j-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-expression-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-java (= ${source:Version})
-Description: modular Java/J2EE application framework - Expression language
- 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 org.springframework.expression.jar : expression language
- for manipulating an object at runtime.
-
-Package: libspring-oxm-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version})
-Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java, libcastor-xml-java
-Description: modular Java/J2EE application framework - Object/XML Mapping
- 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 org.springframework.oxm.jar : marshaling and unmarshalling
- for XML with JAXB context and JiBX binding factories.
-
-Package: libspring-instrument-java
-Architecture: all
-Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version})
-Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java, libcastor-xml-java
-Description: modular Java/J2EE application framework - Instrumentation
- 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 org.springframework.instrument.jar and
- org.springframework.instrument.tomcat.jar: FIXME.
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/control (from rev 12939, trunk/libspring-java/debian/control)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/control (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/control 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,230 @@
+Source: libspring-java
+Section: java
+Priority: extra
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Miguel Landaeta <miguel at miguel.cc>
+Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
+Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts,
+ aspectj, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials,
+ groovy, junit4 (>= 4.5), libaopalliance-java, libasm3-java, libatinject-jsr330-api-java,
+ libaxis-java, libbackport-util-concurrent-java, libc3p0-java, libcastor-core-java, libcastor-xml-java,
+ libcglib-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java,
+ libcommons-httpclient-java, libcommons-logging-java, libcommons-pool-java, libdom4j-java, libecj-java,
+ libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java,
+ libgeronimo-ejb-3.0-spec-java, libgeronimo-interceptor-3.0-spec-java, libgeronimo-j2ee-connector-1.5-spec-java,
+ libgeronimo-jms-1.1-spec-java, libgeronimo-jpa-2.0-spec-java, libgeronimo-validation-1.0-spec-java, libhessian-java,
+ libhibernate3-java (>= 3.5), libibatis-java, libitext-java, libjackson-json-java, libjakarta-poi-java,
+ libjamon-java, libjasperreports-java, libjboss-vfs-java, libjdo-api-java (>= 2.2), libjexcelapi-java,
+ libjibx1.2-java, libjoda-time-java, libjsf-api-java, libopenjpa-java, libportlet-api-2.0-spec-java,
+ 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.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/
+
+Package: libspring-core-java
+Architecture: all
+Depends: ${misc:Depends}, libasm3-java, libcommons-logging-java
+Suggests: libcommons-collections3-java, liblog4j1.2-java, aspectj, libjboss-vfs-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 org.springframework.core.jar : Core abstractions and
+ utilities, source-level metadata support.
+
+Package: libspring-beans-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libservlet2.5-java, libatinject-jsr330-api-java
+Suggests: 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 org.springframework.beans.jar : JavaBeans support and
+ bean container.
+
+Package: libspring-aop-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libaopalliance-java
+Suggests: libjamon-java, libcglib-java, aspectj, libcommons-pool-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 org.springframework.aop.jar and
+ org.springframework.aspects.jar: Aspect-oriented programming
+ framework.
+
+Package: libspring-context-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-aop-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-core-java (= ${source:Version}), libspring-expression-java (= ${source:Version})
+Recommends: libspring-instrument-java (= ${source:Version}), libbackport-util-concurrent-java, libtomcat6-java, libgeronimo-ejb-3.0-spec-java, libatinject-jsr330-api-java, glassfish-javaee,
+ libjodatime-java, libasm3-java, libaopalliance-java, libcglib-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java
+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 org.springframework.context.jar : application context,
+ JNDI, JMX, instrumentation, remoting, scripting, scheduling and validation
+
+Package: libspring-context-support-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version}), libspring-core-java (= ${source:Version})
+Recommends: libspring-jdbc-java (= ${source:Version}), libspring-transaction-java (= ${source:Version})
+Suggests: 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 org.springframework.context.support.jar : Quartz
+ scheduling, UI templating, mail and caching
+
+Package: libspring-web-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version}), libspring-core-java (= ${source:Version})
+Recommends: libspring-aop-java (= ${source:Version}), libspring-oxm-java (= ${source:Version})
+Suggests: libhessian-java, libcommons-httpclient-java, libaxis-java, libcommons-fileupload-java,
+ libjackson-json-java
+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 org.springframework.web.jar : web application context,
+ multipart resolver, HTTP-based remoting support.
+
+Package: libspring-web-servlet-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-web-java (= ${source:Version}), libservlet2.5-java
+Recommends: libspring-context-support-java (= ${source:Version}), libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
+Description: modular Java/J2EE application framework - Web Portlet
+ 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 org.springframework.web.servlet.jar : framework servlets,
+ web MVC framework, web controllers, web views for JSP, Velocity, Tiles, iText
+ and POI.
+
+Package: libspring-web-struts-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-web-servlet-java (= ${source:Version}), 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 org.springframework.web.struts.jar : integrate a Struts
+ application with Spring.
+
+Package: libspring-web-portlet-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-web-servlet-java (= ${source:Version})
+Recommends: libportlet-api-2.0-spec-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 org.springframework.web.portlet.jar : integrate JSR 286
+ and JSR 168 API with Spring.
+
+Package: libspring-test-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-java (= ${source:Version})
+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 org.springframework.test.jar : unit-testing helpers and
+ mock classes.
+
+Package: libspring-transaction-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-java (= ${source:Version})
+Recommends: libspring-aop-java (= ${source:Version}), libspring-context-java (= ${source:Version}), 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-transaction.jar : transaction infrastructure,
+ JCA support, DAO support.
+
+Package: libspring-jdbc-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-transaction-java (= ${source:Version}), 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-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-beans-java (= ${source:Version}), libspring-transaction-java (= ${source:Version}), 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-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-jdbc-java (= ${source:Version})
+Recommends: libspring-web-java (= ${source:Version}), libjdo-api-java (>= 2.2), glassfish-toplink-essentials, libibatis-java, libhibernate3-java (>= 3.5), libdom4j-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-expression-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-java (= ${source:Version})
+Description: modular Java/J2EE application framework - Expression language
+ 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 org.springframework.expression.jar : expression language
+ for manipulating an object at runtime.
+
+Package: libspring-oxm-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version})
+Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java, libcastor-xml-java
+Description: modular Java/J2EE application framework - Object/XML Mapping
+ 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 org.springframework.oxm.jar : marshaling and unmarshalling
+ for XML with JAXB context and JiBX binding factories.
+
+Package: libspring-instrument-java
+Architecture: all
+Depends: ${misc:Depends}, libspring-core-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-context-java (= ${source:Version})
+Suggests: libxstream-java, libjibx1.2-java, libxmlbeans-java, libcastor-xml-java
+Description: modular Java/J2EE application framework - Instrumentation
+ 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 org.springframework.instrument.jar and
+ org.springframework.instrument.tomcat.jar: FIXME.
Deleted: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0001_use_debian_asm3.diff
===================================================================
--- trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0001_use_debian_asm3.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,261 +0,0 @@
-Description: Use ASM 3.x debian package instead of CGLIB-nodep:
- - change imports to org.objectweb.*
- - small fix to API usage
- - disable build of org.springframework.asm module
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-06-20
-Forwarded: no
---- a/projects/build-spring-framework/build.xml
-+++ b/projects/build-spring-framework/build.xml
-@@ -25,7 +25,6 @@
-
- <path id="bundles">
- <pathelement location="../org.springframework.spring-parent"/>
-- <pathelement location="../org.springframework.asm"/>
- <path refid="unit.test.bundles" />
- <pathelement location="../org.springframework.integration-tests"/>
- <pathelement location="../org.springframework.spring-library"/>
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
-@@ -28,12 +28,12 @@
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-
--import org.springframework.asm.ClassReader;
--import org.springframework.asm.Label;
--import org.springframework.asm.MethodVisitor;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.util.ClassUtils;
-
- /**
-@@ -111,7 +111,7 @@
- try {
- ClassReader classReader = new ClassReader(is);
- Map<Member, String[]> map = new ConcurrentHashMap<Member, String[]>();
-- classReader.accept(new ParameterNameDiscoveringVisitor(clazz, map), false);
-+ classReader.accept(new ParameterNameDiscoveringVisitor(clazz, map), 0);
- return map;
- }
- catch (IOException ex) {
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
-@@ -16,13 +16,13 @@
-
- package org.springframework.core.type.classreading;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.Attribute;
--import org.springframework.asm.ClassVisitor;
--import org.springframework.asm.FieldVisitor;
--import org.springframework.asm.MethodVisitor;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.Attribute;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.type.ClassMetadata;
- import org.springframework.util.ClassUtils;
-
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
-@@ -25,9 +25,9 @@
- import java.util.Map;
- import java.util.Set;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.annotation.AnnotationUtils;
- import org.springframework.util.ObjectUtils;
- import org.springframework.util.ReflectionUtils;
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
-@@ -23,9 +23,9 @@
- import java.util.Map;
- import java.util.Set;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.MethodVisitor;
--import org.springframework.asm.Type;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Type;
- import org.springframework.core.type.AnnotationMetadata;
- import org.springframework.core.type.MethodMetadata;
- import org.springframework.util.CollectionUtils;
-@@ -146,4 +146,4 @@
- annotatedMethods.addAll(list);
- return annotatedMethods;
- }
--}
-\ No newline at end of file
-+}
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
-@@ -19,11 +19,11 @@
- import java.util.LinkedHashMap;
- import java.util.Map;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.MethodAdapter;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.MethodAdapter;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.type.MethodMetadata;
- import org.springframework.util.MultiValueMap;
-
-@@ -95,4 +95,4 @@
- public String getDeclaringClassName() {
- return this.declaringClassName;
- }
--}
-\ No newline at end of file
-+}
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
-@@ -19,7 +19,7 @@
- import java.io.IOException;
- import java.io.InputStream;
-
--import org.springframework.asm.ClassReader;
-+import org.objectweb.asm.ClassReader;
- import org.springframework.core.io.Resource;
- import org.springframework.core.type.AnnotationMetadata;
- import org.springframework.core.type.ClassMetadata;
-@@ -51,7 +51,7 @@
- }
-
- AnnotationMetadataReadingVisitor visitor = new AnnotationMetadataReadingVisitor(classLoader);
-- classReader.accept(visitor, true);
-+ classReader.accept(visitor, ClassReader.SKIP_DEBUG);
-
- this.annotationMetadata = visitor;
- // (since AnnotationMetadataReader extends ClassMetadataReadingVisitor)
-@@ -70,4 +70,4 @@
- public AnnotationMetadata getAnnotationMetadata() {
- return this.annotationMetadata;
- }
--}
-\ No newline at end of file
-+}
---- a/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
-+++ b/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
-@@ -20,7 +20,7 @@
- import java.util.Iterator;
- import java.util.Map;
-
--import net.sf.cglib.asm.Type;
-+import org.objectweb.asm.Type;
- import net.sf.cglib.core.Signature;
- import net.sf.cglib.proxy.InterfaceMaker;
- import org.apache.commons.logging.Log;
---- a/projects/org.springframework.aop/ivy.xml
-+++ b/projects/org.springframework.aop/ivy.xml
-@@ -36,7 +36,7 @@
- <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.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.beans/ivy.xml
-+++ b/projects/org.springframework.beans/ivy.xml
-@@ -30,7 +30,7 @@
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
- </dependencies>
-
- </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"/>
- <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.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"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.core/ivy.xml
-+++ b/projects/org.springframework.core/ivy.xml
-@@ -26,7 +26,7 @@
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
- <!-- test dependencies -->
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
---- a/projects/org.springframework.integration-tests/ivy.xml
-+++ b/projects/org.springframework.integration-tests/ivy.xml
-@@ -73,7 +73,7 @@
- <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
- <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
- <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->compile"/>
---- a/projects/org.springframework.spring-library/ivy.xml
-+++ b/projects/org.springframework.spring-library/ivy.xml
-@@ -19,7 +19,7 @@
-
- <dependencies>
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.web.portlet/ivy.xml
-+++ b/projects/org.springframework.web.portlet/ivy.xml
-@@ -33,7 +33,7 @@
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
- </dependencies>
---- a/projects/org.springframework.web.servlet/ivy.xml
-+++ b/projects/org.springframework.web.servlet/ivy.xml
-@@ -83,8 +83,8 @@
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0"
- conf="test->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration"
-- conf="test->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration"
-+ conf="test->compile"/>-->
- <dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0"
- conf="test->compile"/>
- <dependency org="org.dom4j" name="com.springsource.org.dom4j" rev="1.6.1" conf="test->compile"/>
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0001_use_debian_asm3.diff (from rev 12939, trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0001_use_debian_asm3.diff (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0001_use_debian_asm3.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,261 @@
+Description: Use ASM 3.x debian package instead of CGLIB-nodep:
+ - change imports to org.objectweb.*
+ - small fix to API usage
+ - disable build of org.springframework.asm module
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-20
+Forwarded: no
+--- a/projects/build-spring-framework/build.xml
++++ b/projects/build-spring-framework/build.xml
+@@ -25,7 +25,6 @@
+
+ <path id="bundles">
+ <pathelement location="../org.springframework.spring-parent"/>
+- <pathelement location="../org.springframework.asm"/>
+ <path refid="unit.test.bundles" />
+ <pathelement location="../org.springframework.integration-tests"/>
+ <pathelement location="../org.springframework.spring-library"/>
+--- a/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+@@ -28,12 +28,12 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+-import org.springframework.asm.ClassReader;
+-import org.springframework.asm.Label;
+-import org.springframework.asm.MethodVisitor;
+-import org.springframework.asm.Opcodes;
+-import org.springframework.asm.Type;
+-import org.springframework.asm.commons.EmptyVisitor;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.EmptyVisitor;
+ import org.springframework.util.ClassUtils;
+
+ /**
+@@ -111,7 +111,7 @@
+ try {
+ ClassReader classReader = new ClassReader(is);
+ Map<Member, String[]> map = new ConcurrentHashMap<Member, String[]>();
+- classReader.accept(new ParameterNameDiscoveringVisitor(clazz, map), false);
++ classReader.accept(new ParameterNameDiscoveringVisitor(clazz, map), 0);
+ return map;
+ }
+ catch (IOException ex) {
+--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
+@@ -16,13 +16,13 @@
+
+ package org.springframework.core.type.classreading;
+
+-import org.springframework.asm.AnnotationVisitor;
+-import org.springframework.asm.Attribute;
+-import org.springframework.asm.ClassVisitor;
+-import org.springframework.asm.FieldVisitor;
+-import org.springframework.asm.MethodVisitor;
+-import org.springframework.asm.Opcodes;
+-import org.springframework.asm.commons.EmptyVisitor;
++import org.objectweb.asm.AnnotationVisitor;
++import org.objectweb.asm.Attribute;
++import org.objectweb.asm.ClassVisitor;
++import org.objectweb.asm.FieldVisitor;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.commons.EmptyVisitor;
+ import org.springframework.core.type.ClassMetadata;
+ import org.springframework.util.ClassUtils;
+
+--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
+@@ -25,9 +25,9 @@
+ import java.util.Map;
+ import java.util.Set;
+
+-import org.springframework.asm.AnnotationVisitor;
+-import org.springframework.asm.Type;
+-import org.springframework.asm.commons.EmptyVisitor;
++import org.objectweb.asm.AnnotationVisitor;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.EmptyVisitor;
+ import org.springframework.core.annotation.AnnotationUtils;
+ import org.springframework.util.ObjectUtils;
+ import org.springframework.util.ReflectionUtils;
+--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
+@@ -23,9 +23,9 @@
+ import java.util.Map;
+ import java.util.Set;
+
+-import org.springframework.asm.AnnotationVisitor;
+-import org.springframework.asm.MethodVisitor;
+-import org.springframework.asm.Type;
++import org.objectweb.asm.AnnotationVisitor;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Type;
+ import org.springframework.core.type.AnnotationMetadata;
+ import org.springframework.core.type.MethodMetadata;
+ import org.springframework.util.CollectionUtils;
+@@ -146,4 +146,4 @@
+ annotatedMethods.addAll(list);
+ return annotatedMethods;
+ }
+-}
+\ No newline at end of file
++}
+--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
+@@ -19,11 +19,11 @@
+ import java.util.LinkedHashMap;
+ import java.util.Map;
+
+-import org.springframework.asm.AnnotationVisitor;
+-import org.springframework.asm.MethodAdapter;
+-import org.springframework.asm.Opcodes;
+-import org.springframework.asm.Type;
+-import org.springframework.asm.commons.EmptyVisitor;
++import org.objectweb.asm.AnnotationVisitor;
++import org.objectweb.asm.MethodAdapter;
++import org.objectweb.asm.Opcodes;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.EmptyVisitor;
+ import org.springframework.core.type.MethodMetadata;
+ import org.springframework.util.MultiValueMap;
+
+@@ -95,4 +95,4 @@
+ public String getDeclaringClassName() {
+ return this.declaringClassName;
+ }
+-}
+\ No newline at end of file
++}
+--- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
++++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
+@@ -19,7 +19,7 @@
+ import java.io.IOException;
+ import java.io.InputStream;
+
+-import org.springframework.asm.ClassReader;
++import org.objectweb.asm.ClassReader;
+ import org.springframework.core.io.Resource;
+ import org.springframework.core.type.AnnotationMetadata;
+ import org.springframework.core.type.ClassMetadata;
+@@ -51,7 +51,7 @@
+ }
+
+ AnnotationMetadataReadingVisitor visitor = new AnnotationMetadataReadingVisitor(classLoader);
+- classReader.accept(visitor, true);
++ classReader.accept(visitor, ClassReader.SKIP_DEBUG);
+
+ this.annotationMetadata = visitor;
+ // (since AnnotationMetadataReader extends ClassMetadataReadingVisitor)
+@@ -70,4 +70,4 @@
+ public AnnotationMetadata getAnnotationMetadata() {
+ return this.annotationMetadata;
+ }
+-}
+\ No newline at end of file
++}
+--- a/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
++++ b/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
+@@ -20,7 +20,7 @@
+ import java.util.Iterator;
+ import java.util.Map;
+
+-import net.sf.cglib.asm.Type;
++import org.objectweb.asm.Type;
+ import net.sf.cglib.core.Signature;
+ import net.sf.cglib.proxy.InterfaceMaker;
+ import org.apache.commons.logging.Log;
+--- a/projects/org.springframework.aop/ivy.xml
++++ b/projects/org.springframework.aop/ivy.xml
+@@ -36,7 +36,7 @@
+ <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.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ </dependencies>
+
+ </ivy-module>
+--- a/projects/org.springframework.beans/ivy.xml
++++ b/projects/org.springframework.beans/ivy.xml
+@@ -30,7 +30,7 @@
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
+ </dependencies>
+
+ </ivy-module>
+--- a/projects/org.springframework.context/ivy.xml
++++ b/projects/org.springframework.context/ivy.xml
+@@ -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"/>
++<!-- <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"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+--- a/projects/org.springframework.core/ivy.xml
++++ b/projects/org.springframework.core/ivy.xml
+@@ -26,7 +26,7 @@
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
+ <!-- test dependencies -->
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+--- a/projects/org.springframework.integration-tests/ivy.xml
++++ b/projects/org.springframework.integration-tests/ivy.xml
+@@ -73,7 +73,7 @@
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
+ <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
+ <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->compile"/>
+--- a/projects/org.springframework.spring-library/ivy.xml
++++ b/projects/org.springframework.spring-library/ivy.xml
+@@ -19,7 +19,7 @@
+
+ <dependencies>
+ <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="compile->compile"/>
+--- a/projects/org.springframework.web.portlet/ivy.xml
++++ b/projects/org.springframework.web.portlet/ivy.xml
+@@ -33,7 +33,7 @@
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+ </dependencies>
+--- a/projects/org.springframework.web.servlet/ivy.xml
++++ b/projects/org.springframework.web.servlet/ivy.xml
+@@ -83,8 +83,8 @@
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0"
+ conf="test->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration"
+- conf="test->compile"/>
++<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration"
++ conf="test->compile"/>-->
+ <dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0"
+ conf="test->compile"/>
+ <dependency org="org.dom4j" name="com.springsource.org.dom4j" rev="1.6.1" conf="test->compile"/>
Deleted: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0002_ivy_dependencies.diff
===================================================================
--- trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0002_ivy_dependencies.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,384 +0,0 @@
-Description: Don't use Ivy for dependencies resolution
- as not enough debian packages provide Maven/Ivy metadata.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-06-20
-Forwarded: not-needed
---- a/projects/org.springframework.aop/ivy.xml
-+++ b/projects/org.springframework.aop/ivy.xml
-@@ -24,12 +24,14 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional, jamon->compile"/>
- <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
- <!-- test dependencies -->
---- a/projects/org.springframework.beans/ivy.xml
-+++ b/projects/org.springframework.beans/ivy.xml
-@@ -21,10 +21,12 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
- <dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="provided->compile"/>
- <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
- <!-- test dependencies -->
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
---- a/projects/org.springframework.context/ivy.xml
-+++ b/projects/org.springframework.context/ivy.xml
-@@ -32,6 +32,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <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"/>
- <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 @@
- <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 -->
-+<!--
- <dependency org="javax.inject" name="com.springsource.org.atinject.tck" rev="1.0.0" conf="provided->compile"/>
-+-->
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
- <dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="test->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="test->compile"/>
---- a/projects/org.springframework.integration-tests/ivy.xml
-+++ b/projects/org.springframework.integration-tests/ivy.xml
-@@ -19,6 +19,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="test->compile"/>
- <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="test->compile"/>
- <dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="test->compile"/>
-@@ -73,6 +74,7 @@
- <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
- <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
- <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
-+-->
- <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
---- a/projects/org.springframework.spring-library/ivy.xml
-+++ b/projects/org.springframework.spring-library/ivy.xml
-@@ -32,7 +32,7 @@
- <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
-+ <!--<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.web.portlet/ivy.xml
-+++ b/projects/org.springframework.web.portlet/ivy.xml
-@@ -21,6 +21,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
- <dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->compile"/>
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="compile->compile"/>
-@@ -28,6 +29,7 @@
- <dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="test->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" conf="optional, commons-fileupload->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.web.servlet/ivy.xml
-+++ b/projects/org.springframework.web.servlet/ivy.xml
-@@ -31,6 +31,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0"
- conf="optional, feed->compile"/>
- <dependency org="com.lowagie.text" name="com.springsource.com.lowagie.text" rev="2.0.8"
-@@ -64,6 +65,7 @@
- conf="optional, velocity->compile"/>
- <dependency org="org.codehaus.jackson" name="com.springsource.org.codehaus.jackson.mapper" rev="1.4.2"
- conf="optional, jackson->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
- conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
-@@ -98,7 +100,7 @@
- conf="test->compile"/>
- <dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA"
- conf="test->compile"/>
-- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
-+ <!--<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>-->
- <dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
- <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/>
---- a/projects/org.springframework.instrument.tomcat/ivy.xml
-+++ b/projects/org.springframework.instrument.tomcat/ivy.xml
-@@ -19,7 +19,9 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina" rev="6.0.16" conf="provided->compile"/>
-+-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.core/ivy.xml
-+++ b/projects/org.springframework.core/ivy.xml
-@@ -23,9 +23,11 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-+-->
- <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
- <!-- test dependencies -->
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
---- a/projects/org.springframework.expression/ivy.xml
-+++ b/projects/org.springframework.expression/ivy.xml
-@@ -21,7 +21,9 @@
-
- <dependencies>
- <!-- compile dependencies -->
-+<!--
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->runtime" />
-+-->
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->runtime" />
- <!-- test dependencies -->
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
---- a/projects/org.springframework.jdbc/ivy.xml
-+++ b/projects/org.springframework.jdbc/ivy.xml
-@@ -24,16 +24,20 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
-+<!--
- <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="optional->compile"/>
- <dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
- <dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
-+-->
- <!-- test dependencies -->
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
---- a/projects/org.springframework.transaction/ivy.xml
-+++ b/projects/org.springframework.transaction/ivy.xml
-@@ -23,12 +23,14 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="provided, websphere->compile"/>
- <dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
- <dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0" conf="provided, jca->compile"/>
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->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"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.orm/ivy.xml
-+++ b/projects/org.springframework.orm/ivy.xml
-@@ -31,6 +31,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="optional, toplink->compile"/>
- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="optional, aop->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
-@@ -45,6 +46,7 @@
- <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided, web->compile"/>
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="optional, aop->compile"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
---- a/projects/org.springframework.oxm/ivy.xml
-+++ b/projects/org.springframework.oxm/ivy.xml
-@@ -26,6 +26,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.1"
- conf="optional, xstream->compile"/>
- <dependency org="javax.xml.bind" name="com.springsource.javax.xml.bind" rev="2.1.7"
-@@ -34,13 +35,16 @@
- conf="optional, jibx->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
- conf="compile, commons-logging->compile"/>
-+-->
- <!--Xerces dependency should be removed when BRITS-259 is fixed-->
-+<!--
- <dependency org="org.apache.xerces" name="com.springsource.org.apache.xerces" rev="2.8.1"
- conf="optional, castor->compile"/>
- <dependency org="org.apache.xmlbeans" name="com.springsource.org.apache.xmlbeans" rev="2.4.0"
- conf="optional, xmlbeans->compile"/>
- <dependency org="org.codehaus.castor" name="com.springsource.org.castor" rev="1.2.0"
- conf="optional, castor->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
- conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
---- a/projects/org.springframework.jms/ivy.xml
-+++ b/projects/org.springframework.jms/ivy.xml
-@@ -21,6 +21,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided->compile"/>
- <dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0"
- conf="provided, jca->compile"/>
-@@ -31,6 +32,7 @@
- conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3"
- conf="optional, commons-pool->compile"/>
-+-->
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration"
---- a/projects/org.springframework.web/ivy.xml
-+++ b/projects/org.springframework.web/ivy.xml
-@@ -33,6 +33,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1"
- conf="optional, hessian, burlap->compile"/>
- <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0"
-@@ -64,6 +65,7 @@
- conf="optional, jackson->compile"/>
- <dependency org="org.jdom" name="com.springsource.org.jdom" rev="1.1.0"
- conf="optional, feed->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"
---- a/projects/org.springframework.context.support/ivy.xml
-+++ b/projects/org.springframework.context.support/ivy.xml
-@@ -29,6 +29,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="com.bea.commonj" name="com.springsource.commonj" rev="1.1.0" conf="optional, commonj->compile"/>
- <dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="optional, quartz->compile"/>
- <dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
-@@ -39,6 +40,7 @@
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional, velocity->compile"/>
- <dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.15" conf="optional, freemarker->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.aspects/ivy.xml
-+++ b/projects/org.springframework.aspects/ivy.xml
-@@ -23,8 +23,10 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
- <dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional, orm->compile"/>
-@@ -32,7 +34,9 @@
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
- <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.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
- </dependencies>
-
---- a/projects/org.springframework.test/ivy.xml
-+++ b/projects/org.springframework.test/ivy.xml
-@@ -20,6 +20,7 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
- <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
- <dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="test->compile"/>
-@@ -36,6 +37,7 @@
- <dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="optional->compile"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="optional->compile"/>
-@@ -45,7 +47,9 @@
- <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional->compile"/>
- <dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="optional->compile"/>
- <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="optional->compile"/>
-+<!--
- <dependency org="org.testng" name="com.springsource.org.testng" rev="${org.testng.version}" conf="optional->compile"/>
-+-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.web.struts/ivy.xml
-+++ b/projects/org.springframework.web.struts/ivy.xml
-@@ -21,12 +21,14 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
- conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
- conf="compile->compile"/>
- <dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
- conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0002_ivy_dependencies.diff (from rev 12939, trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0002_ivy_dependencies.diff (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0002_ivy_dependencies.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,384 @@
+Description: Don't use Ivy for dependencies resolution
+ as not enough debian packages provide Maven/Ivy metadata.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-20
+Forwarded: not-needed
+--- a/projects/org.springframework.aop/ivy.xml
++++ b/projects/org.springframework.aop/ivy.xml
+@@ -24,12 +24,14 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional, jamon->compile"/>
+ <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
+ <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+ <!-- test dependencies -->
+--- a/projects/org.springframework.beans/ivy.xml
++++ b/projects/org.springframework.beans/ivy.xml
+@@ -21,10 +21,12 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
+ <dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="provided->compile"/>
+ <dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+ <!-- test dependencies -->
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+--- a/projects/org.springframework.context/ivy.xml
++++ b/projects/org.springframework.context/ivy.xml
+@@ -32,6 +32,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <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"/>
+@@ -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"/>
+@@ -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 -->
++<!--
+ <dependency org="javax.inject" name="com.springsource.org.atinject.tck" rev="1.0.0" conf="provided->compile"/>
++-->
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
+ <dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="test->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="test->compile"/>
+--- a/projects/org.springframework.integration-tests/ivy.xml
++++ b/projects/org.springframework.integration-tests/ivy.xml
+@@ -19,6 +19,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="test->compile"/>
+ <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="test->compile"/>
+ <dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="test->compile"/>
+@@ -73,6 +74,7 @@
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
+ <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
+ <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
++-->
+ <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
+--- a/projects/org.springframework.spring-library/ivy.xml
++++ b/projects/org.springframework.spring-library/ivy.xml
+@@ -32,7 +32,7 @@
+ <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="compile->compile"/>
+- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
++ <!--<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>-->
+ </dependencies>
+
+ </ivy-module>
+--- a/projects/org.springframework.web.portlet/ivy.xml
++++ b/projects/org.springframework.web.portlet/ivy.xml
+@@ -21,6 +21,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
+ <dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->compile"/>
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="compile->compile"/>
+@@ -28,6 +29,7 @@
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="test->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" conf="optional, commons-fileupload->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+--- a/projects/org.springframework.web.servlet/ivy.xml
++++ b/projects/org.springframework.web.servlet/ivy.xml
+@@ -31,6 +31,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0"
+ conf="optional, feed->compile"/>
+ <dependency org="com.lowagie.text" name="com.springsource.com.lowagie.text" rev="2.0.8"
+@@ -64,6 +65,7 @@
+ conf="optional, velocity->compile"/>
+ <dependency org="org.codehaus.jackson" name="com.springsource.org.codehaus.jackson.mapper" rev="1.4.2"
+ conf="optional, jackson->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
+ conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
+@@ -98,7 +100,7 @@
+ conf="test->compile"/>
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA"
+ conf="test->compile"/>
+- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
++ <!--<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>-->
+ <dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/>
+--- a/projects/org.springframework.instrument.tomcat/ivy.xml
++++ b/projects/org.springframework.instrument.tomcat/ivy.xml
+@@ -19,7 +19,9 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina" rev="6.0.16" conf="provided->compile"/>
++-->
+ </dependencies>
+
+ </ivy-module>
+--- a/projects/org.springframework.core/ivy.xml
++++ b/projects/org.springframework.core/ivy.xml
+@@ -23,9 +23,11 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
++-->
+ <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
+ <!-- test dependencies -->
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
+--- a/projects/org.springframework.expression/ivy.xml
++++ b/projects/org.springframework.expression/ivy.xml
+@@ -21,7 +21,9 @@
+
+ <dependencies>
+ <!-- compile dependencies -->
++<!--
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->runtime" />
++-->
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->runtime" />
+ <!-- test dependencies -->
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+--- a/projects/org.springframework.jdbc/ivy.xml
++++ b/projects/org.springframework.jdbc/ivy.xml
+@@ -24,16 +24,20 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
++<!--
+ <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="optional->compile"/>
+ <dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
+ <dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
++-->
+ <!-- test dependencies -->
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+--- a/projects/org.springframework.transaction/ivy.xml
++++ b/projects/org.springframework.transaction/ivy.xml
+@@ -23,12 +23,14 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="provided, websphere->compile"/>
+ <dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
+ <dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0" conf="provided, jca->compile"/>
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
+ <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->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"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+--- a/projects/org.springframework.orm/ivy.xml
++++ b/projects/org.springframework.orm/ivy.xml
+@@ -31,6 +31,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="optional, toplink->compile"/>
+ <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="optional, aop->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+@@ -45,6 +46,7 @@
+ <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided, web->compile"/>
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="optional, aop->compile"/>
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
+--- a/projects/org.springframework.oxm/ivy.xml
++++ b/projects/org.springframework.oxm/ivy.xml
+@@ -26,6 +26,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.1"
+ conf="optional, xstream->compile"/>
+ <dependency org="javax.xml.bind" name="com.springsource.javax.xml.bind" rev="2.1.7"
+@@ -34,13 +35,16 @@
+ conf="optional, jibx->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
+ conf="compile, commons-logging->compile"/>
++-->
+ <!--Xerces dependency should be removed when BRITS-259 is fixed-->
++<!--
+ <dependency org="org.apache.xerces" name="com.springsource.org.apache.xerces" rev="2.8.1"
+ conf="optional, castor->compile"/>
+ <dependency org="org.apache.xmlbeans" name="com.springsource.org.apache.xmlbeans" rev="2.4.0"
+ conf="optional, xmlbeans->compile"/>
+ <dependency org="org.codehaus.castor" name="com.springsource.org.castor" rev="1.2.0"
+ conf="optional, castor->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
+ conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
+--- a/projects/org.springframework.jms/ivy.xml
++++ b/projects/org.springframework.jms/ivy.xml
+@@ -21,6 +21,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided->compile"/>
+ <dependency org="javax.resource" name="com.springsource.javax.resource" rev="1.5.0"
+ conf="provided, jca->compile"/>
+@@ -31,6 +32,7 @@
+ conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3"
+ conf="optional, commons-pool->compile"/>
++-->
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration"
+--- a/projects/org.springframework.web/ivy.xml
++++ b/projects/org.springframework.web/ivy.xml
+@@ -33,6 +33,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1"
+ conf="optional, hessian, burlap->compile"/>
+ <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0"
+@@ -64,6 +65,7 @@
+ conf="optional, jackson->compile"/>
+ <dependency org="org.jdom" name="com.springsource.org.jdom" rev="1.1.0"
+ conf="optional, feed->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"
+--- a/projects/org.springframework.context.support/ivy.xml
++++ b/projects/org.springframework.context.support/ivy.xml
+@@ -29,6 +29,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="com.bea.commonj" name="com.springsource.commonj" rev="1.1.0" conf="optional, commonj->compile"/>
+ <dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="optional, quartz->compile"/>
+ <dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
+@@ -39,6 +40,7 @@
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional, velocity->compile"/>
+ <dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.15" conf="optional, freemarker->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+--- a/projects/org.springframework.aspects/ivy.xml
++++ b/projects/org.springframework.aspects/ivy.xml
+@@ -23,8 +23,10 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
+ <dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional, orm->compile"/>
+@@ -32,7 +34,9 @@
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
+ <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="provided->compile"/>
++-->
+ <dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
+ </dependencies>
+
+--- a/projects/org.springframework.test/ivy.xml
++++ b/projects/org.springframework.test/ivy.xml
+@@ -20,6 +20,7 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
+ <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
+ <dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="test->compile"/>
+@@ -36,6 +37,7 @@
+ <dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="optional->compile"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/>
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="optional->compile"/>
+@@ -45,7 +47,9 @@
+ <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="optional->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="optional->compile"/>
++<!--
+ <dependency org="org.testng" name="com.springsource.org.testng" rev="${org.testng.version}" conf="optional->compile"/>
++-->
+ </dependencies>
+
+ </ivy-module>
+--- a/projects/org.springframework.web.struts/ivy.xml
++++ b/projects/org.springframework.web.struts/ivy.xml
+@@ -21,12 +21,14 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
+ conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
+ conf="compile->compile"/>
+ <dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
+ conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
Deleted: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0005_commonj.diff
===================================================================
--- trunk/libspring-java/debian/patches/0005_commonj.diff 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0005_commonj.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,52 +0,0 @@
-Description: Compatibility with CommonJ API provided by Geronimo project
- The references to the Work related exceptions are disabled because the
- build fails and the compiler emit messages like this:
- "Unreachable catch block for WorkException. This exception is never thrown
- from the try statement body".
-Author: Miguel Landaeta <miguel at miguel.cc>
-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
- public void execute(Runnable task) {
- Assert.state(this.workManager != null, "No WorkManager specified");
- Work work = new DelegatingWork(task);
-- try {
-+ //try {
- if (this.workListener != null) {
- this.workManager.schedule(work, this.workListener);
- }
- else {
- this.workManager.schedule(work);
- }
-- }
-+ //}
-+ /*
- catch (WorkRejectedException ex) {
- throw new TaskRejectedException("CommonJ WorkManager did not accept task: " + task, ex);
- }
- catch (WorkException ex) {
- throw new SchedulingException("Could not schedule task on CommonJ WorkManager", ex);
- }
-+ */
- }
-
- public void execute(Runnable task, long startTimeout) {
-@@ -191,13 +193,13 @@ public class WorkManagerTaskExecutor ext
- //-------------------------------------------------------------------------
-
- public WorkItem schedule(Work work)
-- throws WorkException, IllegalArgumentException {
-+ throws IllegalArgumentException {
-
- return this.workManager.schedule(work);
- }
-
- public WorkItem schedule(Work work, WorkListener workListener)
-- throws WorkException, IllegalArgumentException {
-+ throws IllegalArgumentException {
-
- return this.workManager.schedule(work, workListener);
- }
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0005_commonj.diff (from rev 12939, trunk/libspring-java/debian/patches/0005_commonj.diff)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0005_commonj.diff (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0005_commonj.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,52 @@
+Description: Compatibility with CommonJ API provided by Geronimo project
+ The references to the Work related exceptions are disabled because the
+ build fails and the compiler emit messages like this:
+ "Unreachable catch block for WorkException. This exception is never thrown
+ from the try statement body".
+Author: Miguel Landaeta <miguel at miguel.cc>
+Last-Update: 2010-07-04
+Forwarded: no
+
+--- 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);
+- try {
++ //try {
+ if (this.workListener != null) {
+ this.workManager.schedule(work, this.workListener);
+ }
+ else {
+ this.workManager.schedule(work);
+ }
+- }
++ //}
++ /*
+ catch (WorkRejectedException ex) {
+ throw new TaskRejectedException("CommonJ WorkManager did not accept task: " + task, ex);
+ }
+ catch (WorkException ex) {
+ throw new SchedulingException("Could not schedule task on CommonJ WorkManager", ex);
+ }
++ */
+ }
+
+ public void execute(Runnable task, long startTimeout) {
+@@ -191,13 +193,13 @@
+ //-------------------------------------------------------------------------
+
+ public WorkItem schedule(Work work)
+- throws WorkException, IllegalArgumentException {
++ throws IllegalArgumentException {
+
+ return this.workManager.schedule(work);
+ }
+
+ public WorkItem schedule(Work work, WorkListener workListener)
+- throws WorkException, IllegalArgumentException {
++ throws IllegalArgumentException {
+
+ return this.workManager.schedule(work, workListener);
+ }
Deleted: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0007_no_jruby.diff
===================================================================
--- trunk/libspring-java/debian/patches/0007_no_jruby.diff 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0007_no_jruby.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,23 +0,0 @@
-Description: JRuby is not available in main yet
-Author: Miguel Landaeta <miguel at miguel.cc>
-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
-@@ -4,4 +4,15 @@
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
- <import file="${basedir}/../spring-build/standard/default.xml"/>
-+
-+ <macrodef name="pre-compile">
-+ <attribute name="classpath.id"/>
-+ <attribute name="input.dir"/>
-+ <attribute name="output.dir"/>
-+ <attribute name="resources.dir"/>
-+ <sequential>
-+ <delete dir="${basedir}/src/main/java/org/springframework/scripting/jruby"/>
-+ </sequential>
-+ </macrodef>
-+
- </project>
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0007_no_jruby.diff (from rev 12939, trunk/libspring-java/debian/patches/0007_no_jruby.diff)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0007_no_jruby.diff (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0007_no_jruby.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,23 @@
+Description: JRuby is not available in main yet
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: not-needed
+Last-Update: 2010-07-01
+
+--- 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"/>
+ <import file="${basedir}/../spring-build/standard/default.xml"/>
++
++ <macrodef name="pre-compile">
++ <attribute name="classpath.id"/>
++ <attribute name="input.dir"/>
++ <attribute name="output.dir"/>
++ <attribute name="resources.dir"/>
++ <sequential>
++ <delete dir="${basedir}/src/main/java/org/springframework/scripting/jruby"/>
++ </sequential>
++ </macrodef>
++
+ </project>
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0009_hibernate_validator_41.diff (from rev 12939, trunk/libspring-java/debian/patches/0009_hibernate_validator_41.diff)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0009_hibernate_validator_41.diff (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/0009_hibernate_validator_41.diff 2010-08-24 22:35:34 UTC (rev 12942)
@@ -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 <drazzib at debian.org>
+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);
+- }
+-
+-}
Deleted: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series 2010-08-23 20:53:24 UTC (rev 12937)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/series 2010-08-24 22:35:34 UTC (rev 12942)
@@ -1,8 +0,0 @@
-0001_use_debian_asm3.diff
-0002_ivy_dependencies.diff
-0003_no_ibm_websphere.diff
-0004_no_derby_db.diff
-0005_commonj.diff
-0006_aspectj_classpath.diff
-0007_no_jruby.diff
-0008_jpa_20_api.diff
Copied: tags/libspring-java/3.0.4.RELEASE-1/debian/patches/series (from rev 12939, trunk/libspring-java/debian/patches/series)
===================================================================
--- tags/libspring-java/3.0.4.RELEASE-1/debian/patches/series (rev 0)
+++ tags/libspring-java/3.0.4.RELEASE-1/debian/patches/series 2010-08-24 22:35:34 UTC (rev 12942)
@@ -0,0 +1,9 @@
+0001_use_debian_asm3.diff
+0002_ivy_dependencies.diff
+0003_no_ibm_websphere.diff
+0004_no_derby_db.diff
+0005_commonj.diff
+0006_aspectj_classpath.diff
+0007_no_jruby.diff
+0008_jpa_20_api.diff
+0009_hibernate_validator_41.diff
More information about the pkg-java-commits
mailing list