[pkg-java] r12600 - in trunk: . libspring-java libspring-java/debian libspring-java/debian/patches libspring-java/debian/source
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Jun 20 19:25:06 UTC 2010
Author: drazzib
Date: 2010-06-20 19:25:01 +0000 (Sun, 20 Jun 2010)
New Revision: 12600
Added:
trunk/libspring-java/
trunk/libspring-java/debian/
trunk/libspring-java/debian/README.Debian
trunk/libspring-java/debian/README.source
trunk/libspring-java/debian/ant.properties
trunk/libspring-java/debian/build-classpath
trunk/libspring-java/debian/changelog
trunk/libspring-java/debian/compat
trunk/libspring-java/debian/control
trunk/libspring-java/debian/copyright
trunk/libspring-java/debian/docs
trunk/libspring-java/debian/maven.rules
trunk/libspring-java/debian/orig-tar.exclude
trunk/libspring-java/debian/orig-tar.sh
trunk/libspring-java/debian/patches/
trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff
trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff
trunk/libspring-java/debian/patches/0003_no_ibm_websphere.diff
trunk/libspring-java/debian/patches/0004_no_derby_db.diff
trunk/libspring-java/debian/patches/0005_no_commonj.diff
trunk/libspring-java/debian/patches/0006_aspectj_classpath.diff
trunk/libspring-java/debian/patches/series
trunk/libspring-java/debian/rules
trunk/libspring-java/debian/source/
trunk/libspring-java/debian/source/format
trunk/libspring-java/debian/watch
Log:
* FTBFS (missing Castor) !
* New major upstream release.
- rename packages to match libspring-*-java convention
- build using spring-build-script Ant+Ivy infrastructure
- completly rework B-D and Depends for all packages
based on Maven metadata
* Drop Andreas from Uploaders
* 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)
* Upload to unstable
* Describe asm2 -> asm3 transition in d/README.Debian and in
d/patches/15_fix_build_with_asm3.diff
* Enable support for Portlet API. (Closes: #578718).
* Upload to unstable.
* 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.
* 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
* 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
* cglib2.1 (2.1.3) to cglib (2.2) transition:
- Build-Depends and Depends on libcglib-java instead of libcglib2.1-java
* Migrate to JRuby 1.2 (JRuby 1.1 will be removed from unstable soon)
Thanks to Sebastien Delafond for report (Closes: #548807).
* 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
* Update Vcs-* fields to pkg-java SVN repository
* Bump Standards-Version to 3.8.2:
- Update README.source to describe dpatch patch system
* Migrated Tomcat instrumentation dependency from libtomcat5.5-java
to libtomcat6-java, as Tomcat 5.5 is no more (Closes: #543122)
* 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.
* 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
* Removed comment in debian/control, as it seems to confuse pbuilder
* Fix policy issue : Remove aspectj from libspring-2.5-aop-java Recommends
since this package is not in main yet.
* Initial release (Closes: #426259)
* Created README.source, documenting preparation of original source archive
* 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)
Property changes on: trunk/libspring-java/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/libspring-java/debian/README.Debian
===================================================================
--- trunk/libspring-java/debian/README.Debian (rev 0)
+++ trunk/libspring-java/debian/README.Debian 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,29 @@
+-----------------------------
+libspring-java for Debian
+-----------------------------
+
+*** Removal of functionnalities ***
+
+SpringFramework Debian package doesn't contains some of the functionnalities of
+upstream binary releases.
+
+Here is a list of excluded files regarding original content of SpringFramework.
+
+* spring-context-support
+ [non-free] BEA CommonJ is non-free
+ org/springframework/scheduling/commonj/**
+
+* spring-transaction
+ [non-free] IBM Websphere is non-free
+ org/springframework/transaction/jta/WebSphereUowTransactionManager.java
+
+* spring-jdbc
+ [not-in-debian] Derby DB
+ org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
+
+*** Changes in dependencies ***
+
+Use debian ASM 3.x JAR instead of CGLIB-nodep version
+ see debian/patches/use_debian_asm3.diff in debian diff
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 23 Sep 2009 20:30:00 +0200
Added: trunk/libspring-java/debian/README.source
===================================================================
--- trunk/libspring-java/debian/README.source (rev 0)
+++ trunk/libspring-java/debian/README.source 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,19 @@
+Original tarball repack
+=======================
+How to prepare the original source:
+
+ * Download full distribution, e.g. spring-framework-3.0.0.RELEASE-with-docs.zip
+ * unzip spring-framework-3.0.0.RELEASE-with-docs.zip
+ * remove derived sources:
+ cd spring-framework-3.0.0.RELEASE
+ ant clean
+ cd ..
+ * remove entire lib directory, because some libs are not redistributable:
+ rm -r spring-framework-3.0.0.RELEASE/lib
+ * rename to original:
+ mv spring-framework-3.0.0.RELEASE libspring3-java
+ * create original archive:
+ tar czf libspring3-java_3.0.0.RELEASE.orig.tar.gz libspring3-java
+ * move original archive to tarballs/
+
+This can be achieved by "get-orig-source" target of debian/rules
Added: trunk/libspring-java/debian/ant.properties
===================================================================
--- trunk/libspring-java/debian/ant.properties (rev 0)
+++ trunk/libspring-java/debian/ant.properties 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,8 @@
+disable.bundlor=true
+release.type=release
+
+# Ivy version resolution
+aspectj.version=debian
+org.junit.version=4.x
+slf4j.version=debian
+commons.pool.version=debian
Added: trunk/libspring-java/debian/build-classpath
===================================================================
--- trunk/libspring-java/debian/build-classpath (rev 0)
+++ trunk/libspring-java/debian/build-classpath 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,80 @@
+# 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
+# FIX #581862
+/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/eclipselink.jar
+/usr/share/java/ehcache.jar
+/usr/share/java/el-api-2.1.jar
+/usr/share/java/freemarker.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-jpa.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
Added: trunk/libspring-java/debian/changelog
===================================================================
--- trunk/libspring-java/debian/changelog (rev 0)
+++ trunk/libspring-java/debian/changelog 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,220 @@
+libspring-java (3.0.3.RELEASE-1) UNRELEASED; urgency=low
+
+ * FTBFS (missing Castor) !
+
+ * New major upstream release.
+ - rename packages to match libspring-*-java convention
+ - build using spring-build-script Ant+Ivy infrastructure
+ - completly rework B-D and Depends for all packages
+ based on Maven metadata
+ * Drop Andreas from Uploaders
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 20 Jun 2010 20:45:54 +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
Added: trunk/libspring-java/debian/compat
===================================================================
--- trunk/libspring-java/debian/compat (rev 0)
+++ trunk/libspring-java/debian/compat 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1 @@
+7
Added: trunk/libspring-java/debian/control
===================================================================
--- trunk/libspring-java/debian/control (rev 0)
+++ trunk/libspring-java/debian/control 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,229 @@
+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>
+Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
+Build-Depends-Indep: maven-repo-helper, 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-java, libcglib-java, libcommons-beanutils-java,
+ libcommons-collections3-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-logging-java,
+ libcommons-pool-java, libecj-java, libeclipselink-java, libehcache-java, libfreemarker-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.8.4
+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
+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)
+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-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-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.
Added: trunk/libspring-java/debian/copyright
===================================================================
--- trunk/libspring-java/debian/copyright (rev 0)
+++ trunk/libspring-java/debian/copyright 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,30 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Spring Framework
+Maintainer: SpringSource Inc.
+Source: http://springframework.org/download
+
+Files: *
+Copyright: 2002-2010, the original author or authors
+Copyright: 2004, 2005 Acegi Technology Pty Limited
+Copyright: 2009 SpringSource Inc.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: Copyright 2010, Damien Raude-Morvan <drazzib at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ 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.
+
+ On Debian systems the full text of the Apache License can be found
+ in the `/usr/share/common-licenses/Apache-2.0' file.
Added: trunk/libspring-java/debian/docs
===================================================================
--- trunk/libspring-java/debian/docs (rev 0)
+++ trunk/libspring-java/debian/docs 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1 @@
+readme.txt
Added: trunk/libspring-java/debian/maven.rules
===================================================================
--- trunk/libspring-java/debian/maven.rules (rev 0)
+++ trunk/libspring-java/debian/maven.rules 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,10 @@
+org.springframework * * s/3\..*/3.x/
+log4j log4j jar s/1\.2\..*/1.2.x/
+commons-collections commons-collections jar s/3\..*/3.x/
+s/velocity/org.apache.velocity/ velocity jar s/.*/debian/
+s/velocity-tools/org.apache.velocity/ velocity-tools jar s/.*/debian/
+asm * jar s/.*/3.x/
+commons-httpclient commons-httpclient jar s/.*/3.x/
+javax.servlet servlet-api jar s/.*/2.5/
+s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/.*/2.1/
+s/jexcelapi/net.sourceforge.jexcelapi/ jxl jar s/.*/debian/
Added: trunk/libspring-java/debian/orig-tar.exclude
===================================================================
--- trunk/libspring-java/debian/orig-tar.exclude (rev 0)
+++ trunk/libspring-java/debian/orig-tar.exclude 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,7 @@
+projects/org.springframework.orm/src/test/resources/order-supplemental.jar
+projects/org.springframework.orm/src/test/resources/order.jar
+projects/org.springframework.orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar
+projects/spring-build/lib/ivy/*
+docs/*
+src/*.jar
+dist/*.jar
Added: trunk/libspring-java/debian/orig-tar.sh
===================================================================
--- trunk/libspring-java/debian/orig-tar.sh (rev 0)
+++ trunk/libspring-java/debian/orig-tar.sh 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=libspring-java-$2
+TAR=libspring-java_$2.orig.tar.gz
+
+# Repack upstream source to tar.gz
+unzip $3
+mv spring* $DIR
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
Property changes on: trunk/libspring-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff
===================================================================
--- trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff (rev 0)
+++ trunk/libspring-java/debian/patches/0001_use_debian_asm3.diff 2010-06-20 19:25:01 UTC (rev 12600)
@@ -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
+@@ -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"/>
Added: trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff
===================================================================
--- trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff (rev 0)
+++ trunk/libspring-java/debian/patches/0002_ivy_dependencies.diff 2010-06-20 19:25:01 UTC (rev 12600)
@@ -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"/>
+@@ -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"
Added: trunk/libspring-java/debian/patches/0003_no_ibm_websphere.diff
===================================================================
--- trunk/libspring-java/debian/patches/0003_no_ibm_websphere.diff (rev 0)
+++ trunk/libspring-java/debian/patches/0003_no_ibm_websphere.diff 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,22 @@
+Description: IBM Websphere is non-free (remove it from source)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-20
+Forwarded: not-needed
+--- a/projects/org.springframework.transaction/build.xml
++++ b/projects/org.springframework.transaction/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 file="${basedir}/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java"/>
++ </sequential>
++ </macrodef>
++
+ </project>
Added: trunk/libspring-java/debian/patches/0004_no_derby_db.diff
===================================================================
--- trunk/libspring-java/debian/patches/0004_no_derby_db.diff (rev 0)
+++ trunk/libspring-java/debian/patches/0004_no_derby_db.diff 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,36 @@
+Description: There is no package for Derby DB in Debian.
+ Don't compile EmbeddedDatabaseConfigurerFactory.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-20
+Forwarded: not-needed
+--- a/projects/org.springframework.jdbc/build.xml
++++ b/projects/org.springframework.jdbc/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 file="${basedir}/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java"/>
++ </sequential>
++ </macrodef>
++
+ </project>
+--- a/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
++++ b/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
+@@ -36,8 +36,8 @@
+ return HsqlEmbeddedDatabaseConfigurer.getInstance();
+ case H2:
+ return H2EmbeddedDatabaseConfigurer.getInstance();
+- case DERBY:
+- return DerbyEmbeddedDatabaseConfigurer.getInstance();
++ //case DERBY:
++ // return DerbyEmbeddedDatabaseConfigurer.getInstance();
+ default:
+ throw new UnsupportedOperationException("Other embedded database types not yet supported");
+ }
Added: trunk/libspring-java/debian/patches/0005_no_commonj.diff
===================================================================
--- trunk/libspring-java/debian/patches/0005_no_commonj.diff (rev 0)
+++ trunk/libspring-java/debian/patches/0005_no_commonj.diff 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,22 @@
+Description: BEA CommonJ is non-free (remove it)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-20
+Forwarded: not-needed
+--- a/projects/org.springframework.context.support/build.xml
++++ b/projects/org.springframework.context.support/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/scheduling/commonj"/>
++ </sequential>
++ </macrodef>
++
+ </project>
Added: trunk/libspring-java/debian/patches/0006_aspectj_classpath.diff
===================================================================
--- trunk/libspring-java/debian/patches/0006_aspectj_classpath.diff (rev 0)
+++ trunk/libspring-java/debian/patches/0006_aspectj_classpath.diff 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,30 @@
+Description: Fix iajc (AspectJ compiler) classpath:
+ - include JPA API
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-20
+Forwarded: not-needed
+--- a/projects/org.springframework.aspects/build.xml
++++ b/projects/org.springframework.aspects/build.xml
+@@ -1,9 +1,21 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="org.springframework.aspects">
++<project name="org.springframework.aspects" xmlns:ivy="antlib:org.apache.ivy.ant">
+ <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
+ <import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
+ <import file="${basedir}/../spring-build/aspect/default.xml"/>
++
++ <target name="resolve.compile" depends="resolve.init">
++ <ivy:cachepath resolveId="compile.classpath.pre" pathid="compile.classpath.pre"
++ conf="compile,optional,provided,dm-server-provided" type="jar" log="download-only"/>
++
++ <path id="compile.classpath">
++ <path refid="compile.classpath.pre"/>
++ <pathelement location="/usr/share/java/commons-logging.jar"/>
++ <pathelement location="/usr/share/java/glassfish-jpa.jar"/>
++ </path>
++ </target>
++
+
+ <target name="test.do" depends="ivy.init, resolve.test, resolve.aspects, compile.init, test.init" if="test.exists">
+ <path id="test.compile.classpath">
Added: trunk/libspring-java/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series (rev 0)
+++ trunk/libspring-java/debian/patches/series 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,6 @@
+0001_use_debian_asm3.diff
+0002_ivy_dependencies.diff
+0003_no_ibm_websphere.diff
+0004_no_derby_db.diff
+0005_no_commonj.diff
+0006_aspectj_classpath.diff
Added: trunk/libspring-java/debian/rules
===================================================================
--- trunk/libspring-java/debian/rules (rev 0)
+++ trunk/libspring-java/debian/rules 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
+VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//')
+
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_ARGS := -propertyfile debian/ant.properties
+BUILD_FILE := projects/build-spring-framework/build.xml
+CLASSPATH := $(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
+ANT := CLASSPATH=$(CLASSPATH) JAVA_HOME=$(JAVA_HOME) ANT_OPTS=$(JAVA_OPTS) ant -f $(BUILD_FILE) $(ANT_ARGS)
+
+MODULES = aop beans context context.support core expression instrument jdbc jms orm oxm test transaction web web.portlet web.servlet web.struts
+PRJ_ROOT = projects/org.springframework
+ARTIFACT_ROOT = target/artifacts/org.springframework
+
+%:
+ dh $@ --buildsystem=ant
+
+override_dh_auto_clean:
+ $(ANT) clean
+
+override_dh_auto_configure:
+ rm -rf projects/spring-build
+ ln -s /usr/share/spring-build projects/spring-build
+
+override_dh_auto_build:
+ $(ANT) jar
+
+override_dh_auto_install:
+
+ mh_installpom -plibspring-core-java $(PRJ_ROOT).spring-parent/pom.xml
+ for MYMOD in $(MODULES); do \
+ BASENAME=`echo spring-$$MYMOD | sed "s/\\./\\-/"`; \
+ JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \
+ POM=`echo $(PRJ_ROOT).$$MYMOD/pom.xml`; \
+ PACKAGE=`echo lib$$BASENAME-java`; \
+ mh_installpom -p$$PACKAGE $$POM ; \
+ mh_installjar -p$$PACKAGE -nspring3-$$MYMOD -i3.x -l $$POM $$JAR ; \
+ done
+ mh_installpom -plibspring-aop-java $(PRJ_ROOT).aspects/pom.xml
+ mh_installjar -plibspring-aop-java -nspring3-aspects -i3.x -l $(PRJ_ROOT).aspects/pom.xml $(PRJ_ROOT).aspects/$(ARTIFACT_ROOT).aspects.jar
+ mh_installpom -plibspring-instrument-java $(PRJ_ROOT).instrument.tomcat/pom.xml
+ mh_installjar -plibspring-instrument-java -nspring3-instrument-tomcat -i3.x -l $(PRJ_ROOT).instrument.tomcat/pom.xml $(PRJ_ROOT).instrument.tomcat/$(ARTIFACT_ROOT).instrument.tomcat.jar
+
+# Make a Debian version of upstream tarball
+# Details given in README.source
+get-orig-source:
+ wget -O ../spring-framework.zip http://s3.amazonaws.com/dist.springframework.org/release/SPR/spring-framework-${VERSION}-with-docs.zip
+ debian/orig-tar.sh --upstream-version ${VERSION} ../spring-framework.zip
Property changes on: trunk/libspring-java/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-java/debian/source/format
===================================================================
--- trunk/libspring-java/debian/source/format (rev 0)
+++ trunk/libspring-java/debian/source/format 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/libspring-java/debian/watch
===================================================================
--- trunk/libspring-java/debian/watch (rev 0)
+++ trunk/libspring-java/debian/watch 2010-06-20 19:25:01 UTC (rev 12600)
@@ -0,0 +1,3 @@
+version=3
+https://src.springframework.org/svn/spring-framework/tags/ \
+ spring-framework-(.*)/
More information about the pkg-java-commits
mailing list