[pkg-java] r12740 - in tags/libspring-2.5-java: . 2.5.6.SEC02-1/debian 2.5.6.SEC02-1/debian/excludesfiles 2.5.6.SEC02-1/debian/patches 2.5.6.SEC02-1/debian/poms

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Jul 7 23:38:27 UTC 2010


Author: drazzib
Date: 2010-07-07 23:38:26 +0000 (Wed, 07 Jul 2010)
New Revision: 12740

Added:
   tags/libspring-2.5-java/2.5.6.SEC02-1/
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/README.Debian
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/changelog
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/classpath-debian
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/control
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/main.excludes
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/tiger.excludes
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/02_read_excludefile_build_xml.diff
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/03_use_debian_asm2.diff
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/14_portlet_api.diff
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/16_commonj.diff
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/series
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aop-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aspects-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-beans-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-support-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-core-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jdbc-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jms-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-orm-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-test-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-tx-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-web-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-portlet-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-struts-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/rules
Removed:
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/README.Debian
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/changelog
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/classpath-debian
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/control
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/main.excludes
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/tiger.excludes
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/02_read_excludefile_build_xml.diff
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/03_use_debian_asm2.diff
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/14_portlet_api.diff
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/series
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aop-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aspects-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-beans-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-support-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-core-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jdbc-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jms-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-orm-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-test-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-tx-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-web-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-portlet-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-struts-2.5.xml
   tags/libspring-2.5-java/2.5.6.SEC02-1/debian/rules
Log:
[svn-buildpackage] Tagging libspring-2.5-java 2.5.6.SEC02-1

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/README.Debian
===================================================================
--- trunk/libspring-2.5-java/debian/README.Debian	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/README.Debian	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,71 +0,0 @@
------------------------------
-libspring-2.5-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
-  [not-in-debian] Glassfish Debian package is too old
-    org/springframework/instrument/classloading/glassfish/**
-  [non-free] Oracle OC4J is non-free
-    org/springframework/instrument/classloading/oc4j/**
-  [non-free] Debian JRuby package is in non-free archive
-    org/springframework/scripting/jruby/**
-
-* spring-context-support
-  [non-free] BEA CommonJ is non-free
-    org/springframework/scheduling/commonj/**
-
-* spring-orm
-  [non-free] Oracle TopLink 9.0.4 is non-free
-    org/springframework/orm/toplink/SessionBrokerSessionFactory.java
-    org/springframework/orm/toplink/support/CommonsLoggingSessionLog904.java
-  [non-free] JPA API is not in Debian yet
-    org/springframework/orm/jpa/vendor/**
-
-* spring-web
-  [non-free] JSF RI is not DFSG-free
-    org/springframework/web/jsf/**
-    org/springframework/web/context/request/Faces*
-  [not-in-debian] no Caucho package in Debbian
-    org/springframework/remoting/caucho/**
-
-* spring-tx
-  [non-free] IBM Websphere is non-free
-    org/springframework/transaction/jta/WebSphereUowTransactionManager.java
-    org/springframework/transaction/jta/WebSphereTransactionManagerFactoryBean.java
-    org/springframework/transaction/jta/JotmFactoryBean.java
-
-
-*** Changes in dependencies ***
-
-Glassfish TopLink Essentials JPA
-(from glassfish-toplink-essentials package)
-instead of Oracle Toplink
-  see debian/patches/08_use_glasshfish_toplink.dpatch in debian diff
-
-JUnit 4.5 instead of JUnit 4.3
-  see debian/patches/09_junit_45.dpatch in debian diff
-
-Compatibility with Servlet 2.5 and JSP 2.1 API
-  see debian/patches/11_servlet_jsp_api.dpatch in debian diff
-
-Use debian ASM2 JAR instead of CGLIB-nodep version
-  see debian/patches/03_use_debian_asm2.dpatch in debian diff
-
-AspectJ 1.6.4 instead of AspectJ 1.4
-  see debian/patches/12_aspectj_164.dpatch in debian diff
-
-Tiles 2.2 instead of Tiles 2.0
-  see debian/patches/13_tiles_22.dpatch in debian diff
-
-ASM 3.x instead of ASM 2.x
-  see debian/patches/15_fix_build_with_asm3.diff
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed Jun 16 21:16:05 CEST 2010

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/README.Debian (from rev 12739, trunk/libspring-2.5-java/debian/README.Debian)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/README.Debian	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/README.Debian	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,58 @@
+-----------------------------
+libspring-2.5-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
+  [not-in-debian] Glassfish Debian package is too old
+    org/springframework/instrument/classloading/glassfish/**
+  [non-free] Oracle OC4J is non-free
+    org/springframework/instrument/classloading/oc4j/**
+  [non-free] Debian JRuby package is in non-free archive
+    org/springframework/scripting/jruby/**
+
+* spring-orm
+  [non-free] Oracle TopLink 9.0.4 is non-free
+    org/springframework/orm/toplink/SessionBrokerSessionFactory.java
+    org/springframework/orm/toplink/support/CommonsLoggingSessionLog904.java
+
+* spring-tx
+  [non-free] IBM Websphere is non-free
+    org/springframework/transaction/jta/WebSphereUowTransactionManager.java
+    org/springframework/transaction/jta/WebSphereTransactionManagerFactoryBean.java
+    org/springframework/transaction/jta/JotmFactoryBean.java
+
+
+*** Changes in dependencies ***
+
+Glassfish TopLink Essentials JPA
+(from glassfish-toplink-essentials package)
+instead of Oracle Toplink
+  see debian/patches/08_use_glasshfish_toplink.dpatch in debian diff
+
+JUnit 4.5 instead of JUnit 4.3
+  see debian/patches/09_junit_45.dpatch in debian diff
+
+Compatibility with Servlet 2.5 and JSP 2.1 API
+  see debian/patches/11_servlet_jsp_api.dpatch in debian diff
+
+Use debian ASM2 JAR instead of CGLIB-nodep version
+  see debian/patches/03_use_debian_asm2.dpatch in debian diff
+
+AspectJ 1.6.4 instead of AspectJ 1.4
+  see debian/patches/12_aspectj_164.dpatch in debian diff
+
+Tiles 2.2 instead of Tiles 2.0
+  see debian/patches/13_tiles_22.dpatch in debian diff
+
+ASM 3.x instead of ASM 2.x
+  see debian/patches/15_fix_build_with_asm3.diff
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed Jun 16 21:16:05 CEST 2010

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/changelog	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,207 +0,0 @@
-libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
-
-  [ Onkar Shinde ]
-  * asm2 -> asm3 transition.
-  * Build a new package libspring-aspects-2.5-java and include
-    spring-aspects.jar file in it. This is needed to build xwork2.
-    (Closes: #582510)
-
-  [ Damien Raude-Morvan ]
-  * Upload to unstable
-  * Describe asm2 -> asm3 transition in d/README.Debian and in
-    d/patches/15_fix_build_with_asm3.diff  
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 16 Jun 2010 21:17:02 +0200
-
-libspring-2.5-java (2.5.6.SEC01-9) unstable; urgency=low
-
-  [ Miguel Landaeta ]
-  * Enable support for Portlet API. (Closes: #578718).
-
-  [ Damien Raude-Morvan ]
-  * Upload to unstable.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 26 Apr 2010 22:53:11 +0200
-
-libspring-2.5-java (2.5.6.SEC01-8) unstable; urgency=low
-
-  * New libspring-webmvc-struts-2.5-java binary package
-    for webmvc-struts.jar. (Closes: #570533)
-    Thanks to Arnaud Fontaine <arnau at debian.org>
-  * Fix debian/watch to track upstream 2.x releases from
-    spring-maintenance SVN tags.
-    Thanks to Per Wawra <debian.perfide at safersignup.com>.
-  * Replace B-D/D on glassfish-appserv by glassfish-javaee since
-    glassfish-appserv-jstl.jar is now in glassfish-appserv.
-  * Standards-Version to 3.8.4.
-  * Source format 3.0 (quilt).
-  * Move package duty under Debian Java Maintainers umbrella
-    and add myself to Uploaders.
-  * Disable JRuby scripting module and remove B-D since jruby Debian
-    package has moved to non-free archive.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 26 Feb 2010 20:26:51 +0100
-
-libspring-2.5-java (2.5.6.SEC01-7) unstable; urgency=low
-
-  * Fix compat with tiles 2.2.1 (split of modules)
-    - Build-Depends on libtiles-java >= 2.2.1
-    - Fix debian/classpath-debian
-  * Upgrade debian/copyright to DEP5
-  * Bump debhelper version to >= 7
-    - Replace dh_clean -k by dh_prep
-    - Refactor debian/rules by using "dh"
-  * Maven POMs:
-    - Add a Build-Depends-Indep dependency on maven-repo-helper
-    - Use mh_installpoms and mh_installjar to install the POM and the jar to the
-      Maven repository
-    - Remove useless debian/*.{links,install} files
-    - debian/poms/*.xml: Debian crafted pom.xml files
-    - debian/rules: new get-orig-pom to update debian/poms/*.xml at new upstream
-      release.
-  * Replace Depends and Build-Depends on "jruby1.2" by "jruby" (1.4)
-  * Switch to quilt as patch system
-    - Build-Depends on quilt and remove dpatch
-    - Rewrite debian/README.source
-    - Use dh --with quilt
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 15:03:37 +0100
-
-libspring-2.5-java (2.5.6.SEC01-6) unstable; urgency=low
-
-  * New 13_tiles_22 patch for compatibility with Tiles 2.2
-    - Describe this change in README.Debian
-    - Bump Build-Depends on libtiles-java (>= 2.2.0)
-  * Also bump Build-Depends on aspectj (>= 1.6.4)
-  * Remove unneeded Build-Depends on libservlet2.4-java
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 24 Oct 2009 20:46:45 +0200
-
-libspring-2.5-java (2.5.6.SEC01-5) unstable; urgency=low
-
-  * cglib2.1 (2.1.3) to cglib (2.2) transition:
-    - Build-Depends and Depends on libcglib-java instead of libcglib2.1-java
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 10 Oct 2009 21:49:08 +0200
-
-libspring-2.5-java (2.5.6.SEC01-4) unstable; urgency=low
-
-  * Migrate to JRuby 1.2 (JRuby 1.1 will be removed from unstable soon)
-    Thanks to Sebastien Delafond for report (Closes: #548807).
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 29 Sep 2009 21:40:09 +0200
-
-libspring-2.5-java (2.5.6.SEC01-3) unstable; urgency=low
-
-  * Now build with jasperreports and aspectj helpers
-    - Add Build-Depends on libjasperreports-java and aspectj
-      in debian/control
-    - Add Recommends on aspectj for libspring-aop-2.5-java
-    - Update debian/excludesfiles/{main,tiger,tigermock} accordingly
-    - Add this JARs to debian/classpath-debian for build
-    - Update exclusion list in README.Debian
-    - Remove 07_no_aspectj patch
-  * New 12_aspectj_164 patch for compatibility with AspectJ version in Debian
-  * Downgrade glassfish-appserv to Suggests for libspring-web-2.5-java package
-    (Closes: #545500)
-  * Bump Standards-Version to 3.8.3: no changes needed
-  * Update my email address
-  * Set myself as Maintainer and move Andreas Schildbach to Uploaders
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 24 Sep 2009 21:26:10 +0200
-
-libspring-2.5-java (2.5.6.SEC01-2) unstable; urgency=low
-
-  [ Damien Raude-Morvan ]
-  * Update Vcs-* fields to pkg-java SVN repository
-  * Bump Standards-Version to 3.8.2:
-    - Update README.source to describe dpatch patch system
-
-  [ Andreas Schildbach ]
-  * Migrated Tomcat instrumentation dependency from libtomcat5.5-java
-    to libtomcat6-java, as Tomcat 5.5 is no more (Closes: #543122)
-
- -- Andreas Schildbach <debian.org at schildbach.de>  Sun, 23 Aug 2009 09:43:10 +0000
-
-libspring-2.5-java (2.5.6.SEC01-1) unstable; urgency=low
-
-  * New upstream release.
-    - [SECURITY] Include fix for CVE-2009-1190:
-      Spring Framework Remote Denial of Service Vulnerability
-  * Refresh all debian/patches to handle Spring linefeed change
-  * New patch 11_servlet_api_api to handle compat with
-    Servlet 2.5 and JSP 2.1 API's. Remove MockPageContext
-    from exclusion list in debian/excludesfiles/mainmock 
-  * Use JRuby 1.1 instead of 1.0:
-    - debian/classpath-debian: replace jruby1.0 by jruby1.1
-    - debian/control: change Build-Depends for jruby1.1 package
-      and Suggest for spring-context package
-    - debian/patches/10_jruby_11.dpatch: update Spring
-      source code to be compliant with jruby 1.1
-  * Now build with testng:
-    - Add Build-Depends on testng in debian/control
-    - Add Recommends on testng to spring-test module
-    - Update debian/excludesfiles/tigermock
-    - Add this testng.jar to debian/classpath-debian
-  * debian/watch:
-    - new upstream releases are not on sf.net anymore
-    - upstream download site is not checkeable by uscan
-      (need POST request - form submit - to access to download area)
-  * debian/README.Debian: complete list of changes regarding upstream modules
-  * debian/copyright: Debian packaging should be licenced under same licence as
-    upstream. Clarify Apache 2.0 licence copyright attribution.
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Wed, 27 May 2009 20:25:01 +0200
-
-libspring-2.5-java (2.5.5-2) UNRELEASED; urgency=low
-
-  [ Damien Raude-Morvan ]
-  * Now build with tiles and velocity-tools helpers:
-    - Add Build-Depends on libtiles-java and libvelocity-tools-java
-      in debian/control
-    - Update debian/excludesfiles/main accordingly
-    - Add this JAR to debian/classpath-debian to build
-  * New libspring-2.5-test-java debian package (include mock tools):
-    - Re-activate buildmock target in 01_build_xml patch
-    - Build-Depends on junit4 (>= 4.5) in debian/control
-    - New 09_junit_45 patch to build Spring 2.5 with JUnit 4.5
-    - Add debian/excludesfiles/tigermock and debian/excludesfiles/mainmock
-      to exclude some classes from build
-    - Update 02_read_excludefile_build_xml patch to read these files
-    - Add libspring-test-2.5-java.links and libspring-test-2.5-java.install
-  * Bump Standards-Version to 3.8.1 (no changes needed)
-  * Move all libspring2.5-* to "java" section
-
-  [ Andreas Schildbach ]
-  * Removed comment in debian/control, as it seems to confuse pbuilder
-
-  [ Damien Raude-Morvan ]
-  * Fix policy issue : Remove aspectj from libspring-2.5-aop-java Recommends
-    since this package is not in main yet.
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Wed, 27 May 2009 15:41:19 +0200
-
-libspring-2.5-java (2.5.5-1) unstable; urgency=low
-
-  [ Andreas Schildbach ]
-  * Initial release (Closes: #426259)
-  * Created README.source, documenting preparation of original source archive
-
-  [ Damien Raude-Morvan ]
-  * Use dpath as patch system for packaging (debian/rules and debian/control)
-    - 01_build_xml: Create /usr/share/java based classpath
-    - 02_read_excludefile_build_xml: Read some excludesfile to exclude
-      some java source file from build
-    - 03_use_debian_asm2: Use debian ASM2 JAR instead of CGLIB-nodep version
-    - 05_remove_glassfish_weaving: Remove usage of GlassFishLoadTimeWeaver
-    - 06_no_jsf: There is no DFSG-free Java Server Faces so disable
-    - 07_no_aspectj: AspectJ is not in main, so disable it
-    - 08_glassfish_toplink: Use Toplink Essentials from Glassfish package
-  * debian/watch: use Debian QA Sourceforge redirector for downloading from SF
-  * debian/rules: create get-orig-source make rule for preparation of debian
-    orig.tar.gz from upstream archives (as documented in README.source)
-  * debian/control: Prepare all spring modules in separates packages
-    - every Spring module would get is own Debian package
-    - set Depends for all packages (based on Maven pom.xml dependencies)
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Sat, 14 Feb 2009 14:51:44 +0100

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/changelog (from rev 12739, trunk/libspring-2.5-java/debian/changelog)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/changelog	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/changelog	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,227 @@
+libspring-2.5-java (2.5.6.SEC02-1) unstable; urgency=high
+
+  [ Miguel Landaeta ]
+  * Enable support for JavaServer Faces API. (Closes: #587835).
+  * Bump Standards-Version to 3.9.0. No changes were needed.
+
+  [ Damien Raude-Morvan ]
+  * New upstream security release (hence urgency=high)
+    - [SECURITY] Include fix for CVE-2010-1622:
+      Spring Framework execution of arbitrary code
+  * Enable support for Hessian API.
+    - Add B-D on libhessian-java
+  * Enable support for CommonJ API.
+    - Add B-D on libgeronimo-commonj-spec-java
+  * Enable support for JPA 1.0 API.
+    - Add B-D on libhibernate-entitymanager-java, libeclipselink-java
+      and libopenjpa-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 08 Jul 2010 01:28:57 +0200
+
+libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
+
+  [ Onkar Shinde ]
+  * asm2 -> asm3 transition.
+  * Build a new package libspring-aspects-2.5-java and include
+    spring-aspects.jar file in it. This is needed to build xwork2.
+    (Closes: #582510)
+
+  [ Damien Raude-Morvan ]
+  * Upload to unstable
+  * Describe asm2 -> asm3 transition in d/README.Debian and in
+    d/patches/15_fix_build_with_asm3.diff  
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 16 Jun 2010 21:17:02 +0200
+
+libspring-2.5-java (2.5.6.SEC01-9) unstable; urgency=low
+
+  [ Miguel Landaeta ]
+  * Enable support for Portlet API. (Closes: #578718).
+
+  [ Damien Raude-Morvan ]
+  * Upload to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 26 Apr 2010 22:53:11 +0200
+
+libspring-2.5-java (2.5.6.SEC01-8) unstable; urgency=low
+
+  * New libspring-webmvc-struts-2.5-java binary package
+    for webmvc-struts.jar. (Closes: #570533)
+    Thanks to Arnaud Fontaine <arnau at debian.org>
+  * Fix debian/watch to track upstream 2.x releases from
+    spring-maintenance SVN tags.
+    Thanks to Per Wawra <debian.perfide at safersignup.com>.
+  * Replace B-D/D on glassfish-appserv by glassfish-javaee since
+    glassfish-appserv-jstl.jar is now in glassfish-appserv.
+  * Standards-Version to 3.8.4.
+  * Source format 3.0 (quilt).
+  * Move package duty under Debian Java Maintainers umbrella
+    and add myself to Uploaders.
+  * Disable JRuby scripting module and remove B-D since jruby Debian
+    package has moved to non-free archive.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 26 Feb 2010 20:26:51 +0100
+
+libspring-2.5-java (2.5.6.SEC01-7) unstable; urgency=low
+
+  * Fix compat with tiles 2.2.1 (split of modules)
+    - Build-Depends on libtiles-java >= 2.2.1
+    - Fix debian/classpath-debian
+  * Upgrade debian/copyright to DEP5
+  * Bump debhelper version to >= 7
+    - Replace dh_clean -k by dh_prep
+    - Refactor debian/rules by using "dh"
+  * Maven POMs:
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+      Maven repository
+    - Remove useless debian/*.{links,install} files
+    - debian/poms/*.xml: Debian crafted pom.xml files
+    - debian/rules: new get-orig-pom to update debian/poms/*.xml at new upstream
+      release.
+  * Replace Depends and Build-Depends on "jruby1.2" by "jruby" (1.4)
+  * Switch to quilt as patch system
+    - Build-Depends on quilt and remove dpatch
+    - Rewrite debian/README.source
+    - Use dh --with quilt
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 15:03:37 +0100
+
+libspring-2.5-java (2.5.6.SEC01-6) unstable; urgency=low
+
+  * New 13_tiles_22 patch for compatibility with Tiles 2.2
+    - Describe this change in README.Debian
+    - Bump Build-Depends on libtiles-java (>= 2.2.0)
+  * Also bump Build-Depends on aspectj (>= 1.6.4)
+  * Remove unneeded Build-Depends on libservlet2.4-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 24 Oct 2009 20:46:45 +0200
+
+libspring-2.5-java (2.5.6.SEC01-5) unstable; urgency=low
+
+  * cglib2.1 (2.1.3) to cglib (2.2) transition:
+    - Build-Depends and Depends on libcglib-java instead of libcglib2.1-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 10 Oct 2009 21:49:08 +0200
+
+libspring-2.5-java (2.5.6.SEC01-4) unstable; urgency=low
+
+  * Migrate to JRuby 1.2 (JRuby 1.1 will be removed from unstable soon)
+    Thanks to Sebastien Delafond for report (Closes: #548807).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 29 Sep 2009 21:40:09 +0200
+
+libspring-2.5-java (2.5.6.SEC01-3) unstable; urgency=low
+
+  * Now build with jasperreports and aspectj helpers
+    - Add Build-Depends on libjasperreports-java and aspectj
+      in debian/control
+    - Add Recommends on aspectj for libspring-aop-2.5-java
+    - Update debian/excludesfiles/{main,tiger,tigermock} accordingly
+    - Add this JARs to debian/classpath-debian for build
+    - Update exclusion list in README.Debian
+    - Remove 07_no_aspectj patch
+  * New 12_aspectj_164 patch for compatibility with AspectJ version in Debian
+  * Downgrade glassfish-appserv to Suggests for libspring-web-2.5-java package
+    (Closes: #545500)
+  * Bump Standards-Version to 3.8.3: no changes needed
+  * Update my email address
+  * Set myself as Maintainer and move Andreas Schildbach to Uploaders
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 24 Sep 2009 21:26:10 +0200
+
+libspring-2.5-java (2.5.6.SEC01-2) unstable; urgency=low
+
+  [ Damien Raude-Morvan ]
+  * Update Vcs-* fields to pkg-java SVN repository
+  * Bump Standards-Version to 3.8.2:
+    - Update README.source to describe dpatch patch system
+
+  [ Andreas Schildbach ]
+  * Migrated Tomcat instrumentation dependency from libtomcat5.5-java
+    to libtomcat6-java, as Tomcat 5.5 is no more (Closes: #543122)
+
+ -- Andreas Schildbach <debian.org at schildbach.de>  Sun, 23 Aug 2009 09:43:10 +0000
+
+libspring-2.5-java (2.5.6.SEC01-1) unstable; urgency=low
+
+  * New upstream release.
+    - [SECURITY] Include fix for CVE-2009-1190:
+      Spring Framework Remote Denial of Service Vulnerability
+  * Refresh all debian/patches to handle Spring linefeed change
+  * New patch 11_servlet_api_api to handle compat with
+    Servlet 2.5 and JSP 2.1 API's. Remove MockPageContext
+    from exclusion list in debian/excludesfiles/mainmock 
+  * Use JRuby 1.1 instead of 1.0:
+    - debian/classpath-debian: replace jruby1.0 by jruby1.1
+    - debian/control: change Build-Depends for jruby1.1 package
+      and Suggest for spring-context package
+    - debian/patches/10_jruby_11.dpatch: update Spring
+      source code to be compliant with jruby 1.1
+  * Now build with testng:
+    - Add Build-Depends on testng in debian/control
+    - Add Recommends on testng to spring-test module
+    - Update debian/excludesfiles/tigermock
+    - Add this testng.jar to debian/classpath-debian
+  * debian/watch:
+    - new upstream releases are not on sf.net anymore
+    - upstream download site is not checkeable by uscan
+      (need POST request - form submit - to access to download area)
+  * debian/README.Debian: complete list of changes regarding upstream modules
+  * debian/copyright: Debian packaging should be licenced under same licence as
+    upstream. Clarify Apache 2.0 licence copyright attribution.
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Wed, 27 May 2009 20:25:01 +0200
+
+libspring-2.5-java (2.5.5-2) UNRELEASED; urgency=low
+
+  [ Damien Raude-Morvan ]
+  * Now build with tiles and velocity-tools helpers:
+    - Add Build-Depends on libtiles-java and libvelocity-tools-java
+      in debian/control
+    - Update debian/excludesfiles/main accordingly
+    - Add this JAR to debian/classpath-debian to build
+  * New libspring-2.5-test-java debian package (include mock tools):
+    - Re-activate buildmock target in 01_build_xml patch
+    - Build-Depends on junit4 (>= 4.5) in debian/control
+    - New 09_junit_45 patch to build Spring 2.5 with JUnit 4.5
+    - Add debian/excludesfiles/tigermock and debian/excludesfiles/mainmock
+      to exclude some classes from build
+    - Update 02_read_excludefile_build_xml patch to read these files
+    - Add libspring-test-2.5-java.links and libspring-test-2.5-java.install
+  * Bump Standards-Version to 3.8.1 (no changes needed)
+  * Move all libspring2.5-* to "java" section
+
+  [ Andreas Schildbach ]
+  * Removed comment in debian/control, as it seems to confuse pbuilder
+
+  [ Damien Raude-Morvan ]
+  * Fix policy issue : Remove aspectj from libspring-2.5-aop-java Recommends
+    since this package is not in main yet.
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Wed, 27 May 2009 15:41:19 +0200
+
+libspring-2.5-java (2.5.5-1) unstable; urgency=low
+
+  [ Andreas Schildbach ]
+  * Initial release (Closes: #426259)
+  * Created README.source, documenting preparation of original source archive
+
+  [ Damien Raude-Morvan ]
+  * Use dpath as patch system for packaging (debian/rules and debian/control)
+    - 01_build_xml: Create /usr/share/java based classpath
+    - 02_read_excludefile_build_xml: Read some excludesfile to exclude
+      some java source file from build
+    - 03_use_debian_asm2: Use debian ASM2 JAR instead of CGLIB-nodep version
+    - 05_remove_glassfish_weaving: Remove usage of GlassFishLoadTimeWeaver
+    - 06_no_jsf: There is no DFSG-free Java Server Faces so disable
+    - 07_no_aspectj: AspectJ is not in main, so disable it
+    - 08_glassfish_toplink: Use Toplink Essentials from Glassfish package
+  * debian/watch: use Debian QA Sourceforge redirector for downloading from SF
+  * debian/rules: create get-orig-source make rule for preparation of debian
+    orig.tar.gz from upstream archives (as documented in README.source)
+  * debian/control: Prepare all spring modules in separates packages
+    - every Spring module would get is own Debian package
+    - set Depends for all packages (based on Maven pom.xml dependencies)
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Sat, 14 Feb 2009 14:51:44 +0100

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/classpath-debian	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/classpath-debian	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,55 +0,0 @@
-# buildmain
-usr/share/java/commons-logging.jar
-usr/share/java/aopalliance.jar
-usr/share/java/cglib.jar
-usr/share/java/asm3.jar
-usr/share/java/jamon.jar
-usr/share/java/commons-pool.jar
-usr/share/java/commons-collections3.jar
-usr/share/java/backport-util-concurrent.jar
-usr/share/java/asm3.jar
-usr/share/java/asm3-commons.jar
-usr/share/java/c3p0.jar
-usr/share/java/xapool.jar
-usr/share/java/jdo2-api.jar
-usr/share/java/commons-httpclient.jar
-usr/share/java/axis.jar
-usr/share/java/groovy.jar
-usr/share/java/jruby.jar
-usr/share/java/freemarker.jar
-usr/share/java/velocity.jar
-usr/share/java/log4j-1.2.jar
-usr/share/java/commons-attributes-api.jar
-usr/share/java/jakarta-poi.jar
-usr/share/java/jxl.jar
-usr/share/java/itext.jar
-usr/share/java/struts-1.2.jar
-usr/share/java/dom4j.jar
-usr/share/java/glassfish-javaee.jar
-usr/share/java/jsp-api.jar
-usr/share/java/bsh.jar
-usr/share/java/jasperreports.jar
-usr/share/java/ehcache.jar
-usr/share/java/aspectjrt.jar
-usr/share/java/aspectjweaver.jar
-usr/share/java/quartz-all.jar
-usr/share/java/tiles-api.jar
-usr/share/java/tiles-core.jar
-usr/share/java/tiles-el.jar
-usr/share/java/tiles-servlet.jar
-usr/share/java/tiles-servlet-wildcard.jar
-usr/share/java/tiles-jsp.jar
-usr/share/java/velocity-tools-view.jar
-usr/share/java/hibernate3.jar
-usr/share/java/hibernate-commons-annotations.jar
-usr/share/java/hibernate-annotations.jar
-usr/share/java/jaxrpc.jar
-usr/share/java/ibatis.jar
-usr/share/java/glassfish-appserv-jstl.jar
-usr/share/java/testng.jar
-usr/share/java/portlet-api.jar
-
-# buildtiger
-usr/share/tomcat6/lib/catalina.jar
-usr/share/java/glassfish-toplink-essentials.jar
-usr/share/java/junit4.jar

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/classpath-debian (from rev 12739, trunk/libspring-2.5-java/debian/classpath-debian)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/classpath-debian	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/classpath-debian	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,62 @@
+# buildmain
+usr/share/java/commons-logging.jar
+usr/share/java/aopalliance.jar
+usr/share/java/cglib.jar
+usr/share/java/asm3.jar
+usr/share/java/jamon.jar
+usr/share/java/commons-pool.jar
+usr/share/java/commons-collections3.jar
+usr/share/java/backport-util-concurrent.jar
+usr/share/java/asm3.jar
+usr/share/java/asm3-commons.jar
+usr/share/java/c3p0.jar
+usr/share/java/xapool.jar
+usr/share/java/jdo2-api.jar
+usr/share/java/commons-httpclient.jar
+usr/share/java/axis.jar
+usr/share/java/groovy.jar
+usr/share/java/jruby.jar
+usr/share/java/freemarker.jar
+usr/share/java/velocity.jar
+usr/share/java/log4j-1.2.jar
+usr/share/java/commons-attributes-api.jar
+usr/share/java/jakarta-poi.jar
+usr/share/java/jxl.jar
+usr/share/java/itext.jar
+usr/share/java/struts-1.2.jar
+usr/share/java/dom4j.jar
+usr/share/java/glassfish-javaee.jar
+usr/share/java/jsp-api.jar
+usr/share/java/bsh.jar
+usr/share/java/jasperreports.jar
+usr/share/java/ehcache.jar
+usr/share/java/aspectjrt.jar
+usr/share/java/aspectjweaver.jar
+usr/share/java/quartz-all.jar
+usr/share/java/tiles-api.jar
+usr/share/java/tiles-core.jar
+usr/share/java/tiles-el.jar
+usr/share/java/tiles-servlet.jar
+usr/share/java/tiles-servlet-wildcard.jar
+usr/share/java/tiles-jsp.jar
+usr/share/java/velocity-tools-view.jar
+usr/share/java/hibernate3.jar
+usr/share/java/hibernate-commons-annotations.jar
+usr/share/java/hibernate-annotations.jar
+usr/share/java/jaxrpc.jar
+usr/share/java/ibatis.jar
+usr/share/java/glassfish-appserv-jstl.jar
+usr/share/java/testng.jar
+usr/share/java/portlet-api.jar
+usr/share/java/jsf-api.jar
+usr/share/java/hessian.jar
+usr/share/java/geronimo-commonj-spec.jar
+usr/share/java/glassfish-jpa.jar
+usr/share/java/eclipselink.jar
+usr/share/java/openjpa.jar
+usr/share/java/hibernate-entitymanager.jar
+
+# buildtiger
+usr/share/tomcat6/lib/catalina.jar
+usr/share/java/glassfish-toplink-essentials.jar
+usr/share/java/junit4.jar

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/control	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,191 +0,0 @@
-Source: libspring-2.5-java
-Section: java
-Priority: extra
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Schildbach <debian.org at schildbach.de>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
-Build-Depends-Indep: libcommons-logging-java, libcommons-attributes-java (>= 2.2-4), libaopalliance-java,
- libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm3-java,
- libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
- libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
- libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
- libcglib-java, bsh, glassfish-javaee, libqdox-java, libjarjar-java,
- libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
- libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java (>= 2.2.1), libvelocity-tools-java,
- glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, aspectj (>= 1.6.4), libjasperreports-java,
- maven-repo-helper, libportlet-api-2.0-spec-java
-Standards-Version: 3.8.4
-Homepage: http://springframework.org/about
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-2.5-java/
-
-Package: libspring-core-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libasm3-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
-Recommends: libcommons-attributes-java
-Description: modular Java/J2EE application framework - Core
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-core.jar : Core abstractions and utilities,
- source-level metadata support.
-
-Package: libspring-beans-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libcglib-java
-Description: modular Java/J2EE application framework - Beans
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-beans.jar : JavaBeans support and bean container.
-
-Package: libspring-aop-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
-Recommends: libaopalliance-java, aspectj
-Description: modular Java/J2EE application framework - AOP
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-aop.jar : Aspect-oriented programming framework.
-
-Package: libspring-context-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
-Recommends: libspring-aop-2.5-java, glassfish-javaee
-Suggests: bsh, groovy
-Description: modular Java/J2EE application framework - Context
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-context.jar : application context, JNDI, JMX,
- instrumentation, remoting, scripting, scheduling and validation
-
-Package: libspring-context-support-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
-Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity
-Description: modular Java/J2EE application framework - Context Support
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-context-support.jar : Quartz/CommonJ scheduling,
- UI templating, mail and caching
-
-Package: libspring-web-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
-Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java
-Suggests: glassfish-javaee
-Description: modular Java/J2EE application framework - Web
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-web.jar : web application context, multipart
- resolver, HTTP-based remoting support
-
-Package: libspring-webmvc-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-web-2.5-java
-Recommends: libspring-context-support-2.5-java, libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
-Description: modular Java/J2EE application framework - MVC
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-webmvc.jar : framework servlets, web MVC framework,
- web controllers, web views for JSP, Velocity, Tiles, iText and POI
-
-Package: libspring-webmvc-struts-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-webmvc-2.5-java, libstruts1.2-java
-Description: modular Java/J2EE application framework - Struts MVC
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-webmvc-struts.jar : integrate a Struts
- application with Spring
-
-Package: libspring-webmvc-portlet-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-webmvc-2.5-java, libportlet-api-2.0-spec-java, libcommons-fileupload-java
-Description: modular Java/J2EE application framework - Portlet MVC
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-webmvc-portlet.jar : support development of Portlet
- applications with Spring
-
-Package: libspring-test-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java
-Recommends: junit4 (>= 4.5), testng
-Description: modular Java/J2EE application framework - Test helpers
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-test.jar : unit-testing helpers and mock
- classes
-
-Package: libspring-tx-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java
-Recommends: libspring-aop-2.5-java, libspring-context-2.5-java, glassfish-javaee
-Description: modular Java/J2EE application framework - transaction
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-tx.jar : transaction infrastructure, JCA support,
- DAO support
-
-Package: libspring-jdbc-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, libc3p0-java
-Description: modular Java/J2EE application framework - JDBC tools
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-jdbc.jar : Java DataBase Connectivity support
-
-Package: libspring-jms-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, glassfish-javaee
-Description: modular Java/J2EE application framework - JMS tools
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-jms.jar : Java Message Service 1.0.2/1.1 support
-
-Package: libspring-orm-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-jdbc-2.5-java
-Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java
-Description: modular Java/J2EE application framework - ORM tools
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-orm.jar : JDO support, JPA support, Hibernate
- support, TopLink support, iBATIS support
-
-Package: libspring-aspects-2.5-java
-Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime
-Description: modular Java/J2EE application framework - Bundled aspects
- Spring is a layered Java/J2EE application framework offering a lot of freedom
- to Java developers yet providing well documented and easy-to-use solutions for
- common practices in the industry.
- .
- This package provide spring-aspects.jar.

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/control (from rev 12739, trunk/libspring-2.5-java/debian/control)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/control	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/control	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,194 @@
+Source: libspring-2.5-java
+Section: java
+Priority: extra
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Andreas Schildbach <debian.org at schildbach.de>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
+Build-Depends-Indep: libcommons-logging-java, libcommons-attributes-java (>= 2.2-4), libaopalliance-java,
+ libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm3-java,
+ libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
+ libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
+ libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
+ libcglib-java, bsh, glassfish-javaee, libqdox-java, libjarjar-java,
+ libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
+ libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java (>= 2.2.1), libvelocity-tools-java,
+ glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, aspectj (>= 1.6.4), libjasperreports-java,
+ maven-repo-helper, libportlet-api-2.0-spec-java, libjsf-api-java, libhessian-java, libgeronimo-commonj-spec-java,
+ libeclipselink-java, libopenjpa-java, libhibernate-entitymanager-java
+Standards-Version: 3.9.0
+Homepage: http://springframework.org/about
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-2.5-java/
+
+Package: libspring-core-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libasm3-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
+Recommends: libcommons-attributes-java
+Description: modular Java/J2EE application framework - Core
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-core.jar : Core abstractions and utilities,
+ source-level metadata support.
+
+Package: libspring-beans-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libcglib-java
+Description: modular Java/J2EE application framework - Beans
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-beans.jar : JavaBeans support and bean container.
+
+Package: libspring-aop-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
+Recommends: libaopalliance-java, aspectj
+Description: modular Java/J2EE application framework - AOP
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-aop.jar : Aspect-oriented programming framework.
+
+Package: libspring-context-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
+Recommends: libspring-aop-2.5-java, glassfish-javaee
+Suggests: bsh, groovy
+Description: modular Java/J2EE application framework - Context
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-context.jar : application context, JNDI, JMX,
+ instrumentation, remoting, scripting, scheduling and validation
+
+Package: libspring-context-support-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
+Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity,
+ libgeronimo-commonj-spec-java
+Description: modular Java/J2EE application framework - Context Support
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-context-support.jar : Quartz/CommonJ scheduling,
+ UI templating, mail and caching
+
+Package: libspring-web-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
+Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java, libjsf-api-java, libhessian-java
+Suggests: glassfish-javaee
+Description: modular Java/J2EE application framework - Web
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-web.jar : web application context, multipart
+ resolver, HTTP-based remoting support
+
+Package: libspring-webmvc-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-web-2.5-java
+Recommends: libspring-context-support-2.5-java, libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
+Description: modular Java/J2EE application framework - MVC
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-webmvc.jar : framework servlets, web MVC framework,
+ web controllers, web views for JSP, Velocity, Tiles, iText and POI
+
+Package: libspring-webmvc-struts-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-webmvc-2.5-java, libstruts1.2-java
+Description: modular Java/J2EE application framework - Struts MVC
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-webmvc-struts.jar : integrate a Struts
+ application with Spring
+
+Package: libspring-webmvc-portlet-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-webmvc-2.5-java, libportlet-api-2.0-spec-java, libcommons-fileupload-java
+Description: modular Java/J2EE application framework - Portlet MVC
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-webmvc-portlet.jar : support development of Portlet
+ applications with Spring
+
+Package: libspring-test-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+Recommends: junit4 (>= 4.5), testng
+Description: modular Java/J2EE application framework - Test helpers
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-test.jar : unit-testing helpers and mock
+ classes
+
+Package: libspring-tx-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+Recommends: libspring-aop-2.5-java, libspring-context-2.5-java, glassfish-javaee
+Description: modular Java/J2EE application framework - transaction
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-tx.jar : transaction infrastructure, JCA support,
+ DAO support
+
+Package: libspring-jdbc-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, libc3p0-java
+Description: modular Java/J2EE application framework - JDBC tools
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-jdbc.jar : Java DataBase Connectivity support
+
+Package: libspring-jms-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, glassfish-javaee
+Description: modular Java/J2EE application framework - JMS tools
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-jms.jar : Java Message Service 1.0.2/1.1 support
+
+Package: libspring-orm-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-jdbc-2.5-java
+Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
+ libeclipselink-java, libopenjpa-java
+Description: modular Java/J2EE application framework - ORM tools
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-orm.jar : JDO support, JPA support, Hibernate
+ support, TopLink support, iBATIS support
+
+Package: libspring-aspects-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime
+Description: modular Java/J2EE application framework - Bundled aspects
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-aspects.jar.

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/main.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/main.excludes	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/main.excludes	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,22 +0,0 @@
-# spring-context-support
-# BEA CommonJ is non-free
-org/springframework/scheduling/commonj/**
-org/springframework/scripting/jruby/**
-
-# spring-orm
-# We doesn't support TopLink 9.0.4 (non-free)
-org/springframework/orm/toplink/SessionBrokerSessionFactory.java
-org/springframework/orm/toplink/support/CommonsLoggingSessionLog904.java
-
-# spring-tx
-# IBM Websphere is non-free
-org/springframework/transaction/jta/WebSphereUowTransactionManager.java
-org/springframework/transaction/jta/WebSphereTransactionManagerFactoryBean.java
-org/springframework/transaction/jta/JotmFactoryBean.java
-
-# spring-web
-# JSF RI is not DFSG-free
-org/springframework/web/jsf/**
-org/springframework/web/context/request/Faces*
-# no Caucho package in Debbian
-org/springframework/remoting/caucho/**

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/main.excludes (from rev 12739, trunk/libspring-2.5-java/debian/excludesfiles/main.excludes)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/main.excludes	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/main.excludes	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,14 @@
+# spring-context-support
+# JRuby is non-free
+org/springframework/scripting/jruby/**
+
+# spring-orm
+# We doesn't support TopLink 9.0.4 (non-free)
+org/springframework/orm/toplink/SessionBrokerSessionFactory.java
+org/springframework/orm/toplink/support/CommonsLoggingSessionLog904.java
+
+# spring-tx
+# IBM Websphere is non-free
+org/springframework/transaction/jta/WebSphereUowTransactionManager.java
+org/springframework/transaction/jta/WebSphereTransactionManagerFactoryBean.java
+org/springframework/transaction/jta/JotmFactoryBean.java

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/tiger.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/tiger.excludes	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,12 +0,0 @@
-# spring-context
-# Glassfish Debian package is too old
-org/springframework/instrument/classloading/glassfish/**
-# Oracle OC4J is non-free
-org/springframework/instrument/classloading/oc4j/**
-
-# spring-orm
-org/springframework/orm/jpa/vendor/**
-
-# spring-web
-# JSF RI is not DFSG-free
-org/springframework/web/jsf/**

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/tiger.excludes (from rev 12739, trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/tiger.excludes	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/excludesfiles/tiger.excludes	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,5 @@
+# spring-context
+# Glassfish Debian package is too old
+org/springframework/instrument/classloading/glassfish/**
+# Oracle OC4J is non-free
+org/springframework/instrument/classloading/oc4j/**

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/02_read_excludefile_build_xml.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/02_read_excludefile_build_xml.diff	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,30 +0,0 @@
-Description: Read some excludesfile to exclude some java source file from build.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-12-12
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -285,6 +285,7 @@
- 			<!-- Include Commons Attributes generated Java sources -->
- 			<src path="${commons.attributes.tempdir.src}"/>
- 			<classpath refid="all-libs"/>
-+			<excludesfile name="debian/excludesfiles/main.excludes"/>
- 		</javac>
- 
- 		<rmic base="${target.classes.dir}" classname="org.springframework.remoting.rmi.RmiInvocationWrapper"/>
-@@ -328,6 +329,7 @@
- 				deprecation="false" optimize="false" failonerror="true">
- 			<src path="${tiger.src.dir}"/>
- 			<classpath refid="all-libs"/>
-+			<excludesfile name="debian/excludesfiles/tiger.excludes"/>
- 		</javac>
- 
- 	</target>
-@@ -393,6 +396,7 @@
- 			<classpath refid="all-libs"/>
- 			<classpath location="${junit4.jar}"/>
- 			<classpath location="${target.classes.dir}"/>
-+			<excludesfile name="debian/excludesfiles/tigermock.excludes"/>
- 		</javac>
- 
- 		<!-- Pick up logging config from test directory -->

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/02_read_excludefile_build_xml.diff (from rev 12739, trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/02_read_excludefile_build_xml.diff	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/02_read_excludefile_build_xml.diff	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,30 @@
+Description: Read some excludesfile to exclude some java source file from build.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-12
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -285,6 +285,7 @@
+ 			<!-- Include Commons Attributes generated Java sources -->
+ 			<src path="${commons.attributes.tempdir.src}"/>
+ 			<classpath refid="all-libs"/>
++			<excludesfile name="debian/excludesfiles/main.excludes"/>
+ 		</javac>
+ 
+ 		<rmic base="${target.classes.dir}" classname="org.springframework.remoting.rmi.RmiInvocationWrapper"/>
+@@ -328,6 +329,7 @@
+ 				deprecation="false" optimize="false" failonerror="true">
+ 			<src path="${tiger.src.dir}"/>
+ 			<classpath refid="all-libs"/>
++			<excludesfile name="debian/excludesfiles/tiger.excludes"/>
+ 		</javac>
+ 
+ 	</target>
+@@ -393,6 +395,7 @@
+ 			<classpath refid="all-libs"/>
+ 			<classpath location="${junit4.jar}"/>
+ 			<classpath location="${target.classes.dir}"/>
++			<excludesfile name="debian/excludesfiles/tigermock.excludes"/>
+ 		</javac>
+ 
+ 		<!-- Pick up logging config from test directory -->

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/03_use_debian_asm2.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/03_use_debian_asm2.diff	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,40 +0,0 @@
-Description: Use debian ASM2 JAR instead of CGLIB-nodep version
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-12-12
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -538,20 +538,17 @@
- 			</manifest>
- 		</jar>
- 
--		<jarjar jarfile="${dist.dir}/modules/spring-core.jar">
-+		<jar jarfile="${dist.dir}/modules/spring-core.jar">
- 			<fileset dir="${target.classes.dir}">
- 				<patternset refid="spring.core.packages"/>
- 			</fileset>
--			<zipfileset src="${lib.dir}/asm/asm-2.2.3.jar"/>
--			<zipfileset src="${lib.dir}/asm/asm-commons-2.2.3.jar"/>
--			<rule pattern="org.objectweb.asm.**" result="org.springframework.asm. at 1"/>
- 			<metainf file="license.txt"/>
- 			<manifest>
- 				<attribute name="Implementation-Title" value="${spring-title}"/>
- 				<attribute name="Implementation-Version" value="${spring-version}"/>
- 				<attribute name="Spring-Version" value="${spring-version}"/>
- 			</manifest>
--		</jarjar>
-+		</jar>
- 
- 		<jar jarfile="${dist.dir}/modules/spring-jdbc.jar">
- 			<fileset dir="${target.classes.dir}">
---- a/src/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
-+++ b/src/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;

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/03_use_debian_asm2.diff (from rev 12739, trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/03_use_debian_asm2.diff	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/03_use_debian_asm2.diff	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,40 @@
+Description: Use debian ASM2 JAR instead of CGLIB-nodep version
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-12
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -537,20 +537,17 @@
+ 			</manifest>
+ 		</jar>
+ 
+-		<jarjar jarfile="${dist.dir}/modules/spring-core.jar">
++		<jar jarfile="${dist.dir}/modules/spring-core.jar">
+ 			<fileset dir="${target.classes.dir}">
+ 				<patternset refid="spring.core.packages"/>
+ 			</fileset>
+-			<zipfileset src="${lib.dir}/asm/asm-2.2.3.jar"/>
+-			<zipfileset src="${lib.dir}/asm/asm-commons-2.2.3.jar"/>
+-			<rule pattern="org.objectweb.asm.**" result="org.springframework.asm. at 1"/>
+ 			<metainf file="license.txt"/>
+ 			<manifest>
+ 				<attribute name="Implementation-Title" value="${spring-title}"/>
+ 				<attribute name="Implementation-Version" value="${spring-version}"/>
+ 				<attribute name="Spring-Version" value="${spring-version}"/>
+ 			</manifest>
+-		</jarjar>
++		</jar>
+ 
+ 		<jar jarfile="${dist.dir}/modules/spring-jdbc.jar">
+ 			<fileset dir="${target.classes.dir}">
+--- a/src/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
++++ b/src/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;

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/14_portlet_api.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/14_portlet_api.diff	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/14_portlet_api.diff	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,530 +0,0 @@
-Description: compatibility fixes for Portlet API 2.0
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-diff --git a/mock/org/springframework/mock/web/portlet/MockActionRequest.java b/mock/org/springframework/mock/web/portlet/MockActionRequest.java
-index 5ea5cf8..0632daa 100644
---- a/mock/org/springframework/mock/web/portlet/MockActionRequest.java
-+++ b/mock/org/springframework/mock/web/portlet/MockActionRequest.java
-@@ -23,6 +23,9 @@ import java.io.InputStream;
- import java.io.InputStreamReader;
- import java.io.Reader;
- import java.io.UnsupportedEncodingException;
-+import java.util.Map;
-+
-+import javax.servlet.http.Cookie;
- 
- import javax.portlet.ActionRequest;
- import javax.portlet.PortalContext;
-@@ -128,4 +131,24 @@ public class MockActionRequest extends MockPortletRequest implements ActionReque
- 		return (this.content != null ? content.length : -1);
- 	}
- 
-+	public String getWindowID() {
-+		throw new UnsupportedOperationException("getWindowID");
-+	}
-+
-+	public Cookie[] getCookies() {
-+		throw new UnsupportedOperationException("getCookies");
-+	}
-+
-+	public Map getPrivateParameterMap() {
-+		throw new UnsupportedOperationException("getPrivateParameterMap");
-+	}
-+
-+	public Map getPublicParameterMap() {
-+		throw new UnsupportedOperationException("getPublicParameterMap");
-+	}
-+
-+	public String getMethod() {
-+		throw new UnsupportedOperationException("getMethod");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockActionResponse.java b/mock/org/springframework/mock/web/portlet/MockActionResponse.java
-index 58c65df..c08203f 100644
---- a/mock/org/springframework/mock/web/portlet/MockActionResponse.java
-+++ b/mock/org/springframework/mock/web/portlet/MockActionResponse.java
-@@ -17,6 +17,7 @@
- package org.springframework.mock.web.portlet;
- 
- import java.io.IOException;
-+import java.io.Serializable;
- import java.util.Collections;
- import java.util.Iterator;
- import java.util.Map;
-@@ -29,6 +30,8 @@ import javax.portlet.PortletModeException;
- import javax.portlet.WindowState;
- import javax.portlet.WindowStateException;
- 
-+import javax.xml.namespace.QName;
-+
- import org.springframework.core.CollectionFactory;
- import org.springframework.util.Assert;
- import org.springframework.util.CollectionUtils;
-@@ -160,5 +163,25 @@ public class MockActionResponse extends MockPortletResponse implements ActionRes
- 		return Collections.unmodifiableMap(this.renderParameters);
- 	}
- 
-+	public void sendRedirect(String location, String renderUrlParamName) throws IOException {
-+		throw new UnsupportedOperationException("sendRedirect");
-+	}
-+
-+	public void removePublicRenderParameter(String name) {
-+		throw new UnsupportedOperationException("removePublicRenderParameter");
-+	}
-+
-+	public void setEvent(QName name, Serializable value) {
-+		throw new UnsupportedOperationException("setEvent");
-+	}
-+
-+	public void setEvent(String name, Serializable value) {
-+		throw new UnsupportedOperationException("setEvent");
-+	}
-+
-+	public String getNamespace() {
-+		throw new UnsupportedOperationException("getNamespace");
-+	}
-+
- 
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
-index 7505eaf..b9b98ea 100644
---- a/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
-+++ b/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
-@@ -64,4 +64,8 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
- 		return Collections.unmodifiableMap(this.multipartFiles);
- 	}
- 
-+	public String getMethod() {
-+		throw new UnsupportedOperationException("getMethod");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletConfig.java b/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
-index a5c0e04..9cdc2ac 100644
---- a/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
-+++ b/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
-@@ -21,6 +21,7 @@ import java.util.HashMap;
- import java.util.Locale;
- import java.util.Properties;
- import java.util.ResourceBundle;
-+import java.util.Map;
- 
- import javax.portlet.PortletConfig;
- import javax.portlet.PortletContext;
-@@ -111,4 +112,28 @@ public class MockPortletConfig implements PortletConfig {
- 		return this.initParameters.keys();
- 	}
- 
-+	public Enumeration getPublicRenderParameterNames() {
-+		throw new UnsupportedOperationException("getPublicRenderParameterNames");
-+	}
-+
-+	public String getDefaultNamespace() {
-+		throw new UnsupportedOperationException("getDefaultNamespace");
-+	}
-+
-+	public Enumeration getPublishingEventQNames() {
-+		throw new UnsupportedOperationException("getPublishingEventQNames");
-+	}
-+
-+	public Enumeration getProcessingEventQNames() {
-+		throw new UnsupportedOperationException("getProcessingEventQNames");
-+	}
-+
-+	public Enumeration getSupportedLocales() {
-+		throw new UnsupportedOperationException("getSupportedLocales");
-+	}
-+
-+	public Map getContainerRuntimeOptions() {
-+		throw new UnsupportedOperationException("getContainerRuntimeOptions");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletContext.java b/mock/org/springframework/mock/web/portlet/MockPortletContext.java
-index b823ad1..75b3c61 100644
---- a/mock/org/springframework/mock/web/portlet/MockPortletContext.java
-+++ b/mock/org/springframework/mock/web/portlet/MockPortletContext.java
-@@ -251,4 +251,8 @@ public class MockPortletContext implements PortletContext {
- 		return portletContextName;
- 	}
- 
-+	public Enumeration getContainerRuntimeOptions() {
-+		throw new UnsupportedOperationException("getContainerRuntimeOptions");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletRequest.java b/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
-index 8c62d7b..8c66b9b 100644
---- a/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
-+++ b/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
-@@ -38,6 +38,8 @@ import javax.portlet.PortletRequest;
- import javax.portlet.PortletSession;
- import javax.portlet.WindowState;
- 
-+import javax.servlet.http.Cookie;
-+
- import org.springframework.util.Assert;
- import org.springframework.util.CollectionUtils;
- 
-@@ -468,4 +470,20 @@ public class MockPortletRequest implements PortletRequest {
- 		return serverPort;
- 	}
- 
-+	public String getWindowID() {
-+		throw new UnsupportedOperationException("getWindowID");
-+	}
-+
-+	public Cookie[] getCookies() {
-+		throw new UnsupportedOperationException("getCookies");
-+	}
-+
-+	public Map getPrivateParameterMap() {
-+		throw new UnsupportedOperationException("getPrivateParameterMap");
-+	}
-+
-+	public Map getPublicParameterMap() {
-+		throw new UnsupportedOperationException("getPublicParameterMap");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
-index 071206f..cc57d60 100644
---- a/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
-+++ b/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
-@@ -22,6 +22,8 @@ import javax.portlet.PortletException;
- import javax.portlet.PortletRequestDispatcher;
- import javax.portlet.RenderRequest;
- import javax.portlet.RenderResponse;
-+import javax.portlet.PortletRequest;
-+import javax.portlet.PortletResponse;
- 
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-@@ -64,4 +66,12 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher {
-     }
- 	}
- 
-+	public void forward(PortletRequest request, PortletResponse response) throws PortletException, IOException {
-+		throw new UnsupportedOperationException("forward");
-+	}
-+
-+	public void include(PortletRequest request, PortletResponse response) throws PortletException, IOException {
-+		throw new UnsupportedOperationException("include");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletResponse.java b/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
-index d047c05..834892c 100644
---- a/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
-+++ b/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
-@@ -23,6 +23,11 @@ import java.util.Set;
- import javax.portlet.PortalContext;
- import javax.portlet.PortletResponse;
- 
-+import javax.servlet.http.Cookie;
-+
-+import org.w3c.dom.Element;
-+import org.w3c.dom.DOMException;
-+
- import org.springframework.util.Assert;
- 
- /**
-@@ -107,4 +112,20 @@ public class MockPortletResponse implements PortletResponse {
- 		return path;
- 	}
- 
-+	public Element createElement(String tagName) throws DOMException {
-+		throw new UnsupportedOperationException("createElement");
-+	}
-+
-+	public void addProperty(String key, Element element) {
-+		throw new UnsupportedOperationException("addProperty");
-+	}
-+
-+	public void addProperty(Cookie cookie) {
-+		throw new UnsupportedOperationException("addProperty");
-+	}
-+
-+	public String getNamespace() {
-+		throw new UnsupportedOperationException("getNamespace");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletSession.java b/mock/org/springframework/mock/web/portlet/MockPortletSession.java
-index 6888af2..31508cc 100644
---- a/mock/org/springframework/mock/web/portlet/MockPortletSession.java
-+++ b/mock/org/springframework/mock/web/portlet/MockPortletSession.java
-@@ -18,6 +18,7 @@ package org.springframework.mock.web.portlet;
- 
- import java.util.Enumeration;
- import java.util.Hashtable;
-+import java.util.Map;
- 
- import javax.portlet.PortletContext;
- import javax.portlet.PortletSession;
-@@ -186,4 +187,12 @@ public class MockPortletSession implements PortletSession {
- 		return portletContext;
- 	}
- 
-+	public Map getAttributeMap() {
-+		throw new UnsupportedOperationException("getAttributeMap");
-+	}
-+
-+	public Map getAttributeMap(int scope) {
-+		throw new UnsupportedOperationException("getAttributeMap");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockPortletURL.java b/mock/org/springframework/mock/web/portlet/MockPortletURL.java
-index 2e60b5f..20caefc 100644
---- a/mock/org/springframework/mock/web/portlet/MockPortletURL.java
-+++ b/mock/org/springframework/mock/web/portlet/MockPortletURL.java
-@@ -17,6 +17,8 @@
- package org.springframework.mock.web.portlet;
- 
- import java.io.UnsupportedEncodingException;
-+import java.io.IOException;
-+import java.io.Writer;
- import java.net.URLEncoder;
- import java.util.Collections;
- import java.util.Iterator;
-@@ -190,4 +192,32 @@ public class MockPortletURL implements PortletURL {
- 		}
- 	}
- 
-+	public PortletMode getPortletMode() {
-+		throw new UnsupportedOperationException("getPortletMode");
-+	}
-+
-+	public WindowState getWindowState() {
-+		throw new UnsupportedOperationException("getWindowState");
-+	}
-+
-+	public void removePublicRenderParameter(String name) {
-+		throw new UnsupportedOperationException("removePublicRenderParameter");
-+	}
-+
-+	public void setProperty(String key, String value) {
-+		throw new UnsupportedOperationException("setProperty");
-+	}
-+
-+	public void addProperty(String key, String value) {
-+		throw new UnsupportedOperationException("addProperty");
-+	}
-+
-+	public void write(Writer out) throws IOException {
-+		throw new UnsupportedOperationException("write");
-+	}
-+
-+	public void write(Writer out, boolean escapeXML) throws IOException {
-+		throw new UnsupportedOperationException("write");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockRenderRequest.java b/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
-index 5bb8c54..595a607 100644
---- a/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
-+++ b/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
-@@ -67,4 +67,8 @@ public class MockRenderRequest extends MockPortletRequest implements RenderReque
- 		super(portalContext, portletContext);
- 	}
- 
-+	public String getETag() {
-+		throw new UnsupportedOperationException("getETag");
-+	}
-+
- }
-diff --git a/mock/org/springframework/mock/web/portlet/MockRenderResponse.java b/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
-index c63e9a4..d956196 100644
---- a/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
-+++ b/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
-@@ -24,10 +24,13 @@ import java.io.PrintWriter;
- import java.io.UnsupportedEncodingException;
- import java.io.Writer;
- import java.util.Locale;
-+import java.util.Collection;
- 
- import javax.portlet.PortalContext;
- import javax.portlet.PortletURL;
- import javax.portlet.RenderResponse;
-+import javax.portlet.CacheControl;
-+import javax.portlet.ResourceURL;
- 
- import org.springframework.web.util.WebUtils;
- 
-@@ -213,4 +216,16 @@ public class MockRenderResponse extends MockPortletResponse implements RenderRes
- 		return includedUrl;
- 	}
- 
-+	public void setNextPossiblePortletModes(Collection portletModes) {
-+		throw new UnsupportedOperationException("setNextPossiblePortletModes");
-+	}
-+
-+	public CacheControl getCacheControl() {
-+		throw new UnsupportedOperationException("getCacheControl");
-+	}
-+
-+	public ResourceURL createResourceURL() {
-+		throw new UnsupportedOperationException("createResourceURL");
-+	}
-+
- }
-diff --git a/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
-index 323ff7e..e045cb7 100644
---- a/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
-+++ b/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
-@@ -20,6 +20,7 @@ import java.util.Collections;
- import java.util.Enumeration;
- import java.util.Locale;
- import java.util.ResourceBundle;
-+import java.util.Map;
- 
- import javax.portlet.Portlet;
- import javax.portlet.PortletConfig;
-@@ -162,6 +163,30 @@ public class SimplePortletPostProcessor
- 		public ResourceBundle getResourceBundle(Locale locale) {
-             return portletConfig == null ? null : portletConfig.getResourceBundle(locale);
- 		}
-+
-+		public Map getContainerRuntimeOptions() {
-+            throw new UnsupportedOperationException("getContainerRuntimeOptions");
-+		}
-+
-+		public Enumeration getSupportedLocales() {
-+            throw new UnsupportedOperationException("getSupportedLocales");
-+		}
-+
-+		public Enumeration getProcessingEventQNames() {
-+            throw new UnsupportedOperationException("getProcessingEventQNames");
-+		}
-+
-+		public Enumeration getPublishingEventQNames() {
-+            throw new UnsupportedOperationException("getPublishingEventQNames");
-+		}
-+
-+		public String getDefaultNamespace() {
-+            throw new UnsupportedOperationException("getDefaultNamespace");
-+		}
-+
-+		public Enumeration getPublicRenderParameterNames() {
-+            throw new UnsupportedOperationException("getPublicRenderParameterNames");
-+		}
- 	}
- 
- }
-diff --git a/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
-index a9bc271..ed0378e 100644
---- a/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
-+++ b/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
-@@ -26,6 +26,8 @@ import java.util.Set;
- 
- import javax.portlet.ActionRequest;
- 
-+import javax.servlet.http.Cookie;
-+
- import org.springframework.web.multipart.MultipartFile;
- import org.springframework.web.portlet.util.ActionRequestWrapper;
- 
-@@ -161,4 +163,12 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen
- 		throw new IllegalStateException("Multipart request not initialized");
- 	}
- 
-+	public String getMethod() {
-+		throw new UnsupportedOperationException("getMethod");
-+	}
-+
-+	public Cookie[] getCookies() {
-+		throw new UnsupportedOperationException("getCookies");
-+	}
-+
- }
-diff --git a/src/org/springframework/web/portlet/mvc/PortletWrappingController.java b/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
-index 470bdfb..b0bb33a 100644
---- a/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
-+++ b/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
-@@ -20,6 +20,7 @@ import java.util.Enumeration;
- import java.util.Locale;
- import java.util.Properties;
- import java.util.ResourceBundle;
-+import java.util.Map;
- 
- import javax.portlet.ActionRequest;
- import javax.portlet.ActionResponse;
-@@ -203,6 +204,29 @@ public class PortletWrappingController extends AbstractController
- 			return (portletConfig != null ? portletConfig.getResourceBundle(locale) : null);
- 		}
- 
-+		public Map getContainerRuntimeOptions() {
-+			throw new UnsupportedOperationException("getContainerRuntimeOptions");
-+		}
-+
-+		public Enumeration getSupportedLocales() {
-+			throw new UnsupportedOperationException("getSupportedLocales");
-+		}
-+
-+		public Enumeration getProcessingEventQNames() {
-+			throw new UnsupportedOperationException("getProcessingEventQNames");
-+		}
-+
-+		public Enumeration getPublishingEventQNames() {
-+			throw new UnsupportedOperationException("getPublishingEventQNames");
-+		}
-+
-+		public String getDefaultNamespace() {
-+			throw new UnsupportedOperationException("getDefaultNamespace");
-+		}
-+
-+		public Enumeration getPublicRenderParameterNames() {
-+			throw new UnsupportedOperationException("getPublicRenderParameterNames");
-+		}
- 	}
- 
- }
-diff --git a/src/org/springframework/web/portlet/util/ActionRequestWrapper.java b/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
-index 3993af1..74f92f7 100644
---- a/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
-+++ b/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
-@@ -75,4 +75,8 @@ public class ActionRequestWrapper extends PortletRequestWrapper implements Actio
- 		return this.actionRequest.getContentLength();
- 	}
- 
-+	public String getMethod() {
-+		throw new UnsupportedOperationException("getMethod");
-+	}
-+
- }
-diff --git a/src/org/springframework/web/portlet/util/PortletRequestWrapper.java b/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
-index 9c65318..1694992 100644
---- a/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
-+++ b/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
-@@ -30,6 +30,8 @@ import javax.portlet.WindowState;
- 
- import org.springframework.util.Assert;
- 
-+import javax.servlet.http.Cookie;
-+
- /**
-  * Simple wrapper for a {@link javax.portlet.PortletRequest}, delegating all
-  * calls to the underlying request.
-@@ -194,4 +196,20 @@ public class PortletRequestWrapper implements PortletRequest {
- 		return this.portletRequest.getServerPort();
- 	}
- 
-+	public Map getPublicParameterMap() {
-+		throw new UnsupportedOperationException("getPublicParameterMap");
-+	}
-+
-+	public Map getPrivateParameterMap() {
-+		throw new UnsupportedOperationException("getPrivateParameterMap");
-+	}
-+
-+	public Cookie[] getCookies() {
-+		throw new UnsupportedOperationException("getCookies");
-+	}
-+
-+	public String getWindowID() {
-+		throw new UnsupportedOperationException("getWindowID");
-+	}
-+
- }

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/14_portlet_api.diff (from rev 12739, trunk/libspring-2.5-java/debian/patches/14_portlet_api.diff)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/14_portlet_api.diff	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/14_portlet_api.diff	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,496 @@
+Description: compatibility fixes for Portlet API 2.0
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+--- a/mock/org/springframework/mock/web/portlet/MockActionRequest.java
++++ b/mock/org/springframework/mock/web/portlet/MockActionRequest.java
+@@ -23,6 +23,9 @@
+ import java.io.InputStreamReader;
+ import java.io.Reader;
+ import java.io.UnsupportedEncodingException;
++import java.util.Map;
++
++import javax.servlet.http.Cookie;
+ 
+ import javax.portlet.ActionRequest;
+ import javax.portlet.PortalContext;
+@@ -128,4 +131,24 @@
+ 		return (this.content != null ? content.length : -1);
+ 	}
+ 
++	public String getWindowID() {
++		throw new UnsupportedOperationException("getWindowID");
++	}
++
++	public Cookie[] getCookies() {
++		throw new UnsupportedOperationException("getCookies");
++	}
++
++	public Map getPrivateParameterMap() {
++		throw new UnsupportedOperationException("getPrivateParameterMap");
++	}
++
++	public Map getPublicParameterMap() {
++		throw new UnsupportedOperationException("getPublicParameterMap");
++	}
++
++	public String getMethod() {
++		throw new UnsupportedOperationException("getMethod");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockActionResponse.java
++++ b/mock/org/springframework/mock/web/portlet/MockActionResponse.java
+@@ -17,6 +17,7 @@
+ package org.springframework.mock.web.portlet;
+ 
+ import java.io.IOException;
++import java.io.Serializable;
+ import java.util.Collections;
+ import java.util.Iterator;
+ import java.util.Map;
+@@ -29,6 +30,8 @@
+ import javax.portlet.WindowState;
+ import javax.portlet.WindowStateException;
+ 
++import javax.xml.namespace.QName;
++
+ import org.springframework.core.CollectionFactory;
+ import org.springframework.util.Assert;
+ import org.springframework.util.CollectionUtils;
+@@ -160,5 +163,25 @@
+ 		return Collections.unmodifiableMap(this.renderParameters);
+ 	}
+ 
++	public void sendRedirect(String location, String renderUrlParamName) throws IOException {
++		throw new UnsupportedOperationException("sendRedirect");
++	}
++
++	public void removePublicRenderParameter(String name) {
++		throw new UnsupportedOperationException("removePublicRenderParameter");
++	}
++
++	public void setEvent(QName name, Serializable value) {
++		throw new UnsupportedOperationException("setEvent");
++	}
++
++	public void setEvent(String name, Serializable value) {
++		throw new UnsupportedOperationException("setEvent");
++	}
++
++	public String getNamespace() {
++		throw new UnsupportedOperationException("getNamespace");
++	}
++
+ 
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
++++ b/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
+@@ -64,4 +64,8 @@
+ 		return Collections.unmodifiableMap(this.multipartFiles);
+ 	}
+ 
++	public String getMethod() {
++		throw new UnsupportedOperationException("getMethod");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
++++ b/mock/org/springframework/mock/web/portlet/MockPortletConfig.java
+@@ -21,6 +21,7 @@
+ import java.util.Locale;
+ import java.util.Properties;
+ import java.util.ResourceBundle;
++import java.util.Map;
+ 
+ import javax.portlet.PortletConfig;
+ import javax.portlet.PortletContext;
+@@ -111,4 +112,28 @@
+ 		return this.initParameters.keys();
+ 	}
+ 
++	public Enumeration getPublicRenderParameterNames() {
++		throw new UnsupportedOperationException("getPublicRenderParameterNames");
++	}
++
++	public String getDefaultNamespace() {
++		throw new UnsupportedOperationException("getDefaultNamespace");
++	}
++
++	public Enumeration getPublishingEventQNames() {
++		throw new UnsupportedOperationException("getPublishingEventQNames");
++	}
++
++	public Enumeration getProcessingEventQNames() {
++		throw new UnsupportedOperationException("getProcessingEventQNames");
++	}
++
++	public Enumeration getSupportedLocales() {
++		throw new UnsupportedOperationException("getSupportedLocales");
++	}
++
++	public Map getContainerRuntimeOptions() {
++		throw new UnsupportedOperationException("getContainerRuntimeOptions");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockPortletContext.java
++++ b/mock/org/springframework/mock/web/portlet/MockPortletContext.java
+@@ -251,4 +251,8 @@
+ 		return portletContextName;
+ 	}
+ 
++	public Enumeration getContainerRuntimeOptions() {
++		throw new UnsupportedOperationException("getContainerRuntimeOptions");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
++++ b/mock/org/springframework/mock/web/portlet/MockPortletRequest.java
+@@ -38,6 +38,8 @@
+ import javax.portlet.PortletSession;
+ import javax.portlet.WindowState;
+ 
++import javax.servlet.http.Cookie;
++
+ import org.springframework.util.Assert;
+ import org.springframework.util.CollectionUtils;
+ 
+@@ -468,4 +470,20 @@
+ 		return serverPort;
+ 	}
+ 
++	public String getWindowID() {
++		throw new UnsupportedOperationException("getWindowID");
++	}
++
++	public Cookie[] getCookies() {
++		throw new UnsupportedOperationException("getCookies");
++	}
++
++	public Map getPrivateParameterMap() {
++		throw new UnsupportedOperationException("getPrivateParameterMap");
++	}
++
++	public Map getPublicParameterMap() {
++		throw new UnsupportedOperationException("getPublicParameterMap");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
++++ b/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
+@@ -22,6 +22,8 @@
+ import javax.portlet.PortletRequestDispatcher;
+ import javax.portlet.RenderRequest;
+ import javax.portlet.RenderResponse;
++import javax.portlet.PortletRequest;
++import javax.portlet.PortletResponse;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+@@ -64,4 +66,12 @@
+     }
+ 	}
+ 
++	public void forward(PortletRequest request, PortletResponse response) throws PortletException, IOException {
++		throw new UnsupportedOperationException("forward");
++	}
++
++	public void include(PortletRequest request, PortletResponse response) throws PortletException, IOException {
++		throw new UnsupportedOperationException("include");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
++++ b/mock/org/springframework/mock/web/portlet/MockPortletResponse.java
+@@ -23,6 +23,11 @@
+ import javax.portlet.PortalContext;
+ import javax.portlet.PortletResponse;
+ 
++import javax.servlet.http.Cookie;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.DOMException;
++
+ import org.springframework.util.Assert;
+ 
+ /**
+@@ -107,4 +112,20 @@
+ 		return path;
+ 	}
+ 
++	public Element createElement(String tagName) throws DOMException {
++		throw new UnsupportedOperationException("createElement");
++	}
++
++	public void addProperty(String key, Element element) {
++		throw new UnsupportedOperationException("addProperty");
++	}
++
++	public void addProperty(Cookie cookie) {
++		throw new UnsupportedOperationException("addProperty");
++	}
++
++	public String getNamespace() {
++		throw new UnsupportedOperationException("getNamespace");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockPortletSession.java
++++ b/mock/org/springframework/mock/web/portlet/MockPortletSession.java
+@@ -18,6 +18,7 @@
+ 
+ import java.util.Enumeration;
+ import java.util.Hashtable;
++import java.util.Map;
+ 
+ import javax.portlet.PortletContext;
+ import javax.portlet.PortletSession;
+@@ -186,4 +187,12 @@
+ 		return portletContext;
+ 	}
+ 
++	public Map getAttributeMap() {
++		throw new UnsupportedOperationException("getAttributeMap");
++	}
++
++	public Map getAttributeMap(int scope) {
++		throw new UnsupportedOperationException("getAttributeMap");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockPortletURL.java
++++ b/mock/org/springframework/mock/web/portlet/MockPortletURL.java
+@@ -17,6 +17,8 @@
+ package org.springframework.mock.web.portlet;
+ 
+ import java.io.UnsupportedEncodingException;
++import java.io.IOException;
++import java.io.Writer;
+ import java.net.URLEncoder;
+ import java.util.Collections;
+ import java.util.Iterator;
+@@ -190,4 +192,32 @@
+ 		}
+ 	}
+ 
++	public PortletMode getPortletMode() {
++		throw new UnsupportedOperationException("getPortletMode");
++	}
++
++	public WindowState getWindowState() {
++		throw new UnsupportedOperationException("getWindowState");
++	}
++
++	public void removePublicRenderParameter(String name) {
++		throw new UnsupportedOperationException("removePublicRenderParameter");
++	}
++
++	public void setProperty(String key, String value) {
++		throw new UnsupportedOperationException("setProperty");
++	}
++
++	public void addProperty(String key, String value) {
++		throw new UnsupportedOperationException("addProperty");
++	}
++
++	public void write(Writer out) throws IOException {
++		throw new UnsupportedOperationException("write");
++	}
++
++	public void write(Writer out, boolean escapeXML) throws IOException {
++		throw new UnsupportedOperationException("write");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
++++ b/mock/org/springframework/mock/web/portlet/MockRenderRequest.java
+@@ -67,4 +67,8 @@
+ 		super(portalContext, portletContext);
+ 	}
+ 
++	public String getETag() {
++		throw new UnsupportedOperationException("getETag");
++	}
++
+ }
+--- a/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
++++ b/mock/org/springframework/mock/web/portlet/MockRenderResponse.java
+@@ -24,10 +24,13 @@
+ import java.io.UnsupportedEncodingException;
+ import java.io.Writer;
+ import java.util.Locale;
++import java.util.Collection;
+ 
+ import javax.portlet.PortalContext;
+ import javax.portlet.PortletURL;
+ import javax.portlet.RenderResponse;
++import javax.portlet.CacheControl;
++import javax.portlet.ResourceURL;
+ 
+ import org.springframework.web.util.WebUtils;
+ 
+@@ -213,4 +216,16 @@
+ 		return includedUrl;
+ 	}
+ 
++	public void setNextPossiblePortletModes(Collection portletModes) {
++		throw new UnsupportedOperationException("setNextPossiblePortletModes");
++	}
++
++	public CacheControl getCacheControl() {
++		throw new UnsupportedOperationException("getCacheControl");
++	}
++
++	public ResourceURL createResourceURL() {
++		throw new UnsupportedOperationException("createResourceURL");
++	}
++
+ }
+--- a/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
++++ b/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
+@@ -20,6 +20,7 @@
+ import java.util.Enumeration;
+ import java.util.Locale;
+ import java.util.ResourceBundle;
++import java.util.Map;
+ 
+ import javax.portlet.Portlet;
+ import javax.portlet.PortletConfig;
+@@ -162,6 +163,30 @@
+ 		public ResourceBundle getResourceBundle(Locale locale) {
+             return portletConfig == null ? null : portletConfig.getResourceBundle(locale);
+ 		}
++
++		public Map getContainerRuntimeOptions() {
++            throw new UnsupportedOperationException("getContainerRuntimeOptions");
++		}
++
++		public Enumeration getSupportedLocales() {
++            throw new UnsupportedOperationException("getSupportedLocales");
++		}
++
++		public Enumeration getProcessingEventQNames() {
++            throw new UnsupportedOperationException("getProcessingEventQNames");
++		}
++
++		public Enumeration getPublishingEventQNames() {
++            throw new UnsupportedOperationException("getPublishingEventQNames");
++		}
++
++		public String getDefaultNamespace() {
++            throw new UnsupportedOperationException("getDefaultNamespace");
++		}
++
++		public Enumeration getPublicRenderParameterNames() {
++            throw new UnsupportedOperationException("getPublicRenderParameterNames");
++		}
+ 	}
+ 
+ }
+--- a/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
++++ b/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
+@@ -26,6 +26,8 @@
+ 
+ import javax.portlet.ActionRequest;
+ 
++import javax.servlet.http.Cookie;
++
+ import org.springframework.web.multipart.MultipartFile;
+ import org.springframework.web.portlet.util.ActionRequestWrapper;
+ 
+@@ -161,4 +163,12 @@
+ 		throw new IllegalStateException("Multipart request not initialized");
+ 	}
+ 
++	public String getMethod() {
++		throw new UnsupportedOperationException("getMethod");
++	}
++
++	public Cookie[] getCookies() {
++		throw new UnsupportedOperationException("getCookies");
++	}
++
+ }
+--- a/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
++++ b/src/org/springframework/web/portlet/mvc/PortletWrappingController.java
+@@ -20,6 +20,7 @@
+ import java.util.Locale;
+ import java.util.Properties;
+ import java.util.ResourceBundle;
++import java.util.Map;
+ 
+ import javax.portlet.ActionRequest;
+ import javax.portlet.ActionResponse;
+@@ -203,6 +204,29 @@
+ 			return (portletConfig != null ? portletConfig.getResourceBundle(locale) : null);
+ 		}
+ 
++		public Map getContainerRuntimeOptions() {
++			throw new UnsupportedOperationException("getContainerRuntimeOptions");
++		}
++
++		public Enumeration getSupportedLocales() {
++			throw new UnsupportedOperationException("getSupportedLocales");
++		}
++
++		public Enumeration getProcessingEventQNames() {
++			throw new UnsupportedOperationException("getProcessingEventQNames");
++		}
++
++		public Enumeration getPublishingEventQNames() {
++			throw new UnsupportedOperationException("getPublishingEventQNames");
++		}
++
++		public String getDefaultNamespace() {
++			throw new UnsupportedOperationException("getDefaultNamespace");
++		}
++
++		public Enumeration getPublicRenderParameterNames() {
++			throw new UnsupportedOperationException("getPublicRenderParameterNames");
++		}
+ 	}
+ 
+ }
+--- a/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
++++ b/src/org/springframework/web/portlet/util/ActionRequestWrapper.java
+@@ -75,4 +75,8 @@
+ 		return this.actionRequest.getContentLength();
+ 	}
+ 
++	public String getMethod() {
++		throw new UnsupportedOperationException("getMethod");
++	}
++
+ }
+--- a/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
++++ b/src/org/springframework/web/portlet/util/PortletRequestWrapper.java
+@@ -30,6 +30,8 @@
+ 
+ import org.springframework.util.Assert;
+ 
++import javax.servlet.http.Cookie;
++
+ /**
+  * Simple wrapper for a {@link javax.portlet.PortletRequest}, delegating all
+  * calls to the underlying request.
+@@ -194,4 +196,20 @@
+ 		return this.portletRequest.getServerPort();
+ 	}
+ 
++	public Map getPublicParameterMap() {
++		throw new UnsupportedOperationException("getPublicParameterMap");
++	}
++
++	public Map getPrivateParameterMap() {
++		throw new UnsupportedOperationException("getPrivateParameterMap");
++	}
++
++	public Cookie[] getCookies() {
++		throw new UnsupportedOperationException("getCookies");
++	}
++
++	public String getWindowID() {
++		throw new UnsupportedOperationException("getWindowID");
++	}
++
+ }

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/16_commonj.diff (from rev 12739, trunk/libspring-2.5-java/debian/patches/16_commonj.diff)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/16_commonj.diff	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/16_commonj.diff	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,52 @@
+Description: Compatibility with CommonJ API provided by Geronimo project
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-07-08
+Forwarded: no
+--- a/src/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
++++ b/src/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
+@@ -143,20 +143,20 @@
+ 	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);
+-		}
++		//}
++		//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);
++		//}
+ 	}
+ 
+ 	/**
+@@ -172,14 +172,12 @@
+ 	//-------------------------------------------------------------------------
+ 
+ 	public WorkItem schedule(Work work)
+-			throws WorkException, IllegalArgumentException {
+-
++	{
+ 		return this.workManager.schedule(work);
+ 	}
+ 
+ 	public WorkItem schedule(Work work, WorkListener workListener)
+-			throws WorkException, IllegalArgumentException {
+-
++	{
+ 		return this.workManager.schedule(work, workListener);
+ 	}
+ 

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/series	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,14 +0,0 @@
-01_build_xml.diff
-02_read_excludefile_build_xml.diff
-03_use_debian_asm2.diff
-04_remove_oc4j_weaving.diff
-05_remove_glassfish_weaving.diff
-06_no_jsf.diff
-08_use_glasshfish_toplink.diff
-09_junit_45.diff
-#10_jruby_11.diff
-11_servlet_jsp_api.diff
-12_aspectj_164.diff
-13_tiles_22.diff
-14_portlet_api.diff
-15_fix_build_with_asm3.diff

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/series (from rev 12739, trunk/libspring-2.5-java/debian/patches/series)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/series	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/patches/series	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,15 @@
+01_build_xml.diff
+02_read_excludefile_build_xml.diff
+03_use_debian_asm2.diff
+04_remove_oc4j_weaving.diff
+05_remove_glassfish_weaving.diff
+#06_no_jsf.diff
+08_use_glasshfish_toplink.diff
+09_junit_45.diff
+#10_jruby_11.diff
+11_servlet_jsp_api.diff
+12_aspectj_164.diff
+13_tiles_22.diff
+14_portlet_api.diff
+15_fix_build_with_asm3.diff
+16_commonj.diff

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aop-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-aop-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aop-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-aop</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: AOP</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: AOP</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.6.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>1.6.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-attributes</groupId>
-			<artifactId>commons-attributes-api</artifactId>
-			<version>2.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-attributes</groupId>
-			<artifactId>commons-attributes-compiler</artifactId>
-			<version>2.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>1.3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.jamonapi</groupId>
-			<artifactId>jamon</artifactId>
-			<version>2.4</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aop-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-aop-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aop-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aop-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-aop</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: AOP</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: AOP</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>1.6.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>1.6.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>2.1_3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-attributes</groupId>
+			<artifactId>commons-attributes-api</artifactId>
+			<version>2.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-attributes</groupId>
+			<artifactId>commons-attributes-compiler</artifactId>
+			<version>2.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-pool</groupId>
+			<artifactId>commons-pool</artifactId>
+			<version>1.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.jamonapi</groupId>
+			<artifactId>jamon</artifactId>
+			<version>2.4</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aspects-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aspects-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-aspects</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Aspects</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Aspects</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aspects-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aspects-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-aspects-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-aspects</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Aspects</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Aspects</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-beans-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-beans-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-beans-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-beans</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Beans</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Beans</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-beans-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-beans-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-beans-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-beans-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-beans</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Beans</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Beans</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>2.1_3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-context-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-context</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Context</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Context</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-			<version>3.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.bea.wlplatform</groupId>
-			<artifactId>commonj-twm</artifactId>
-			<version>1.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>ejb</artifactId>
-			<version>3.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.jms</groupId>
-			<artifactId>jms</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml</groupId>
-			<artifactId>jaxrpc-api</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-agent</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-context-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-context</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Context</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Context</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+			<version>3.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.bea.wlplatform</groupId>
+			<artifactId>commonj-twm</artifactId>
+			<version>1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.ejb</groupId>
+			<artifactId>ejb</artifactId>
+			<version>3.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>jms</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml</groupId>
+			<artifactId>jaxrpc-api</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-agent</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-support-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-context-support-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-support-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-context-support</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Context Support</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Context Support</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.bea.wlplatform</groupId>
-			<artifactId>commonj-twm</artifactId>
-			<version>1.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.freemarker</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>2.3.14</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>1.5.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>jasperreports</groupId>
-			<artifactId>jasperreports</artifactId>
-			<version>2.0.5</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-			<version>1.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jruby</groupId>
-			<artifactId>jruby</artifactId>
-			<version>1.0.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.5.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>oc4j</artifactId>
-			<version>1.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.beanshell</groupId>
-			<artifactId>bsh</artifactId>
-			<version>2.0b4</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>opensymphony</groupId>
-			<artifactId>quartz-all</artifactId>
-			<version>1.6.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>velocity</groupId>
-			<artifactId>velocity</artifactId>
-			<version>1.5</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>velocity-tools</groupId>
-			<artifactId>velocity-tools-generic</artifactId>
-			<version>1.4</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>velocity-tools</groupId>
-			<artifactId>velocity-tools-view</artifactId>
-			<version>1.4</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-support-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-context-support-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-support-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-context-support-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-context-support</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Context Support</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Context Support</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>2.1_3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.bea.wlplatform</groupId>
+			<artifactId>commonj-twm</artifactId>
+			<version>1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<version>2.3.14</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+			<version>1.5.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>jasperreports</groupId>
+			<artifactId>jasperreports</artifactId>
+			<version>2.0.5</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jruby</groupId>
+			<artifactId>jruby</artifactId>
+			<version>1.0.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.ehcache</groupId>
+			<artifactId>ehcache</artifactId>
+			<version>1.5.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.oracle</groupId>
+			<artifactId>oc4j</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.beanshell</groupId>
+			<artifactId>bsh</artifactId>
+			<version>2.0b4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>opensymphony</groupId>
+			<artifactId>quartz-all</artifactId>
+			<version>1.6.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>velocity</groupId>
+			<artifactId>velocity</artifactId>
+			<version>1.5</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>velocity-tools</groupId>
+			<artifactId>velocity-tools-generic</artifactId>
+			<version>1.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>velocity-tools</groupId>
+			<artifactId>velocity-tools-view</artifactId>
+			<version>1.4</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-core-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-core-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-core-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Core</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Core</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-<!-- External Dependencies -->
-	<dependencies>
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm</artifactId>
-			<version>2.2.3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm-commons</artifactId>
-			<version>2.2.3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm-util</artifactId>
-			<version>2.2.3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-			<version>3.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-core-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-core-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-core-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-core-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-core</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Core</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Core</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+<!-- External Dependencies -->
+	<dependencies>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm</artifactId>
+			<version>2.2.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-commons</artifactId>
+			<version>2.2.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-util</artifactId>
+			<version>2.2.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+			<version>3.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.15</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jdbc-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-jdbc-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jdbc-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-jdbc</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: JDBC</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: JDBC</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>c3p0</groupId>
-			<artifactId>c3p0</artifactId>
-			<version>0.9.1.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.2.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>jotm</groupId>
-			<artifactId>jotm</artifactId>
-			<version>2.0.10</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jdbc-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-jdbc-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jdbc-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jdbc-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-jdbc</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: JDBC</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: JDBC</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>c3p0</groupId>
+			<artifactId>c3p0</artifactId>
+			<version>0.9.1.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.2.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>jotm</groupId>
+			<artifactId>jotm</artifactId>
+			<version>2.0.10</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jms-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-jms-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jms-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-jms</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: JMS</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: JMS</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.jms</groupId>
-			<artifactId>jms</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jms-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-jms-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jms-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-jms-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-jms</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: JMS</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: JMS</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-pool</groupId>
+			<artifactId>commons-pool</artifactId>
+			<version>1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>jms</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-orm-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-orm-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-orm-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-orm</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: ORM</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: ORM</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>toplink-essentials</artifactId>
-			<version>2.41</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.oracle.toplink</groupId>
-			<artifactId>toplink</artifactId>
-			<version>10.1.3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.jdo</groupId>
-			<artifactId>jdo2-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ibatis</groupId>
-			<artifactId>ibatis-sqlmap</artifactId>
-			<version>2.3.4.726</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
-			<version>3.2.6.ga</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.3.2.GA</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-orm-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-orm-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-orm-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-orm-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-orm</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: ORM</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: ORM</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.oracle</groupId>
+			<artifactId>toplink-essentials</artifactId>
+			<version>2.41</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.oracle.toplink</groupId>
+			<artifactId>toplink</artifactId>
+			<version>10.1.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.jdo</groupId>
+			<artifactId>jdo2-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>persistence-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ibatis</groupId>
+			<artifactId>ibatis-sqlmap</artifactId>
+			<version>2.3.4.726</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+			<version>3.2.6.ga</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>3.3.2.GA</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-test-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-test-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-test-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-test</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Test</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Test</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.6.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>1.6.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.portlet</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-		</dependency>
-		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
-			<version>1.1.2</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-tx</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-test-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-test-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-test-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-test-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-test</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Test</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Test</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>1.6.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>1.6.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>persistence-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+		</dependency>
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
+			<version>1.1.2</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-tx-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-tx-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-tx-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,103 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-tx</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Transaction</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Transaction</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>aopalliance</groupId>
-			<artifactId>aopalliance</artifactId>
-			<version>1.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.experlog</groupId>
-			<artifactId>xapool</artifactId>
-			<version>1.5.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.resource</groupId>
-			<artifactId>connector-api</artifactId>
-			<version>1.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>jotm</groupId>
-			<artifactId>jotm</artifactId>
-			<version>2.0.10</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-aop</artifactId>
-			<version>${project.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-tx-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-tx-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-tx-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-tx-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-tx</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Transaction</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Transaction</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.experlog</groupId>
+			<artifactId>xapool</artifactId>
+			<version>1.5.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.resource</groupId>
+			<artifactId>connector-api</artifactId>
+			<version>1.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.transaction</groupId>
+			<artifactId>jta</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>jotm</groupId>
+			<artifactId>jotm</artifactId>
+			<version>2.0.10</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-web-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-web-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-web-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-web</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Web</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Web</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>1.7.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.caucho</groupId>
-			<artifactId>hessian</artifactId>
-			<version>3.1.3</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.faces</groupId>
-			<artifactId>jsf-api</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis</artifactId>
-			<version>1.4</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>struts</groupId>
-			<artifactId>struts</artifactId>
-			<version>1.2.9</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
-			<version>1.1.2</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-web-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-web-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-web-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-web-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-web</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Web</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Web</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.7.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.caucho</groupId>
+			<artifactId>hessian</artifactId>
+			<version>3.1.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.faces</groupId>
+			<artifactId>jsf-api</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.15</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>struts</groupId>
+			<artifactId>struts</artifactId>
+			<version>1.2.9</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
+			<version>1.1.2</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-webmvc-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,173 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-webmvc</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Web MVC</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Web MVC</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-attributes</groupId>
-			<artifactId>commons-attributes-api</artifactId>
-			<version>2.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-attributes</groupId>
-			<artifactId>commons-attributes-compiler</artifactId>
-			<version>2.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.lowagie</groupId>
-			<artifactId>itext</artifactId>
-			<version>2.0.7</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.freemarker</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>2.3.14</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>jasperreports</groupId>
-			<artifactId>jasperreports</artifactId>
-			<version>2.0.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>jexcelapi</groupId>
-			<artifactId>jxl</artifactId>
-			<version>2.6.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-api</artifactId>
-			<version>2.0.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-core</artifactId>
-			<version>2.0.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-jsp</artifactId>
-			<version>2.0.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
-			<version>3.0.1-FINAL</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>velocity</groupId>
-			<artifactId>velocity</artifactId>
-			<version>1.5</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>velocity-tools</groupId>
-			<artifactId>velocity-tools-generic</artifactId>
-			<version>1.4</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>velocity-tools</groupId>
-			<artifactId>velocity-tools-view</artifactId>
-			<version>1.4</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-webmvc-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-webmvc</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Web MVC</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Web MVC</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-attributes</groupId>
+			<artifactId>commons-attributes-api</artifactId>
+			<version>2.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-attributes</groupId>
+			<artifactId>commons-attributes-compiler</artifactId>
+			<version>2.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.lowagie</groupId>
+			<artifactId>itext</artifactId>
+			<version>2.0.7</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<version>2.3.14</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>jasperreports</groupId>
+			<artifactId>jasperreports</artifactId>
+			<version>2.0.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>jexcelapi</groupId>
+			<artifactId>jxl</artifactId>
+			<version>2.6.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-api</artifactId>
+			<version>2.0.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-core</artifactId>
+			<version>2.0.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-jsp</artifactId>
+			<version>2.0.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.0.1-FINAL</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>velocity</groupId>
+			<artifactId>velocity</artifactId>
+			<version>1.5</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>velocity-tools</groupId>
+			<artifactId>velocity-tools-generic</artifactId>
+			<version>1.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>velocity-tools</groupId>
+			<artifactId>velocity-tools-view</artifactId>
+			<version>1.4</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-portlet-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-webmvc-portlet-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-portlet-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-webmvc-portlet</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Web MVC Portlet</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Web MVC Portlet</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.portlet</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-portlet-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-webmvc-portlet-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-portlet-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-portlet-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-webmvc-portlet</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Web MVC Portlet</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Web MVC Portlet</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-struts-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-webmvc-struts-2.5.xml	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-struts-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<project
-		xmlns="http://maven.apache.org/POM/4.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-webmvc-struts</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Framework: Web MVC Struts</name>
-	<version>2.5.6.SEC01</version>
-	<description>Spring Framework: Web MVC Struts</description>
-	<url>http://www.springframework.org</url>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
-		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
-		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
-	</scm>
-	<organization>
-		<name>Spring Framework</name>
-		<url>http://www.springframework.org/</url>
-	</organization>
-	<dependencies>
-<!-- External Dependencies -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-api</artifactId>
-			<version>2.0.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-core</artifactId>
-			<version>2.0.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-jsp</artifactId>
-			<version>2.0.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>struts</groupId>
-			<artifactId>struts</artifactId>
-			<version>1.2.9</version>
-			<optional>true</optional>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>local</id>
-			<name>Spring Release Repository</name>
-			<url>file:///Users/benhale/brm/repos/repo</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-struts-2.5.xml (from rev 12739, trunk/libspring-2.5-java/debian/poms/spring-webmvc-struts-2.5.xml)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-struts-2.5.xml	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/poms/spring-webmvc-struts-2.5.xml	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-webmvc-struts</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Web MVC Struts</name>
+	<version>2.5.6.SEC02</version>
+	<description>Spring Framework: Web MVC Struts</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-api</artifactId>
+			<version>2.0.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-core</artifactId>
+			<version>2.0.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tiles</groupId>
+			<artifactId>tiles-jsp</artifactId>
+			<version>2.0.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>struts</groupId>
+			<artifactId>struts</artifactId>
+			<version>1.2.9</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Deleted: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/rules
===================================================================
--- trunk/libspring-2.5-java/debian/rules	2010-07-05 20:31:43 UTC (rev 12730)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/rules	2010-07-07 23:38:26 UTC (rev 12740)
@@ -1,68 +0,0 @@
-#!/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/-[^-]*$$//')
-
-POM_VERSION := 2.5.6
-MAVEN_REPO  := http://repository.sonatype.org/service/local/repositories/central/content
-
-MODULES = aop beans context context-support core jdbc jms orm test tx web webmvc \
-	webmvc-struts webmvc-portlet
-WEAVINGS = aspects
-
-JAVA_HOME       := /usr/lib/jvm/default-java
-ANT             := CLASSPATH=/usr/share/java/jarjar.jar JAVA_HOME=$(JAVA_HOME) ant
-
-%:
-	dh $@ --buildsystem=ant
-
-override_dh_auto_clean:
-	$(ANT) clean
-
-override_dh_auto_build:
-	$(ANT) alljars
-
-override_dh_auto_install:
-	for MYMOD in $(MODULES); do \
-		BASENAME=`echo spring-$$MYMOD-2.5`; \
-		JAR=`echo dist/modules/spring-$$MYMOD.jar`; \
-		POM=`echo debian/poms/$$BASENAME.xml`; \
-		PACKAGE=`echo lib$$BASENAME-java`; \
-		mh_installpom -p$$PACKAGE $$POM ; \
-		mh_installjar -p$$PACKAGE -nspring-$$MYMOD -i2.5 -l $$POM $$JAR ; \
-	done
-	for MYWEAVING in $(WEAVINGS); do \
-		BASENAME=`echo spring-$$MYWEAVING-2.5`; \
-		JAR=`echo dist/weaving/spring-$$MYWEAVING.jar`; \
-		POM=`echo debian/poms/$$BASENAME.xml`; \
-		PACKAGE=`echo lib$$BASENAME-java`; \
-		mh_installpom -p$$PACKAGE $$POM ; \
-		mh_installjar -p$$PACKAGE -nspring-$$MYWEAVING -i2.5 -l $$POM $$JAR ; \
-	done
-
-# 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-dependencies.zip
-	mkdir orig_tmp
-	(cd orig_tmp && \
-	unzip ../../spring-framework.zip && \
-	cd spring-framework-${VERSION} && ant clean && cd .. && \
-	rm -r spring-framework-${VERSION}/lib && \
-	mv spring-framework-${VERSION} ${PACKAGE} && \
-	tar -czf ../../${PACKAGE}_${VERSION}.orig.tar.gz ${PACKAGE})
-	rm -rf orig_tmp
-
-
-get-orig-pom:
-	for MYMOD in $(MODULES); do \
-		BASENAME=`echo spring-$$MYMOD-2.5`; \
-		POM=`echo debian/poms/$$BASENAME.xml`; \
-		wget -O $$POM $(MAVEN_REPO)/org/springframework/spring-$$MYMOD/$(POM_VERSION)/spring-$$MYMOD-$(POM_VERSION).pom; \
-	done
-	for MYWEAVING in $(WEAVINGS); do \
-		BASENAME=`echo spring-$$MYWEAVING-2.5`; \
-		POM=`echo debian/poms/$$BASENAME.xml`; \
-		wget -O $$POM $(MAVEN_REPO)/org/springframework/spring-$$MYWEAVING/$(POM_VERSION)/spring-$$MYWEAVING-$(POM_VERSION).pom; \
-	done
-	perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(VERSION)/' debian/poms/*.xml

Copied: tags/libspring-2.5-java/2.5.6.SEC02-1/debian/rules (from rev 12739, trunk/libspring-2.5-java/debian/rules)
===================================================================
--- tags/libspring-2.5-java/2.5.6.SEC02-1/debian/rules	                        (rev 0)
+++ tags/libspring-2.5-java/2.5.6.SEC02-1/debian/rules	2010-07-07 23:38:26 UTC (rev 12740)
@@ -0,0 +1,69 @@
+#!/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/-[^-]*$$//')
+
+POM_VERSION := 2.5.6
+MAVEN_REPO  := http://repository.sonatype.org/service/local/repositories/central/content
+
+MODULES = aop beans context context-support core jdbc jms orm test tx web webmvc \
+	webmvc-struts webmvc-portlet
+WEAVINGS = aspects
+
+JAVA_HOME       := /usr/lib/jvm/default-java
+ANT             := CLASSPATH=/usr/share/java/jarjar.jar JAVA_HOME=$(JAVA_HOME) ant
+
+%:
+	dh $@ --buildsystem=ant
+
+override_dh_auto_clean:
+	$(ANT) clean
+	mh_clean
+
+override_dh_auto_build:
+	$(ANT) alljars
+
+override_dh_auto_install:
+	for MYMOD in $(MODULES); do \
+		BASENAME=`echo spring-$$MYMOD-2.5`; \
+		JAR=`echo dist/modules/spring-$$MYMOD.jar`; \
+		POM=`echo debian/poms/$$BASENAME.xml`; \
+		PACKAGE=`echo lib$$BASENAME-java`; \
+		mh_installpom -p$$PACKAGE $$POM ; \
+		mh_installjar -p$$PACKAGE -nspring-$$MYMOD -i2.5 -l $$POM $$JAR ; \
+	done
+	for MYWEAVING in $(WEAVINGS); do \
+		BASENAME=`echo spring-$$MYWEAVING-2.5`; \
+		JAR=`echo dist/weaving/spring-$$MYWEAVING.jar`; \
+		POM=`echo debian/poms/$$BASENAME.xml`; \
+		PACKAGE=`echo lib$$BASENAME-java`; \
+		mh_installpom -p$$PACKAGE $$POM ; \
+		mh_installjar -p$$PACKAGE -nspring-$$MYWEAVING -i2.5 -l $$POM $$JAR ; \
+	done
+
+# 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-dependencies.zip
+	mkdir orig_tmp
+	(cd orig_tmp && \
+	unzip ../../spring-framework.zip && \
+	cd spring-framework-${VERSION} && ant clean && cd .. && \
+	rm -r spring-framework-${VERSION}/lib && \
+	mv spring-framework-${VERSION} ${PACKAGE} && \
+	tar -czf ../../${PACKAGE}_${VERSION}.orig.tar.gz ${PACKAGE})
+	rm -rf orig_tmp
+
+
+get-orig-pom:
+	for MYMOD in $(MODULES); do \
+		BASENAME=`echo spring-$$MYMOD-2.5`; \
+		POM=`echo debian/poms/$$BASENAME.xml`; \
+		wget -O $$POM $(MAVEN_REPO)/org/springframework/spring-$$MYMOD/$(POM_VERSION)/spring-$$MYMOD-$(POM_VERSION).pom; \
+	done
+	for MYWEAVING in $(WEAVINGS); do \
+		BASENAME=`echo spring-$$MYWEAVING-2.5`; \
+		POM=`echo debian/poms/$$BASENAME.xml`; \
+		wget -O $$POM $(MAVEN_REPO)/org/springframework/spring-$$MYWEAVING/$(POM_VERSION)/spring-$$MYWEAVING-$(POM_VERSION).pom; \
+	done
+	perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(VERSION)/' debian/poms/*.xml




More information about the pkg-java-commits mailing list