[pkg-java] r11255 - in trunk/libspring-2.5-java/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Sat Dec 12 14:07:21 UTC 2009


Author: drazzib
Date: 2009-12-12 14:07:20 +0000 (Sat, 12 Dec 2009)
New Revision: 11255

Added:
   trunk/libspring-2.5-java/debian/patches/01_build_xml.diff
   trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff
   trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff
   trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.diff
   trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.diff
   trunk/libspring-2.5-java/debian/patches/06_no_jsf.diff
   trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.diff
   trunk/libspring-2.5-java/debian/patches/09_junit_45.diff
   trunk/libspring-2.5-java/debian/patches/10_jruby_11.diff
   trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.diff
   trunk/libspring-2.5-java/debian/patches/12_aspectj_164.diff
   trunk/libspring-2.5-java/debian/patches/13_tiles_22.diff
   trunk/libspring-2.5-java/debian/patches/series
Removed:
   trunk/libspring-2.5-java/debian/patches/00list
   trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch
   trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.dpatch
   trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch
   trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch
   trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch
   trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch
   trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch
   trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch
   trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch
   trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch
   trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch
   trunk/libspring-2.5-java/debian/patches/13_tiles_22.dpatch
Modified:
   trunk/libspring-2.5-java/debian/README.source
   trunk/libspring-2.5-java/debian/changelog
   trunk/libspring-2.5-java/debian/control
   trunk/libspring-2.5-java/debian/rules
Log:
  - Refactor debian/rules by using "dh"
* 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

Modified: trunk/libspring-2.5-java/debian/README.source
===================================================================
--- trunk/libspring-2.5-java/debian/README.source	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/README.source	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,34 +1,12 @@
 Patch System
 ============
-
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
 
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
+See /usr/share/doc/quilt/README.source for a detailed explanation.
 
-    debian/rules patch
 
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
 Original tarball repack
 =======================
 How to prepare the original source:

Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/changelog	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,4 +1,4 @@
-libspring-2.5-java (2.5.6.SEC01-7) UNRELEASED; urgency=low
+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
@@ -6,6 +6,7 @@
   * 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
@@ -14,9 +15,13 @@
     - 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)
+  * 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 13:55:04 +0100
+ -- 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
 

Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/control	2009-12-12 14:07:20 UTC (rev 11255)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
 Uploaders: Andreas Schildbach <debian.org at schildbach.de>
-Build-Depends: dpatch, debhelper (>= 7), ant, openjdk-6-jdk
+Build-Depends: quilt, 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, libasm2-java,
  libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
@@ -21,7 +21,7 @@
 
 Package: libspring-core-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libasm2-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libasm2-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
@@ -33,7 +33,7 @@
 
 Package: libspring-beans-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libcglib-java
+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
@@ -43,7 +43,7 @@
 
 Package: libspring-aop-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
+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
@@ -54,7 +54,7 @@
 
 Package: libspring-context-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
 Recommends: libspring-aop-2.5-java, glassfish-javaee
 Suggests: jruby, bsh, groovy
 Description: modular Java/J2EE application framework - Context
@@ -67,7 +67,7 @@
 
 Package: libspring-context-support-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-context-2.5-java
+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
@@ -79,7 +79,7 @@
 
 Package: libspring-web-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-context-2.5-java
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
 Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java
 Suggests: glassfish-appserv
 Description: modular Java/J2EE application framework - Web
@@ -92,7 +92,7 @@
 
 Package: libspring-webmvc-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-web-2.5-java
+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
@@ -104,7 +104,7 @@
 
 Package: libspring-test-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+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
@@ -116,7 +116,7 @@
 
 Package: libspring-tx-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+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
@@ -128,7 +128,7 @@
 
 Package: libspring-jdbc-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, libc3p0-java
+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
@@ -138,7 +138,7 @@
 
 Package: libspring-jms-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, glassfish-javaee
+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
@@ -148,7 +148,7 @@
 
 Package: libspring-orm-2.5-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libspring-jdbc-2.5-java
+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

Deleted: trunk/libspring-2.5-java/debian/patches/00list
===================================================================
--- trunk/libspring-2.5-java/debian/patches/00list	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/00list	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,13 +0,0 @@
-01_build_xml
-02_read_excludefile_build_xml
-03_use_debian_asm2
-04_remove_oc4j_weaving
-05_remove_glassfish_weaving
-06_no_jsf
-08_use_glasshfish_toplink
-09_junit_45
-10_jruby_11
-11_servlet_jsp_api
-12_aspectj_164
-13_tiles_22
-

Added: trunk/libspring-2.5-java/debian/patches/01_build_xml.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/01_build_xml.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/01_build_xml.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,58 @@
+Description: Create /usr/share/java based classpath
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-12
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -50,28 +50,16 @@
+ 
+ 
+ 	<path id="all-libs">
+-
+-		<fileset dir="${lib.dir}">
+-			<include name="**/*.jar"/>
+-			<exclude name="aspectj/aspectjtools.jar"/>
+-			<exclude name="bundlor/*.jar"/>
+-			<exclude name="junit/*.jar"/>
+-		</fileset>
+-
++		<fileset dir="/" includesfile="debian/classpath-debian"/>
+ 	</path>
+ 
+ 	<path id="attribute-compiler-classpath">
+-
+-		<fileset dir="lib/jakarta-commons">
+-			<include name="commons-attributes-compiler.jar"/>
+-			<include name="commons-collections.jar"/>
+-		</fileset>
+-		<fileset dir="lib/qdox">
+-			<include name="qdox-1.5.jar"/>
+-		</fileset>
+-
++		<fileset dir="/" includesfile="debian/attribute-compiler-classpath-debian"/>
+ 	</path>
+ 
++	<path id="ant-classpath">
++		<fileset dir="/" includesfile="debian/ant-classpath-debian"/>
++        </path>
+ 
+ 	<patternset id="spring.full.packages">
+ 		<include name="META-INF/*.handlers"/>
+@@ -212,7 +200,7 @@
+ 
+ 
+ 	<!-- Jar Jar Links taskdef (required for repackaging ASM) -->
+-	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar/jarjar.jar"/>
++	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="ant-classpath"/>
+ 
+ 
+ 	<target name="usage">
+@@ -1112,7 +1100,7 @@
+ 	</target>
+ 
+ 
+-	<target name="alljars" depends="fulljar,fullsources,modulejars,modulesources,weavingjars,weavingsources,bundlor"
++	<target name="alljars" depends="modulejars,modulesources,weavingjars,weavingsources"
+ 			description="Create all JAR files"/>
+ 
+ 


Property changes on: trunk/libspring-2.5-java/debian/patches/01_build_xml.diff
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_build_xml.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Create /usr/share/java based classpath.
-
- at DPATCH@
-diff -urNad libspring-2.5-java-2.5.6.SEC01~/build.xml libspring-2.5-java-2.5.6.SEC01/build.xml
---- libspring-2.5-java-2.5.6.SEC01~/build.xml	2009-04-20 19:43:22.000000000 +0200
-+++ libspring-2.5-java-2.5.6.SEC01/build.xml	2009-05-27 16:16:00.829633266 +0200
-@@ -50,28 +50,16 @@
- 
- 
- 	<path id="all-libs">
--
--		<fileset dir="${lib.dir}">
--			<include name="**/*.jar"/>
--			<exclude name="aspectj/aspectjtools.jar"/>
--			<exclude name="bundlor/*.jar"/>
--			<exclude name="junit/*.jar"/>
--		</fileset>
--
-+		<fileset dir="/" includesfile="debian/classpath-debian"/>
- 	</path>
- 
- 	<path id="attribute-compiler-classpath">
--
--		<fileset dir="lib/jakarta-commons">
--			<include name="commons-attributes-compiler.jar"/>
--			<include name="commons-collections.jar"/>
--		</fileset>
--		<fileset dir="lib/qdox">
--			<include name="qdox-1.5.jar"/>
--		</fileset>
--
-+		<fileset dir="/" includesfile="debian/attribute-compiler-classpath-debian"/>
- 	</path>
- 
-+	<path id="ant-classpath">
-+		<fileset dir="/" includesfile="debian/ant-classpath-debian"/>
-+        </path>
- 
- 	<patternset id="spring.full.packages">
- 		<include name="META-INF/*.handlers"/>
-@@ -212,7 +200,7 @@
- 
- 
- 	<!-- Jar Jar Links taskdef (required for repackaging ASM) -->
--	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar/jarjar.jar"/>
-+	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="ant-classpath"/>
- 
- 
- 	<target name="usage">
-@@ -1112,7 +1100,7 @@
- 	</target>
- 
- 
--	<target name="alljars" depends="fulljar,fullsources,modulejars,modulesources,weavingjars,weavingsources,bundlor"
-+	<target name="alljars" depends="modulejars,modulesources,weavingjars,weavingsources"
- 			description="Create all JAR files"/>
- 
- 

Added: trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,38 @@
+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>
+@@ -370,6 +372,7 @@
+ 			<classpath refid="all-libs"/>
+ 			<classpath location="${junit38.jar}"/>
+ 			<classpath location="${target.classes.dir}"/>
++			<excludesfile name="debian/excludesfiles/mainmock.excludes"/>
+ 		</javac>
+ 
+ 		<!-- Pick up logging config from test directory -->
+@@ -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 -->

Deleted: trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_read_excludefile_build_xml.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Read some excludesfile to exclude some java source file from build.
-
- at DPATCH@
-diff -urNad libspring-2.5-java-2.5.6.SEC01~/build.xml libspring-2.5-java-2.5.6.SEC01/build.xml
---- libspring-2.5-java-2.5.6.SEC01~/build.xml	2009-05-27 16:18:53.349286733 +0200
-+++ libspring-2.5-java-2.5.6.SEC01/build.xml	2009-05-27 16:20:17.718174838 +0200
-@@ -297,6 +297,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"/>
-@@ -340,6 +341,7 @@
- 				deprecation="false" optimize="false" failonerror="true">
- 			<src path="${tiger.src.dir}"/>
- 			<classpath refid="all-libs"/>
-+			<excludesfile name="debian/excludesfiles/tiger.excludes"/>
- 		</javac>
- 
- 	</target>
-@@ -382,6 +384,7 @@
- 			<classpath refid="all-libs"/>
- 			<classpath location="${junit38.jar}"/>
- 			<classpath location="${target.classes.dir}"/>
-+			<excludesfile name="debian/excludesfiles/mainmock.excludes"/>
- 		</javac>
- 
- 		<!-- Pick up logging config from test directory -->
-@@ -405,6 +408,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 -->

Added: trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -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
+@@ -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;

Deleted: trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_use_debian_asm2.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use debian ASM2 JAR instead of CGLIB-nodep version
-
- at DPATCH@
-diff -urNad libspring-2.5-java~/build.xml libspring-2.5-java/build.xml
---- libspring-2.5-java~/build.xml	2008-09-14 17:04:03.000000000 +0000
-+++ libspring-2.5-java/build.xml	2008-09-14 17:04:59.000000000 +0000
-@@ -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}">
-diff -urNad libspring-2.5-java~/src/org/springframework/scripting/support/ScriptFactoryPostProcessor.java libspring-2.5-java/src/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
---- libspring-2.5-java~/src/org/springframework/scripting/support/ScriptFactoryPostProcessor.java	2008-09-14 17:03:58.000000000 +0000
-+++ libspring-2.5-java/src/org/springframework/scripting/support/ScriptFactoryPostProcessor.java	2008-09-14 17:04:05.000000000 +0000
-@@ -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;

Added: trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,24 @@
+Description: Remove OC4J Weaver (non-free stuff)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-12
+Forwarded: not-needed
+--- a/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
++++ b/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
+@@ -28,7 +28,6 @@
+ import org.springframework.instrument.classloading.LoadTimeWeaver;
+ import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver;
+ import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
+-import org.springframework.instrument.classloading.oc4j.OC4JLoadTimeWeaver;
+ import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
+ 
+ /**
+@@ -99,9 +98,6 @@
+ 			if (classLoader.getClass().getName().startsWith("weblogic")) {
+ 				return new WebLogicLoadTimeWeaver(classLoader);
+ 			}
+-			else if (classLoader.getClass().getName().startsWith("oracle")) {
+-				return new OC4JLoadTimeWeaver(classLoader);
+-			}
+ 			else if (classLoader.getClass().getName().startsWith("com.sun.enterprise")) {
+ 				return new GlassFishLoadTimeWeaver(classLoader);
+ 			}

Deleted: trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_remove_oc4j_weaving.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove OC4J Weaver
-
- at DPATCH@
-diff -urNad trunk~/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java trunk/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
---- trunk~/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java	2008-01-28 13:22:36.000000000 +0100
-+++ trunk/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java	2008-09-04 23:19:45.000000000 +0200
-@@ -28,7 +28,6 @@
- import org.springframework.instrument.classloading.LoadTimeWeaver;
- import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver;
- import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
--import org.springframework.instrument.classloading.oc4j.OC4JLoadTimeWeaver;
- import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
- 
- /**
-@@ -99,9 +98,6 @@
- 			if (classLoader.getClass().getName().startsWith("weblogic")) {
- 				return new WebLogicLoadTimeWeaver(classLoader);
- 			}
--			else if (classLoader.getClass().getName().startsWith("oracle")) {
--				return new OC4JLoadTimeWeaver(classLoader);
--			}
- 			else if (classLoader.getClass().getName().startsWith("com.sun.enterprise")) {
- 				return new GlassFishLoadTimeWeaver(classLoader);
- 			}

Added: trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,27 @@
+Description: Remove usage of GlassFishLoadTimeWeaver because
+ it used InstrumentableClassLoader which is not provided by
+ Debian Glassfish package.
+Bug-Debian: http://bugs.debian.org/506291
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-12
+Forwarded: not-needed
+--- a/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
++++ b/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
+@@ -27,7 +27,6 @@
+ import org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver;
+ import org.springframework.instrument.classloading.LoadTimeWeaver;
+ import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver;
+-import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
+ import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
+ 
+ /**
+@@ -98,9 +97,6 @@
+ 			if (classLoader.getClass().getName().startsWith("weblogic")) {
+ 				return new WebLogicLoadTimeWeaver(classLoader);
+ 			}
+-			else if (classLoader.getClass().getName().startsWith("com.sun.enterprise")) {
+-				return new GlassFishLoadTimeWeaver(classLoader);
+-			}
+ 		}
+ 		catch (IllegalStateException ex) {
+ 			logger.info("Could not obtain server-specific LoadTimeWeaver: " + ex.getMessage());

Deleted: trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_remove_glassfish_weaving.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove usage of GlassFishLoadTimeWeaver because it used InstrumentableClassLoader
-## DP: which is not provided by Debian Glassfish package.
-## DP: <http://bugs.debian.org/506291>
-
- at DPATCH@
-diff -urNad trunk~/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java trunk/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
---- trunk~/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java	2008-10-28 00:45:01.000000000 +0100
-+++ trunk/tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java	2008-10-28 00:45:10.000000000 +0100
-@@ -27,7 +27,6 @@
- import org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver;
- import org.springframework.instrument.classloading.LoadTimeWeaver;
- import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver;
--import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
- import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
- 
- /**
-@@ -98,9 +97,6 @@
- 			if (classLoader.getClass().getName().startsWith("weblogic")) {
- 				return new WebLogicLoadTimeWeaver(classLoader);
- 			}
--			else if (classLoader.getClass().getName().startsWith("com.sun.enterprise")) {
--				return new GlassFishLoadTimeWeaver(classLoader);
--			}
- 		}
- 		catch (IllegalStateException ex) {
- 			logger.info("Could not obtain server-specific LoadTimeWeaver: " + ex.getMessage());

Added: trunk/libspring-2.5-java/debian/patches/06_no_jsf.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/06_no_jsf.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/06_no_jsf.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,43 @@
+Description: There is no DFSG-free Java Server Faces so disable JSF imports
+ and usage in Spring Framework. RequestContextHolder.java
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-12
+Forwarded: not-needed
+--- a/src/org/springframework/web/context/request/RequestContextHolder.java
++++ b/src/org/springframework/web/context/request/RequestContextHolder.java
+@@ -16,8 +16,6 @@
+ 
+ package org.springframework.web.context.request;
+ 
+-import javax.faces.context.FacesContext;
+-
+ import org.springframework.core.NamedInheritableThreadLocal;
+ import org.springframework.core.NamedThreadLocal;
+ import org.springframework.util.ClassUtils;
+@@ -115,9 +113,6 @@
+ 	public static RequestAttributes currentRequestAttributes() throws IllegalStateException {
+ 		RequestAttributes attributes = getRequestAttributes();
+ 		if (attributes == null) {
+-			if (jsfPresent) {
+-				attributes = FacesRequestAttributesFactory.getFacesRequestAttributes();
+-			}
+ 			if (attributes == null) {
+ 				throw new IllegalStateException("No thread-bound request found: " +
+ 						"Are you referring to request attributes outside of an actual web request, " +
+@@ -130,16 +125,4 @@
+ 		return attributes;
+ 	}
+ 
+-
+-	/**
+-	 * Inner class to avoid hard-coded JSF dependency.
+- 	 */
+-	private static class FacesRequestAttributesFactory {
+-
+-		public static RequestAttributes getFacesRequestAttributes() {
+-			FacesContext facesContext = FacesContext.getCurrentInstance();
+-			return (facesContext != null ? new FacesRequestAttributes(facesContext) : null);
+-		}
+-	}
+-
+ }

Deleted: trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_no_jsf.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: There is no DFSG-free Java Server Faces so disable JSF imports
-## DP: and usage in Spring Framework.
-## DP: RequestContextHolder.java
-
- at DPATCH@
-diff -urNad trunk~/src/org/springframework/web/context/request/RequestContextHolder.java trunk/src/org/springframework/web/context/request/RequestContextHolder.java
---- trunk~/src/org/springframework/web/context/request/RequestContextHolder.java	2008-02-20 12:38:20.000000000 +0100
-+++ trunk/src/org/springframework/web/context/request/RequestContextHolder.java	2008-10-28 00:27:53.000000000 +0100
-@@ -16,8 +16,6 @@
- 
- package org.springframework.web.context.request;
- 
--import javax.faces.context.FacesContext;
--
- import org.springframework.core.NamedInheritableThreadLocal;
- import org.springframework.core.NamedThreadLocal;
- import org.springframework.util.ClassUtils;
-@@ -114,9 +112,6 @@
- 	public static RequestAttributes currentRequestAttributes() throws IllegalStateException {
- 		RequestAttributes attributes = getRequestAttributes();
- 		if (attributes == null) {
--			if (jsfPresent) {
--				attributes = FacesRequestAttributesFactory.getFacesRequestAttributes();
--			}
- 			if (attributes == null) {
- 				throw new IllegalStateException("No thread-bound request found: " +
- 						"Are you referring to request attributes outside of an actual web request, " +
-@@ -129,16 +124,4 @@
- 		return attributes;
- 	}
- 
--
--	/**
--	 * Inner class to avoid hard-coded JSF dependency.
-- 	 */
--	private static class FacesRequestAttributesFactory {
--
--		public static RequestAttributes getFacesRequestAttributes() {
--			FacesContext facesContext = FacesContext.getCurrentInstance();
--			return (facesContext != null ? new FacesRequestAttributes(facesContext) : null);
--		}
--	}
--
- }

Added: trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,411 @@
+Description:
+ - Remap all oracle.toplink.* to oracle.toplink.essentials.* to use Glassfish
+   TopLink Essentials JPA (from glassfish-toplink-essentials package).
+ - Remove references to Oracle Toplink 9.0.4 (non-free)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-12
+Forwarded: not-needed
+--- a/src/org/springframework/orm/toplink/AbstractSessionFactory.java
++++ b/src/org/springframework/orm/toplink/AbstractSessionFactory.java
+@@ -21,9 +21,9 @@
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Proxy;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
+-import oracle.toplink.sessions.UnitOfWork;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
++import oracle.toplink.essentials.sessions.UnitOfWork;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+--- a/src/org/springframework/orm/toplink/LocalSessionFactory.java
++++ b/src/org/springframework/orm/toplink/LocalSessionFactory.java
+@@ -24,16 +24,16 @@
+ 
+ import javax.sql.DataSource;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.internal.databaseaccess.DatabasePlatform;
+-import oracle.toplink.jndi.JNDIConnector;
+-import oracle.toplink.sessionbroker.SessionBroker;
+-import oracle.toplink.sessions.DatabaseLogin;
+-import oracle.toplink.sessions.DatabaseSession;
+-import oracle.toplink.sessions.SessionLog;
+-import oracle.toplink.threetier.ServerSession;
+-import oracle.toplink.tools.sessionconfiguration.XMLLoader;
+-import oracle.toplink.tools.sessionmanagement.SessionManager;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.internal.databaseaccess.DatabasePlatform;
++import oracle.toplink.essentials.jndi.JNDIConnector;
++//import oracle.toplink.essentials.sessionbroker.SessionBroker;
++import oracle.toplink.essentials.sessions.DatabaseLogin;
++import oracle.toplink.essentials.sessions.DatabaseSession;
++import oracle.toplink.essentials.logging.SessionLog;
++import oracle.toplink.essentials.threetier.ServerSession;
++//import oracle.toplink.essentials.tools.sessionconfiguration.XMLLoader;
++import oracle.toplink.essentials.tools.sessionmanagement.SessionManager;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+@@ -330,7 +330,7 @@
+ 		// Override default SessionLog with specified one, if any.
+ 		if (this.sessionLog != null) {
+ 			session.setSessionLog(this.sessionLog);
+-			session.logMessages();
++			//session.logMessages();
+ 		}
+ 
+ 		// Log in and create corresponding SessionFactory.
+@@ -402,11 +402,11 @@
+ 		catch (Exception ex) {
+ 			// TopLink 10.1.3 XMLSessionConfigLoader not found ->
+ 			// fall back to TopLink 9.0.4 XMLLoader.
+-			if (logger.isDebugEnabled()) {
+-				logger.debug("Using TopLink 9.0.4 XMLLoader");
+-			}
+-			XMLLoader xmlLoader = new XMLLoader(configLocation);
+-			return (DatabaseSession) manager.getSession(xmlLoader, sessionName, sessionClassLoader, false, false);
++			//if (logger.isDebugEnabled()) {
++			//	logger.debug("Using TopLink 9.0.4 XMLLoader");
++			//}
++			//XMLLoader xmlLoader = new XMLLoader(configLocation);
++			//return (DatabaseSession) manager.getSession(xmlLoader, sessionName, sessionClassLoader, false, false);
+ 		}
+ 
+ 		// TopLink 10.1.3 XMLSessionConfigLoader found -> create loader instance
+@@ -447,9 +447,9 @@
+ 		if (session instanceof ServerSession) {
+ 			return new ServerSessionFactory((ServerSession) session);
+ 		}
+-		else if (session instanceof SessionBroker) {
+-			return new SessionBrokerSessionFactory((SessionBroker) session);
+-		}
++		//else if (session instanceof SessionBroker) {
++		//	return new SessionBrokerSessionFactory((SessionBroker) session);
++		//}
+ 		else {
+ 			return new SingleSessionFactory(session);
+ 		}
+--- a/src/org/springframework/orm/toplink/LocalSessionFactoryBean.java
++++ b/src/org/springframework/orm/toplink/LocalSessionFactoryBean.java
+@@ -18,8 +18,8 @@
+ 
+ import java.sql.SQLException;
+ 
+-import oracle.toplink.exceptions.DatabaseException;
+-import oracle.toplink.exceptions.TopLinkException;
++import oracle.toplink.essentials.exceptions.DatabaseException;
++import oracle.toplink.essentials.exceptions.TopLinkException;
+ 
+ import org.springframework.beans.factory.BeanClassLoaderAware;
+ import org.springframework.beans.factory.DisposableBean;
+--- a/src/org/springframework/orm/toplink/ServerSessionFactory.java
++++ b/src/org/springframework/orm/toplink/ServerSessionFactory.java
+@@ -16,9 +16,9 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
+-import oracle.toplink.threetier.ServerSession;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
++import oracle.toplink.essentials.threetier.ServerSession;
+ 
+ /**
+  * Full-fledged default implementation of the SessionFactory interface:
+--- a/src/org/springframework/orm/toplink/SessionFactory.java
++++ b/src/org/springframework/orm/toplink/SessionFactory.java
+@@ -16,8 +16,8 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
+ 
+ /**
+  * The SessionFactory interface serves as factory for TopLink Sessions,
+--- a/src/org/springframework/orm/toplink/SessionFactoryUtils.java
++++ b/src/org/springframework/orm/toplink/SessionFactoryUtils.java
+@@ -16,13 +16,13 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.ConcurrencyException;
+-import oracle.toplink.exceptions.ConversionException;
+-import oracle.toplink.exceptions.DatabaseException;
+-import oracle.toplink.exceptions.OptimisticLockException;
+-import oracle.toplink.exceptions.QueryException;
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.exceptions.ConcurrencyException;
++import oracle.toplink.essentials.exceptions.ConversionException;
++import oracle.toplink.essentials.exceptions.DatabaseException;
++import oracle.toplink.essentials.exceptions.OptimisticLockException;
++import oracle.toplink.essentials.exceptions.QueryException;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+--- a/src/org/springframework/orm/toplink/SessionHolder.java
++++ b/src/org/springframework/orm/toplink/SessionHolder.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.sessions.Session;
+ 
+ import org.springframework.transaction.support.ResourceHolderSupport;
+ import org.springframework.util.Assert;
+--- a/src/org/springframework/orm/toplink/SessionReadCallback.java
++++ b/src/org/springframework/orm/toplink/SessionReadCallback.java
+@@ -16,9 +16,9 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
+-import oracle.toplink.sessions.UnitOfWork;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
++import oracle.toplink.essentials.sessions.UnitOfWork;
+ 
+ /**
+  * Convenient abstract implementation of the TopLinkCallback interface,
+--- a/src/org/springframework/orm/toplink/SingleSessionFactory.java
++++ b/src/org/springframework/orm/toplink/SingleSessionFactory.java
+@@ -16,8 +16,8 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.sessions.DatabaseSession;
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.sessions.DatabaseSession;
++import oracle.toplink.essentials.sessions.Session;
+ 
+ /**
+  * Simple implementation of the SessionFactory interface: always returns
+--- a/src/org/springframework/orm/toplink/TopLinkAccessor.java
++++ b/src/org/springframework/orm/toplink/TopLinkAccessor.java
+@@ -18,8 +18,8 @@
+ 
+ import java.sql.SQLException;
+ 
+-import oracle.toplink.exceptions.DatabaseException;
+-import oracle.toplink.exceptions.TopLinkException;
++import oracle.toplink.essentials.exceptions.DatabaseException;
++import oracle.toplink.essentials.exceptions.TopLinkException;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+--- a/src/org/springframework/orm/toplink/TopLinkCallback.java
++++ b/src/org/springframework/orm/toplink/TopLinkCallback.java
+@@ -16,8 +16,8 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
+ 
+ /**
+  * Callback interface for TopLink code. To be used with {@link TopLinkTemplate}'s
+--- a/src/org/springframework/orm/toplink/TopLinkInterceptor.java
++++ b/src/org/springframework/orm/toplink/TopLinkInterceptor.java
+@@ -16,8 +16,8 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
+ import org.aopalliance.intercept.MethodInterceptor;
+ import org.aopalliance.intercept.MethodInvocation;
+ 
+--- a/src/org/springframework/orm/toplink/TopLinkJdbcException.java
++++ b/src/org/springframework/orm/toplink/TopLinkJdbcException.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.DatabaseException;
++import oracle.toplink.essentials.exceptions.DatabaseException;
+ 
+ import org.springframework.dao.UncategorizedDataAccessException;
+ 
+--- a/src/org/springframework/orm/toplink/TopLinkOperations.java
++++ b/src/org/springframework/orm/toplink/TopLinkOperations.java
+@@ -19,10 +19,10 @@
+ import java.util.Collection;
+ import java.util.List;
+ 
+-import oracle.toplink.expressions.Expression;
+-import oracle.toplink.queryframework.Call;
+-import oracle.toplink.queryframework.DatabaseQuery;
+-import oracle.toplink.sessions.ObjectCopyingPolicy;
++import oracle.toplink.essentials.expressions.Expression;
++import oracle.toplink.essentials.queryframework.Call;
++import oracle.toplink.essentials.queryframework.DatabaseQuery;
++import oracle.toplink.essentials.sessions.ObjectCopyingPolicy;
+ 
+ import org.springframework.dao.DataAccessException;
+ 
+--- a/src/org/springframework/orm/toplink/TopLinkOptimisticLockingFailureException.java
++++ b/src/org/springframework/orm/toplink/TopLinkOptimisticLockingFailureException.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.OptimisticLockException;
++import oracle.toplink.essentials.exceptions.OptimisticLockException;
+ 
+ import org.springframework.orm.ObjectOptimisticLockingFailureException;
+ 
+--- a/src/org/springframework/orm/toplink/TopLinkQueryException.java
++++ b/src/org/springframework/orm/toplink/TopLinkQueryException.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.QueryException;
++import oracle.toplink.essentials.exceptions.QueryException;
+ 
+ import org.springframework.dao.InvalidDataAccessResourceUsageException;
+ 
+--- a/src/org/springframework/orm/toplink/TopLinkSystemException.java
++++ b/src/org/springframework/orm/toplink/TopLinkSystemException.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
++import oracle.toplink.essentials.exceptions.TopLinkException;
+ 
+ import org.springframework.dao.UncategorizedDataAccessException;
+ 
+--- a/src/org/springframework/orm/toplink/TopLinkTemplate.java
++++ b/src/org/springframework/orm/toplink/TopLinkTemplate.java
+@@ -23,14 +23,14 @@
+ import java.util.List;
+ import java.util.Vector;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.expressions.Expression;
+-import oracle.toplink.queryframework.Call;
+-import oracle.toplink.queryframework.DatabaseQuery;
+-import oracle.toplink.queryframework.ReadObjectQuery;
+-import oracle.toplink.sessions.ObjectCopyingPolicy;
+-import oracle.toplink.sessions.Session;
+-import oracle.toplink.sessions.UnitOfWork;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.expressions.Expression;
++import oracle.toplink.essentials.queryframework.Call;
++import oracle.toplink.essentials.queryframework.DatabaseQuery;
++import oracle.toplink.essentials.queryframework.ReadObjectQuery;
++import oracle.toplink.essentials.sessions.ObjectCopyingPolicy;
++import oracle.toplink.essentials.sessions.Session;
++import oracle.toplink.essentials.sessions.UnitOfWork;
+ 
+ import org.springframework.dao.DataAccessException;
+ import org.springframework.dao.InvalidDataAccessApiUsageException;
+--- a/src/org/springframework/orm/toplink/TopLinkTransactionManager.java
++++ b/src/org/springframework/orm/toplink/TopLinkTransactionManager.java
+@@ -21,11 +21,11 @@
+ 
+ import javax.sql.DataSource;
+ 
+-import oracle.toplink.exceptions.DatabaseException;
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.internal.databaseaccess.Accessor;
+-import oracle.toplink.internal.databaseaccess.DatabaseAccessor;
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.exceptions.DatabaseException;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.internal.databaseaccess.Accessor;
++import oracle.toplink.essentials.internal.databaseaccess.DatabaseAccessor;
++import oracle.toplink.essentials.sessions.Session;
+ 
+ import org.springframework.beans.factory.InitializingBean;
+ import org.springframework.dao.DataAccessException;
+@@ -340,14 +340,14 @@
+ 	 * @see oracle.toplink.internal.databaseaccess.DatabaseAccessor#getConnection()
+ 	 */
+ 	protected Connection getJdbcConnection(Session session) {
+-		if (!(session instanceof oracle.toplink.publicinterface.Session)) {
++		if (!(session instanceof oracle.toplink.essentials.internal.sessions.AbstractSession)) {
+ 			if (logger.isDebugEnabled()) {
+ 				logger.debug("TopLink Session [" + session +
+-						"] does not derive from [oracle.toplink.publicinterface.Session]");
++						"] does not derive from [oracle.toplink.essentials.sessions.Session]");
+ 			}
+ 			return null;
+ 		}
+-		Accessor accessor = ((oracle.toplink.publicinterface.Session) session).getAccessor();
++		Accessor accessor = ((oracle.toplink.essentials.internal.sessions.AbstractSession) session).getAccessor();
+ 		if (!(accessor instanceof DatabaseAccessor)) {
+ 			if (logger.isDebugEnabled()) {
+ 				logger.debug("TopLink Accessor [" + accessor +
+--- a/src/org/springframework/orm/toplink/UnitOfWorkCallback.java
++++ b/src/org/springframework/orm/toplink/UnitOfWorkCallback.java
+@@ -16,9 +16,9 @@
+ 
+ package org.springframework.orm.toplink;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
+-import oracle.toplink.sessions.UnitOfWork;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
++import oracle.toplink.essentials.sessions.UnitOfWork;
+ 
+ /**
+  * Convenient abstract implementation of the TopLinkCallback interface,
+--- a/src/org/springframework/orm/toplink/support/CommonsLoggingSessionLog.java
++++ b/src/org/springframework/orm/toplink/support/CommonsLoggingSessionLog.java
+@@ -18,10 +18,10 @@
+ 
+ import java.lang.reflect.Method;
+ 
+-import oracle.toplink.internal.databaseaccess.Accessor;
+-import oracle.toplink.logging.AbstractSessionLog;
+-import oracle.toplink.logging.SessionLogEntry;
+-import oracle.toplink.publicinterface.Session;
++import oracle.toplink.essentials.internal.databaseaccess.Accessor;
++import oracle.toplink.essentials.logging.AbstractSessionLog;
++import oracle.toplink.essentials.logging.SessionLogEntry;
++import oracle.toplink.essentials.sessions.Session;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+--- a/src/org/springframework/orm/toplink/support/TopLinkDaoSupport.java
++++ b/src/org/springframework/orm/toplink/support/TopLinkDaoSupport.java
+@@ -16,8 +16,8 @@
+ 
+ package org.springframework.orm.toplink.support;
+ 
+-import oracle.toplink.exceptions.TopLinkException;
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.exceptions.TopLinkException;
++import oracle.toplink.essentials.sessions.Session;
+ 
+ import org.springframework.dao.DataAccessException;
+ import org.springframework.dao.DataAccessResourceFailureException;
+--- a/src/org/springframework/orm/toplink/support/TransactionAwareSessionAdapter.java
++++ b/src/org/springframework/orm/toplink/support/TransactionAwareSessionAdapter.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.orm.toplink.support;
+ 
+-import oracle.toplink.sessions.Session;
++import oracle.toplink.essentials.sessions.Session;
+ 
+ import org.springframework.beans.factory.FactoryBean;
+ import org.springframework.orm.toplink.SessionFactory;

Deleted: trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,436 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_use_glasshfish_toplink.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: * Remap all oracle.toplink.* to oracle.toplink.essentials.* to use Glassfish
-## DP:   TopLink Essentials JPA (from glassfish-toplink-essentials package).
-## DP: * Remove references to Oracle Toplink 9.0.4 (non-free)
-
- at DPATCH@
-diff -urNad trunk~/src/org/springframework/orm/toplink/AbstractSessionFactory.java trunk/src/org/springframework/orm/toplink/AbstractSessionFactory.java
---- trunk~/src/org/springframework/orm/toplink/AbstractSessionFactory.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/AbstractSessionFactory.java	2009-02-14 15:59:03.000000000 +0100
-@@ -21,9 +21,9 @@
- import java.lang.reflect.Method;
- import java.lang.reflect.Proxy;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
--import oracle.toplink.sessions.UnitOfWork;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
-+import oracle.toplink.essentials.sessions.UnitOfWork;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/LocalSessionFactory.java trunk/src/org/springframework/orm/toplink/LocalSessionFactory.java
---- trunk~/src/org/springframework/orm/toplink/LocalSessionFactory.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/LocalSessionFactory.java	2009-02-14 15:59:03.000000000 +0100
-@@ -24,16 +24,16 @@
- 
- import javax.sql.DataSource;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.internal.databaseaccess.DatabasePlatform;
--import oracle.toplink.jndi.JNDIConnector;
--import oracle.toplink.sessionbroker.SessionBroker;
--import oracle.toplink.sessions.DatabaseLogin;
--import oracle.toplink.sessions.DatabaseSession;
--import oracle.toplink.sessions.SessionLog;
--import oracle.toplink.threetier.ServerSession;
--import oracle.toplink.tools.sessionconfiguration.XMLLoader;
--import oracle.toplink.tools.sessionmanagement.SessionManager;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.internal.databaseaccess.DatabasePlatform;
-+import oracle.toplink.essentials.jndi.JNDIConnector;
-+//import oracle.toplink.essentials.sessionbroker.SessionBroker;
-+import oracle.toplink.essentials.sessions.DatabaseLogin;
-+import oracle.toplink.essentials.sessions.DatabaseSession;
-+import oracle.toplink.essentials.logging.SessionLog;
-+import oracle.toplink.essentials.threetier.ServerSession;
-+//import oracle.toplink.essentials.tools.sessionconfiguration.XMLLoader;
-+import oracle.toplink.essentials.tools.sessionmanagement.SessionManager;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
-@@ -330,7 +330,7 @@
- 		// Override default SessionLog with specified one, if any.
- 		if (this.sessionLog != null) {
- 			session.setSessionLog(this.sessionLog);
--			session.logMessages();
-+			//session.logMessages();
- 		}
- 
- 		// Log in and create corresponding SessionFactory.
-@@ -402,11 +402,11 @@
- 		catch (Exception ex) {
- 			// TopLink 10.1.3 XMLSessionConfigLoader not found ->
- 			// fall back to TopLink 9.0.4 XMLLoader.
--			if (logger.isDebugEnabled()) {
--				logger.debug("Using TopLink 9.0.4 XMLLoader");
--			}
--			XMLLoader xmlLoader = new XMLLoader(configLocation);
--			return (DatabaseSession) manager.getSession(xmlLoader, sessionName, sessionClassLoader, false, false);
-+			//if (logger.isDebugEnabled()) {
-+			//	logger.debug("Using TopLink 9.0.4 XMLLoader");
-+			//}
-+			//XMLLoader xmlLoader = new XMLLoader(configLocation);
-+			//return (DatabaseSession) manager.getSession(xmlLoader, sessionName, sessionClassLoader, false, false);
- 		}
- 
- 		// TopLink 10.1.3 XMLSessionConfigLoader found -> create loader instance
-@@ -447,9 +447,9 @@
- 		if (session instanceof ServerSession) {
- 			return new ServerSessionFactory((ServerSession) session);
- 		}
--		else if (session instanceof SessionBroker) {
--			return new SessionBrokerSessionFactory((SessionBroker) session);
--		}
-+		//else if (session instanceof SessionBroker) {
-+		//	return new SessionBrokerSessionFactory((SessionBroker) session);
-+		//}
- 		else {
- 			return new SingleSessionFactory(session);
- 		}
-diff -urNad trunk~/src/org/springframework/orm/toplink/LocalSessionFactoryBean.java trunk/src/org/springframework/orm/toplink/LocalSessionFactoryBean.java
---- trunk~/src/org/springframework/orm/toplink/LocalSessionFactoryBean.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/LocalSessionFactoryBean.java	2009-02-14 15:59:03.000000000 +0100
-@@ -18,8 +18,8 @@
- 
- import java.sql.SQLException;
- 
--import oracle.toplink.exceptions.DatabaseException;
--import oracle.toplink.exceptions.TopLinkException;
-+import oracle.toplink.essentials.exceptions.DatabaseException;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
- 
- import org.springframework.beans.factory.BeanClassLoaderAware;
- import org.springframework.beans.factory.DisposableBean;
-diff -urNad trunk~/src/org/springframework/orm/toplink/ServerSessionFactory.java trunk/src/org/springframework/orm/toplink/ServerSessionFactory.java
---- trunk~/src/org/springframework/orm/toplink/ServerSessionFactory.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/ServerSessionFactory.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,9 +16,9 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
--import oracle.toplink.threetier.ServerSession;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
-+import oracle.toplink.essentials.threetier.ServerSession;
- 
- /**
-  * Full-fledged default implementation of the SessionFactory interface:
-diff -urNad trunk~/src/org/springframework/orm/toplink/SessionFactory.java trunk/src/org/springframework/orm/toplink/SessionFactory.java
---- trunk~/src/org/springframework/orm/toplink/SessionFactory.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/SessionFactory.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,8 +16,8 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
- 
- /**
-  * The SessionFactory interface serves as factory for TopLink Sessions,
-diff -urNad trunk~/src/org/springframework/orm/toplink/SessionFactoryUtils.java trunk/src/org/springframework/orm/toplink/SessionFactoryUtils.java
---- trunk~/src/org/springframework/orm/toplink/SessionFactoryUtils.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/SessionFactoryUtils.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,13 +16,13 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.ConcurrencyException;
--import oracle.toplink.exceptions.ConversionException;
--import oracle.toplink.exceptions.DatabaseException;
--import oracle.toplink.exceptions.OptimisticLockException;
--import oracle.toplink.exceptions.QueryException;
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.exceptions.ConcurrencyException;
-+import oracle.toplink.essentials.exceptions.ConversionException;
-+import oracle.toplink.essentials.exceptions.DatabaseException;
-+import oracle.toplink.essentials.exceptions.OptimisticLockException;
-+import oracle.toplink.essentials.exceptions.QueryException;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/SessionHolder.java trunk/src/org/springframework/orm/toplink/SessionHolder.java
---- trunk~/src/org/springframework/orm/toplink/SessionHolder.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/SessionHolder.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.sessions.Session;
- 
- import org.springframework.transaction.support.ResourceHolderSupport;
- import org.springframework.util.Assert;
-diff -urNad trunk~/src/org/springframework/orm/toplink/SessionReadCallback.java trunk/src/org/springframework/orm/toplink/SessionReadCallback.java
---- trunk~/src/org/springframework/orm/toplink/SessionReadCallback.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/SessionReadCallback.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,9 +16,9 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
--import oracle.toplink.sessions.UnitOfWork;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
-+import oracle.toplink.essentials.sessions.UnitOfWork;
- 
- /**
-  * Convenient abstract implementation of the TopLinkCallback interface,
-diff -urNad trunk~/src/org/springframework/orm/toplink/SingleSessionFactory.java trunk/src/org/springframework/orm/toplink/SingleSessionFactory.java
---- trunk~/src/org/springframework/orm/toplink/SingleSessionFactory.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/SingleSessionFactory.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,8 +16,8 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.sessions.DatabaseSession;
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.sessions.DatabaseSession;
-+import oracle.toplink.essentials.sessions.Session;
- 
- /**
-  * Simple implementation of the SessionFactory interface: always returns
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkAccessor.java trunk/src/org/springframework/orm/toplink/TopLinkAccessor.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkAccessor.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkAccessor.java	2009-02-14 15:59:03.000000000 +0100
-@@ -18,8 +18,8 @@
- 
- import java.sql.SQLException;
- 
--import oracle.toplink.exceptions.DatabaseException;
--import oracle.toplink.exceptions.TopLinkException;
-+import oracle.toplink.essentials.exceptions.DatabaseException;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkCallback.java trunk/src/org/springframework/orm/toplink/TopLinkCallback.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkCallback.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkCallback.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,8 +16,8 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
- 
- /**
-  * Callback interface for TopLink code. To be used with {@link TopLinkTemplate}'s
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkInterceptor.java trunk/src/org/springframework/orm/toplink/TopLinkInterceptor.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkInterceptor.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkInterceptor.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,8 +16,8 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
- import org.aopalliance.intercept.MethodInterceptor;
- import org.aopalliance.intercept.MethodInvocation;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkJdbcException.java trunk/src/org/springframework/orm/toplink/TopLinkJdbcException.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkJdbcException.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkJdbcException.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.DatabaseException;
-+import oracle.toplink.essentials.exceptions.DatabaseException;
- 
- import org.springframework.dao.UncategorizedDataAccessException;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkOperations.java trunk/src/org/springframework/orm/toplink/TopLinkOperations.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkOperations.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkOperations.java	2009-02-14 15:59:03.000000000 +0100
-@@ -19,10 +19,10 @@
- import java.util.Collection;
- import java.util.List;
- 
--import oracle.toplink.expressions.Expression;
--import oracle.toplink.queryframework.Call;
--import oracle.toplink.queryframework.DatabaseQuery;
--import oracle.toplink.sessions.ObjectCopyingPolicy;
-+import oracle.toplink.essentials.expressions.Expression;
-+import oracle.toplink.essentials.queryframework.Call;
-+import oracle.toplink.essentials.queryframework.DatabaseQuery;
-+import oracle.toplink.essentials.sessions.ObjectCopyingPolicy;
- 
- import org.springframework.dao.DataAccessException;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkOptimisticLockingFailureException.java trunk/src/org/springframework/orm/toplink/TopLinkOptimisticLockingFailureException.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkOptimisticLockingFailureException.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkOptimisticLockingFailureException.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.OptimisticLockException;
-+import oracle.toplink.essentials.exceptions.OptimisticLockException;
- 
- import org.springframework.orm.ObjectOptimisticLockingFailureException;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkQueryException.java trunk/src/org/springframework/orm/toplink/TopLinkQueryException.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkQueryException.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkQueryException.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.QueryException;
-+import oracle.toplink.essentials.exceptions.QueryException;
- 
- import org.springframework.dao.InvalidDataAccessResourceUsageException;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkSystemException.java trunk/src/org/springframework/orm/toplink/TopLinkSystemException.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkSystemException.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkSystemException.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.TopLinkException;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
- 
- import org.springframework.dao.UncategorizedDataAccessException;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkTemplate.java trunk/src/org/springframework/orm/toplink/TopLinkTemplate.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkTemplate.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkTemplate.java	2009-02-14 15:59:03.000000000 +0100
-@@ -23,14 +23,14 @@
- import java.util.List;
- import java.util.Vector;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.expressions.Expression;
--import oracle.toplink.queryframework.Call;
--import oracle.toplink.queryframework.DatabaseQuery;
--import oracle.toplink.queryframework.ReadObjectQuery;
--import oracle.toplink.sessions.ObjectCopyingPolicy;
--import oracle.toplink.sessions.Session;
--import oracle.toplink.sessions.UnitOfWork;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.expressions.Expression;
-+import oracle.toplink.essentials.queryframework.Call;
-+import oracle.toplink.essentials.queryframework.DatabaseQuery;
-+import oracle.toplink.essentials.queryframework.ReadObjectQuery;
-+import oracle.toplink.essentials.sessions.ObjectCopyingPolicy;
-+import oracle.toplink.essentials.sessions.Session;
-+import oracle.toplink.essentials.sessions.UnitOfWork;
- 
- import org.springframework.dao.DataAccessException;
- import org.springframework.dao.InvalidDataAccessApiUsageException;
-diff -urNad trunk~/src/org/springframework/orm/toplink/TopLinkTransactionManager.java trunk/src/org/springframework/orm/toplink/TopLinkTransactionManager.java
---- trunk~/src/org/springframework/orm/toplink/TopLinkTransactionManager.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/TopLinkTransactionManager.java	2009-02-14 17:26:28.000000000 +0100
-@@ -21,11 +21,11 @@
- 
- import javax.sql.DataSource;
- 
--import oracle.toplink.exceptions.DatabaseException;
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.internal.databaseaccess.Accessor;
--import oracle.toplink.internal.databaseaccess.DatabaseAccessor;
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.exceptions.DatabaseException;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.internal.databaseaccess.Accessor;
-+import oracle.toplink.essentials.internal.databaseaccess.DatabaseAccessor;
-+import oracle.toplink.essentials.sessions.Session;
- 
- import org.springframework.beans.factory.InitializingBean;
- import org.springframework.dao.DataAccessException;
-@@ -340,14 +340,14 @@
- 	 * @see oracle.toplink.internal.databaseaccess.DatabaseAccessor#getConnection()
- 	 */
- 	protected Connection getJdbcConnection(Session session) {
--		if (!(session instanceof oracle.toplink.publicinterface.Session)) {
-+		if (!(session instanceof oracle.toplink.essentials.internal.sessions.AbstractSession)) {
- 			if (logger.isDebugEnabled()) {
- 				logger.debug("TopLink Session [" + session +
--						"] does not derive from [oracle.toplink.publicinterface.Session]");
-+						"] does not derive from [oracle.toplink.essentials.sessions.Session]");
- 			}
- 			return null;
- 		}
--		Accessor accessor = ((oracle.toplink.publicinterface.Session) session).getAccessor();
-+		Accessor accessor = ((oracle.toplink.essentials.internal.sessions.AbstractSession) session).getAccessor();
- 		if (!(accessor instanceof DatabaseAccessor)) {
- 			if (logger.isDebugEnabled()) {
- 				logger.debug("TopLink Accessor [" + accessor +
-diff -urNad trunk~/src/org/springframework/orm/toplink/UnitOfWorkCallback.java trunk/src/org/springframework/orm/toplink/UnitOfWorkCallback.java
---- trunk~/src/org/springframework/orm/toplink/UnitOfWorkCallback.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/UnitOfWorkCallback.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,9 +16,9 @@
- 
- package org.springframework.orm.toplink;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
--import oracle.toplink.sessions.UnitOfWork;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
-+import oracle.toplink.essentials.sessions.UnitOfWork;
- 
- /**
-  * Convenient abstract implementation of the TopLinkCallback interface,
-diff -urNad trunk~/src/org/springframework/orm/toplink/support/CommonsLoggingSessionLog.java trunk/src/org/springframework/orm/toplink/support/CommonsLoggingSessionLog.java
---- trunk~/src/org/springframework/orm/toplink/support/CommonsLoggingSessionLog.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/support/CommonsLoggingSessionLog.java	2009-02-14 15:59:03.000000000 +0100
-@@ -18,10 +18,10 @@
- 
- import java.lang.reflect.Method;
- 
--import oracle.toplink.internal.databaseaccess.Accessor;
--import oracle.toplink.logging.AbstractSessionLog;
--import oracle.toplink.logging.SessionLogEntry;
--import oracle.toplink.publicinterface.Session;
-+import oracle.toplink.essentials.internal.databaseaccess.Accessor;
-+import oracle.toplink.essentials.logging.AbstractSessionLog;
-+import oracle.toplink.essentials.logging.SessionLogEntry;
-+import oracle.toplink.essentials.sessions.Session;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
-diff -urNad trunk~/src/org/springframework/orm/toplink/support/TopLinkDaoSupport.java trunk/src/org/springframework/orm/toplink/support/TopLinkDaoSupport.java
---- trunk~/src/org/springframework/orm/toplink/support/TopLinkDaoSupport.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/support/TopLinkDaoSupport.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,8 +16,8 @@
- 
- package org.springframework.orm.toplink.support;
- 
--import oracle.toplink.exceptions.TopLinkException;
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.exceptions.TopLinkException;
-+import oracle.toplink.essentials.sessions.Session;
- 
- import org.springframework.dao.DataAccessException;
- import org.springframework.dao.DataAccessResourceFailureException;
-diff -urNad trunk~/src/org/springframework/orm/toplink/support/TransactionAwareSessionAdapter.java trunk/src/org/springframework/orm/toplink/support/TransactionAwareSessionAdapter.java
---- trunk~/src/org/springframework/orm/toplink/support/TransactionAwareSessionAdapter.java	2009-02-14 15:59:02.000000000 +0100
-+++ trunk/src/org/springframework/orm/toplink/support/TransactionAwareSessionAdapter.java	2009-02-14 15:59:03.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- package org.springframework.orm.toplink.support;
- 
--import oracle.toplink.sessions.Session;
-+import oracle.toplink.essentials.sessions.Session;
- 
- import org.springframework.beans.factory.FactoryBean;
- import org.springframework.orm.toplink.SessionFactory;

Added: trunk/libspring-2.5-java/debian/patches/09_junit_45.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/09_junit_45.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/09_junit_45.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,42 @@
+Description: basic JUnit 4.5 compatibility (accepting use of deprecated SPI).
+ from SpringFramework 3.0 M1
+Origin: <https://fisheye.springframework.org/changelog/spring-framework?cs=315>
+--- a/tiger/mock/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
++++ b/tiger/mock/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
+@@ -24,6 +24,7 @@
+ import org.junit.internal.runners.InitializationError;
+ import org.junit.internal.runners.JUnit4ClassRunner;
+ import org.junit.runner.Description;
++import org.junit.runner.notification.Failure;
+ import org.junit.runner.notification.RunNotifier;
+ 
+ import org.springframework.test.annotation.ProfileValueUtils;
+@@ -148,11 +149,11 @@
+ 			testInstance = createTest();
+ 		}
+ 		catch (InvocationTargetException ex) {
+-			notifier.testAborted(description, ex.getCause());
++			notifier.fireTestFailure(new Failure(description, ex.getCause()));
+ 			return;
+ 		}
+ 		catch (Exception ex) {
+-			notifier.testAborted(description, ex);
++			notifier.fireTestFailure(new Failure(description, ex.getCause()));
+ 			return;
+ 		}
+ 
+--- a/tiger/mock/org/springframework/test/context/junit4/SpringMethodRoadie.java
++++ b/tiger/mock/org/springframework/test/context/junit4/SpringMethodRoadie.java
+@@ -29,10 +29,11 @@
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import org.junit.Assume.AssumptionViolatedException;
++
+ import org.junit.runner.Description;
+ import org.junit.runner.notification.Failure;
+ import org.junit.runner.notification.RunNotifier;
++import org.junit.internal.AssumptionViolatedException;
+ 
+ import org.springframework.test.annotation.Repeat;
+ import org.springframework.test.annotation.Timed;

Deleted: trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_junit_45.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: basic JUnit 4.5 compatibility (accepting use of deprecated SPI).
-## DP: from SpringFramework 3.0 M1
-## DP: <https://fisheye.springframework.org/changelog/spring-framework?cs=315>
-
- at DPATCH@
-diff -urNad trunk~/tiger/mock/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java trunk/tiger/mock/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
---- trunk~/tiger/mock/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java	2008-03-31 09:30:02.000000000 +0200
-+++ trunk/tiger/mock/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java	2009-03-24 01:41:28.800287514 +0100
-@@ -24,6 +24,7 @@
- import org.junit.internal.runners.InitializationError;
- import org.junit.internal.runners.JUnit4ClassRunner;
- import org.junit.runner.Description;
-+import org.junit.runner.notification.Failure;
- import org.junit.runner.notification.RunNotifier;
- 
- import org.springframework.test.context.TestContextManager;
-@@ -130,11 +131,11 @@
- 			testInstance = createTest();
- 		}
- 		catch (InvocationTargetException ex) {
--			notifier.testAborted(description, ex.getCause());
-+			notifier.fireTestFailure(new Failure(description, ex.getCause()));
- 			return;
- 		}
- 		catch (Exception ex) {
--			notifier.testAborted(description, ex);
-+			notifier.fireTestFailure(new Failure(description, ex.getCause()));
- 			return;
- 		}
- 
-diff -urNad trunk~/tiger/mock/org/springframework/test/context/junit4/SpringMethodRoadie.java trunk/tiger/mock/org/springframework/test/context/junit4/SpringMethodRoadie.java
---- trunk~/tiger/mock/org/springframework/test/context/junit4/SpringMethodRoadie.java	2008-03-26 23:57:16.000000000 +0100
-+++ trunk/tiger/mock/org/springframework/test/context/junit4/SpringMethodRoadie.java	2009-03-24 01:42:14.668286856 +0100
-@@ -29,10 +29,11 @@
- 
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
--import org.junit.Assume.AssumptionViolatedException;
-+
- import org.junit.runner.Description;
- import org.junit.runner.notification.Failure;
- import org.junit.runner.notification.RunNotifier;
-+import org.junit.internal.AssumptionViolatedException;
- 
- import org.springframework.test.annotation.Repeat;
- import org.springframework.test.annotation.Timed;

Added: trunk/libspring-2.5-java/debian/patches/10_jruby_11.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/10_jruby_11.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/10_jruby_11.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,43 @@
+Description: basic JRuby 1.1 compatibility pack.
+ from SpringFramework 3.0 M1
+Origin: <https://fisheye.springframework.org/changelog/spring-framework?cs=314>
+--- a/src/org/springframework/scripting/jruby/JRubyScriptUtils.java
++++ b/src/org/springframework/scripting/jruby/JRubyScriptUtils.java
+@@ -34,7 +34,6 @@
+ import org.jruby.exceptions.JumpException;
+ import org.jruby.exceptions.RaiseException;
+ import org.jruby.javasupport.JavaEmbedUtils;
+-import org.jruby.runtime.DynamicScope;
+ import org.jruby.runtime.builtin.IRubyObject;
+ 
+ import org.springframework.core.NestedRuntimeException;
+@@ -56,11 +55,6 @@
+  */
+ public abstract class JRubyScriptUtils {
+ 
+-	// Determine whether the old JRuby 0.9 parse method is available (incompatible with 1.0)
+-	private final static Method oldParseMethod = ClassUtils.getMethodIfAvailable(
+-			Ruby.class, "parse", new Class[] {String.class, String.class, DynamicScope.class});
+-
+-
+ 	/**
+ 	 * Create a new JRuby-scripted object from the given script source,
+ 	 * using the default {@link ClassLoader}.
+@@ -85,14 +79,12 @@
+ 	public static Object createJRubyObject(String scriptSource, Class[] interfaces, ClassLoader classLoader) {
+ 		Ruby ruby = initializeRuntime();
+ 
+-		Node scriptRootNode = (oldParseMethod != null ?
+-				(Node) ReflectionUtils.invokeMethod(oldParseMethod, ruby, new Object[] {scriptSource, "", null}) :
+-				ruby.parse(scriptSource, "", null, 0));
+-		IRubyObject rubyObject = ruby.eval(scriptRootNode);
++		Node scriptRootNode = ruby.parseEval(scriptSource, "", null, 0);
++		IRubyObject rubyObject = ruby.runNormally(scriptRootNode, false);
+ 
+ 		if (rubyObject instanceof RubyNil) {
+ 			String className = findClassName(scriptRootNode);
+-			rubyObject = ruby.evalScript("\n" + className + ".new");
++			rubyObject = ruby.evalScriptlet("\n" + className + ".new");
+ 		}
+ 		// still null?
+ 		if (rubyObject instanceof RubyNil) {

Deleted: trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_jruby_11.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: basic JRuby 1.1 compatibility pack.
-## DP: from SpringFramework 3.0 M1
-## DP: <https://fisheye.springframework.org/changelog/spring-framework?cs=314>
-
- at DPATCH@
-diff -urNad trunk~/src/org/springframework/scripting/jruby/JRubyScriptUtils.java trunk/src/org/springframework/scripting/jruby/JRubyScriptUtils.java
---- trunk~/src/org/springframework/scripting/jruby/JRubyScriptUtils.java	2008-04-24 13:47:56.000000000 +0200
-+++ trunk/src/org/springframework/scripting/jruby/JRubyScriptUtils.java	2009-04-19 19:40:58.875673642 +0200
-@@ -34,7 +34,6 @@
- import org.jruby.exceptions.JumpException;
- import org.jruby.exceptions.RaiseException;
- import org.jruby.javasupport.JavaEmbedUtils;
--import org.jruby.runtime.DynamicScope;
- import org.jruby.runtime.builtin.IRubyObject;
- 
- import org.springframework.aop.support.AopUtils;
-@@ -57,11 +56,6 @@
-  */
- public abstract class JRubyScriptUtils {
- 
--	// Determine whether the old JRuby 0.9 parse method is available (incompatible with 1.0)
--	private final static Method oldParseMethod = ClassUtils.getMethodIfAvailable(
--			Ruby.class, "parse", new Class[] {String.class, String.class, DynamicScope.class});
--
--
- 	/**
- 	 * Create a new JRuby-scripted object from the given script source,
- 	 * using the default {@link ClassLoader}.
-@@ -86,14 +80,12 @@
- 	public static Object createJRubyObject(String scriptSource, Class[] interfaces, ClassLoader classLoader) {
- 		Ruby ruby = initializeRuntime();
- 
--		Node scriptRootNode = (oldParseMethod != null ?
--				(Node) ReflectionUtils.invokeMethod(oldParseMethod, ruby, new Object[] {scriptSource, "", null}) :
--				ruby.parse(scriptSource, "", null, 0));
--		IRubyObject rubyObject = ruby.eval(scriptRootNode);
-+		Node scriptRootNode = ruby.parseEval(scriptSource, "", null, 0);
-+		IRubyObject rubyObject = ruby.runNormally(scriptRootNode, false);
- 
- 		if (rubyObject instanceof RubyNil) {
- 			String className = findClassName(scriptRootNode);
--			rubyObject = ruby.evalScript("\n" + className + ".new");
-+			rubyObject = ruby.evalScriptlet("\n" + className + ".new");
- 		}
- 		// still null?
- 		if (rubyObject instanceof RubyNil) {

Added: trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,24 @@
+Description: compatibility fixes for Servlet 2.5 and JSP 2.1 API's
+ taken from SpringFramework 3.0 M1
+Origin: <https://fisheye.springsource.org/changelog/spring-framework?cs=345>
+--- a/mock/org/springframework/mock/web/MockPageContext.java
++++ b/mock/org/springframework/mock/web/MockPageContext.java
+@@ -20,6 +20,7 @@
+ import java.util.Enumeration;
+ import java.util.Hashtable;
+ 
++import javax.el.ELContext;
+ import javax.servlet.Servlet;
+ import javax.servlet.ServletConfig;
+ import javax.servlet.ServletContext;
+@@ -275,6 +276,10 @@
+ 		return new MockExpressionEvaluator(this);
+ 	}
+ 
++	public ELContext getELContext() {
++		throw new UnsupportedOperationException("getELContext");
++	}
++
+ 	public VariableResolver getVariableResolver() {
+ 		return null;
+ 	}

Deleted: trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_servlet_jsp_api.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: compatibility fixes for Servlet 2.5 and JSP 2.1 API's
-## DP: taken from SpringFramework 3.0 M1
-## DP: <https://fisheye.springsource.org/changelog/spring-framework?cs=345>
-
- at DPATCH@
-diff -urNad trunk~/mock/org/springframework/mock/web/MockPageContext.java trunk/mock/org/springframework/mock/web/MockPageContext.java
---- trunk~/mock/org/springframework/mock/web/MockPageContext.java	2009-04-20 19:43:10.000000000 +0200
-+++ trunk/mock/org/springframework/mock/web/MockPageContext.java	2009-05-27 19:12:02.057763071 +0200
-@@ -20,6 +20,7 @@
- import java.util.Enumeration;
- import java.util.Hashtable;
- 
-+import javax.el.ELContext;
- import javax.servlet.Servlet;
- import javax.servlet.ServletConfig;
- import javax.servlet.ServletContext;
-@@ -275,6 +276,10 @@
- 		return new MockExpressionEvaluator(this);
- 	}
- 
-+	public ELContext getELContext() {
-+		throw new UnsupportedOperationException("getELContext");
-+	}
-+
- 	public VariableResolver getVariableResolver() {
- 		return null;
- 	}

Added: trunk/libspring-2.5-java/debian/patches/12_aspectj_164.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/12_aspectj_164.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/12_aspectj_164.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,25 @@
+Description: Compatibility fix for AspectJ 1.6.4
+ Taken from Spring Framework 3
+Origin: <https://fisheye.springsource.org/changelog/spring-framework?cs=1792>
+--- a/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
++++ b/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
+@@ -58,7 +58,6 @@
+ 	/** Lazily initialized source location object */
+ 	private SourceLocation sourceLocation;
+ 
+-
+ 	/**
+ 	 * Create a new MethodInvocationProceedingJoinPoint, wrapping the given
+ 	 * Spring ProxyMethodInvocation object.
+@@ -69,6 +68,11 @@
+ 		this.methodInvocation = methodInvocation;
+ 	}
+ 
++	public int getId() {
++		// TODO: It's just an adapter but returning 0 might still have side effects...
++		return 0;
++	}
++
+ 	public void set$AroundClosure(AroundClosure aroundClosure) {
+ 		throw new UnsupportedOperationException();
+ 	}

Deleted: trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_aspectj_164.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Compatibility fix for AspectJ 1.6.4
-## DP: Taken from Spring Framework 3 trunk :
-## DP: <https://fisheye.springsource.org/changelog/spring-framework?cs=1792>
-
- at DPATCH@
-diff -urNad libspring-2.5-java~/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java libspring-2.5-java/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
---- libspring-2.5-java~/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java	2009-09-20 18:43:57.465941316 +0200
-+++ libspring-2.5-java/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java	2009-09-20 18:44:48.342337677 +0200
-@@ -58,7 +58,6 @@
- 	/** Lazily initialized source location object */
- 	private SourceLocation sourceLocation;
- 
--
- 	/**
- 	 * Create a new MethodInvocationProceedingJoinPoint, wrapping the given
- 	 * Spring ProxyMethodInvocation object.
-@@ -69,6 +68,11 @@
- 		this.methodInvocation = methodInvocation;
- 	}
- 
-+	public int getId() {
-+		// TODO: It's just an adapter but returning 0 might still have side effects...
-+		return 0;
-+	}
-+
- 	public void set$AroundClosure(AroundClosure aroundClosure) {
- 		throw new UnsupportedOperationException();
- 	}

Added: trunk/libspring-2.5-java/debian/patches/13_tiles_22.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/13_tiles_22.diff	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/13_tiles_22.diff	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,271 @@
+Description: Tiles 2.2 compatibility patch.
+ from SpringFramework 3.0
+Origin: <https://fisheye.springsource.org/changelog/spring-framework?cs=1488>
+--- a/src/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
++++ b/src/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
+@@ -17,12 +17,13 @@
+ package org.springframework.web.servlet.view.tiles2;
+ 
+ import javax.servlet.ServletRequest;
++import javax.servlet.ServletContext;
+ 
+ import org.apache.tiles.TilesException;
+ import org.apache.tiles.context.TilesRequestContext;
+ import org.apache.tiles.preparer.PreparerFactory;
+ import org.apache.tiles.preparer.ViewPreparer;
+-import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
++import org.apache.tiles.servlet.context.ServletTilesRequestContext;
+ 
+ import org.springframework.web.context.WebApplicationContext;
+ import org.springframework.web.servlet.support.RequestContextUtils;
+@@ -45,16 +46,16 @@
+ 		if (context.getRequest() instanceof ServletRequest) {
+ 			servletRequest = (ServletRequest) context.getRequest();
+ 		}
+-		ServletTilesApplicationContext tilesApplicationContext = null;
+-		if (context instanceof ServletTilesApplicationContext) {
+-			tilesApplicationContext = (ServletTilesApplicationContext) context;
++		ServletTilesRequestContext tilesApplicationContext = null;
++		if (context instanceof ServletTilesRequestContext) {
++			tilesApplicationContext = (ServletTilesRequestContext) context;
+ 		}
+ 		if (servletRequest == null && tilesApplicationContext == null) {
+ 			throw new IllegalStateException("SpringBeanPreparerFactory requires either a " +
+-					"ServletRequest or a ServletTilesApplicationContext to operate on");
++					"ServletRequest or a ServletTilesRequestContext to operate on");
+ 		}
+ 		WebApplicationContext webApplicationContext = RequestContextUtils.getWebApplicationContext(
+-				servletRequest, tilesApplicationContext.getServletContext());
++				servletRequest, (ServletContext) tilesApplicationContext.getContext());
+ 		return getPreparer(name, webApplicationContext);
+ 	}
+ 
+--- a/src/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
++++ b/src/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2002-2007 the original author or authors.
++ * Copyright 2002-2009 the original author or authors.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+@@ -17,11 +17,13 @@
+ package org.springframework.web.servlet.view.tiles2;
+ 
+ import java.util.Locale;
+-
+ import javax.servlet.http.HttpServletRequest;
++import javax.servlet.jsp.PageContext;
+ 
+ import org.apache.tiles.context.TilesRequestContext;
++import org.apache.tiles.jsp.context.JspTilesRequestContext;
+ import org.apache.tiles.locale.impl.DefaultLocaleResolver;
++import org.apache.tiles.servlet.context.ServletTilesRequestContext;
+ 
+ import org.springframework.web.servlet.support.RequestContextUtils;
+ 
+@@ -41,8 +43,12 @@
+ public class SpringLocaleResolver extends DefaultLocaleResolver {
+ 
+ 	public Locale resolveLocale(TilesRequestContext context) {
+-		if (context.getRequest() instanceof HttpServletRequest) {
+-			return RequestContextUtils.getLocale((HttpServletRequest) context.getRequest());
++		if (context instanceof ServletTilesRequestContext) {
++			return RequestContextUtils.getLocale(((ServletTilesRequestContext) context).getRequest());
++		}
++		else if (context instanceof JspTilesRequestContext) {
++			PageContext pc = ((JspTilesRequestContext) context).getPageContext();
++			return RequestContextUtils.getLocale((HttpServletRequest) pc.getRequest());
+ 		}
+ 		else {
+ 			return super.resolveLocale(context);
+--- a/src/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
++++ b/src/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2002-2007 the original author or authors.
++ * Copyright 2002-2009 the original author or authors.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+@@ -18,23 +18,23 @@
+ 
+ import java.util.Enumeration;
+ import java.util.Properties;
+-
+ import javax.servlet.ServletConfig;
+ import javax.servlet.ServletContext;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import org.apache.tiles.TilesContainer;
+ import org.apache.tiles.TilesException;
+-import org.apache.tiles.access.TilesAccess;
+-import org.apache.tiles.context.ChainedTilesContextFactory;
+-import org.apache.tiles.definition.UrlDefinitionsFactory;
++import org.apache.tiles.context.AbstractTilesApplicationContextFactory;
++import org.apache.tiles.definition.DefinitionsFactory;
+ import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
++import org.apache.tiles.evaluator.el.ELAttributeEvaluator;
+ import org.apache.tiles.factory.TilesContainerFactory;
+-import org.apache.tiles.impl.BasicTilesContainer;
+-import org.apache.tiles.jsp.context.JspTilesContextFactory;
+ import org.apache.tiles.preparer.BasicPreparerFactory;
+-import org.apache.tiles.servlet.context.ServletTilesContextFactory;
++import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
++import org.apache.tiles.servlet.context.ServletUtil;
++import org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContextFactory;
++import org.apache.tiles.startup.BasicTilesInitializer;
++import org.apache.tiles.startup.TilesInitializer;
+ import org.apache.tiles.web.util.ServletContextAdapter;
+ 
+ import org.springframework.beans.factory.DisposableBean;
+@@ -48,15 +48,15 @@
+  * <a href="http://tiles.apache.org">http://tiles.apache.org</a>
+  * for more information about Tiles, which basically is a templating
+  * mechanism for JSP-based web applications.
++ * <b>Note: Spring 3.0 requires Tiles 2.1.2 or above.</b>
+  *
+- * <p>The TilesConfigurer simply configures a TilesContainer using a set
+- * of files containing definitions, to be accessed by {@link TilesView}
+- * instances.
++ * <p>The TilesConfigurer simply configures a TilesContainer using a set of files
++ * containing definitions, to be accessed by {@link TilesView} instances. This is a
++ * Spring-based alternative (for usage in Spring configuration) to the Tiles-provided
++ * {@link org.apache.tiles.web.startup.TilesListener} (for usage in <code>web.xml</code>).
+  *
+  * <p>TilesViews can be managed by any {@link org.springframework.web.servlet.ViewResolver}.
+- * For simple convention-based view resolution, consider using
+- * {@link org.springframework.web.servlet.view.UrlBasedViewResolver} with the
+- * "viewClass" property set to "org.springframework.web.servlet.view.tiles2.TilesView".
++ * For simple convention-based view resolution, consider using {@link TilesViewResolver}.
+  *
+  * <p>A typical TilesConfigurer bean definition looks as follows:
+  *
+@@ -73,12 +73,12 @@
+  *   &lt;/property>
+  * &lt;/bean></pre>
+  *
+- * The values in the list are the actual files containing the definitions.
++ * The values in the list are the actual Tiles XML files containing the definitions.
+  *
+  * @author Juergen Hoeller
+  * @since 2.5
+  * @see TilesView
+- * @see org.springframework.web.servlet.view.UrlBasedViewResolver
++ * @see TilesViewResolver
+  */
+ public class TilesConfigurer implements ServletContextAware, InitializingBean, DisposableBean {
+ 
+@@ -90,24 +90,16 @@
+ 
+ 
+ 	public TilesConfigurer() {
+-		this.tilesPropertyMap.put(
+-				TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM,
+-				TilesContainerFactory.class.getName());
+-		this.tilesPropertyMap.put(
+-				TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM,
+-				ChainedTilesContextFactory.class.getName());
+-		this.tilesPropertyMap.put(
+-				TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM,
+-				UrlDefinitionsFactory.class.getName());
+-		this.tilesPropertyMap.put(
+-				TilesContainerFactory.PREPARER_FACTORY_INIT_PARAM,
++		this.tilesPropertyMap.put(AbstractTilesApplicationContextFactory.APPLICATION_CONTEXT_FACTORY_INIT_PARAM,
++				WildcardServletTilesApplicationContextFactory.class.getName());
++		this.tilesPropertyMap.put(TilesContainerFactory.PREPARER_FACTORY_INIT_PARAM,
+ 				BasicPreparerFactory.class.getName());
+-		this.tilesPropertyMap.put(
+-				ChainedTilesContextFactory.FACTORY_CLASS_NAMES,
+-				ServletTilesContextFactory.class.getName() + "," + JspTilesContextFactory.class.getName());
+-		this.tilesPropertyMap.put(
+-				UrlDefinitionsFactory.LOCALE_RESOLVER_IMPL_PROPERTY,
++		this.tilesPropertyMap.put(DefinitionsFactory.LOCALE_RESOLVER_IMPL_PROPERTY,
+ 				SpringLocaleResolver.class.getName());
++		this.tilesPropertyMap.put(TilesContainerFactory.ATTRIBUTE_EVALUATOR_INIT_PARAM,
++				ELAttributeEvaluator.class.getName());
++		this.tilesPropertyMap.put(TilesContainerFactory.CONTAINER_FACTORY_MUTABLE_INIT_PARAM,
++				Boolean.toString(false));
+ 	}
+ 
+ 
+@@ -121,7 +113,7 @@
+ 			if (logger.isInfoEnabled()) {
+ 				logger.info("TilesConfigurer: adding definitions [" + defs + "]");
+ 			}
+-			this.tilesPropertyMap.put(BasicTilesContainer.DEFINITIONS_CONFIG, defs);
++			this.tilesPropertyMap.put(DefinitionsFactory.DEFINITIONS_CONFIG, defs);
+ 		}
+ 	}
+ 
+@@ -194,24 +186,23 @@
+ 
+ 
+ 	/**
+-	 * Creates and exposes a TilesContainer for this web application.
++	 * Creates and exposes a TilesContainer for this web application,
++	 * delegating to the TilesInitializer.
+ 	 * @throws TilesException in case of setup failure
++	 * @see #createTilesInitializer()
+ 	 */
+ 	public void afterPropertiesSet() throws TilesException {
+-		TilesContainer container = createTilesContainer(this.servletContext);
+-		TilesAccess.setContainer(this.servletContext, container);
++		ServletContextAdapter adaptedContext = new ServletContextAdapter(new DelegatingServletConfig());
++		createTilesInitializer().initialize(new ServletTilesApplicationContext(adaptedContext));
+ 	}
+ 
+ 	/**
+-	 * Create a TilesContainer for this web application.
+-	 * @param context this web application's ServletContext
+-	 * @return the TilesContainer to expose
+-	 * @throws TilesException in case of setup failure
++	 * Creates a new instance of {@link org.apache.tiles.startup.BasicTilesInitializer}.
++	 * Override it to use a different initializer.
++	 * @see org.apache.tiles.web.startup.TilesListener#createTilesInitializer()
+ 	 */
+-	protected TilesContainer createTilesContainer(ServletContext context) throws TilesException {
+-		ServletContextAdapter adaptedContext = new ServletContextAdapter(new DelegatingServletConfig());
+-		TilesContainerFactory factory = TilesContainerFactory.getFactory(adaptedContext);
+-		return factory.createContainer(adaptedContext);
++	protected TilesInitializer createTilesInitializer() {
++		return new BasicTilesInitializer();
+ 	}
+ 
+ 	/**
+@@ -219,7 +210,7 @@
+ 	 * @throws TilesException in case of cleanup failure
+ 	 */
+ 	public void destroy() throws TilesException {
+-		TilesAccess.setContainer(this.servletContext, null);
++		ServletUtil.setContainer(this.servletContext, null);
+ 	}
+ 
+ 
+--- a/src/org/springframework/web/servlet/view/tiles2/TilesView.java
++++ b/src/org/springframework/web/servlet/view/tiles2/TilesView.java
+@@ -23,8 +23,13 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ 
++import org.apache.tiles.TilesApplicationContext;
+ import org.apache.tiles.TilesContainer;
+-import org.apache.tiles.access.TilesAccess;
++import org.apache.tiles.context.TilesRequestContext;
++import org.apache.tiles.impl.BasicTilesContainer;
++import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
++import org.apache.tiles.servlet.context.ServletTilesRequestContext;
++import org.apache.tiles.servlet.context.ServletUtil;
+ 
+ import org.springframework.web.servlet.support.JstlUtils;
+ import org.springframework.web.servlet.support.RequestContext;
+@@ -53,7 +58,7 @@
+ 			throws Exception {
+ 
+ 		ServletContext servletContext = getServletContext();
+-		TilesContainer container = TilesAccess.getContainer(servletContext);
++		TilesContainer container = ServletUtil.getContainer(servletContext);
+ 		if (container == null) {
+ 			throw new ServletException("Tiles container is not initialized. " +
+ 					"Have you added a TilesConfigurer to your web application context?");

Deleted: trunk/libspring-2.5-java/debian/patches/13_tiles_22.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/13_tiles_22.dpatch	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/patches/13_tiles_22.dpatch	2009-12-12 14:07:20 UTC (rev 11255)
@@ -1,281 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_tiles_22.dpatch by Damien Raude-Morvan <drazzib at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Tiles 2.2 compatibility patch.
-## DP: from SpringFramework 3.0
-## DP: <https://fisheye.springsource.org/changelog/spring-framework?cs=1488>
-
- at DPATCH@
-diff -urNad libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
---- libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java	2009-10-22 23:59:37.013231035 +0200
-+++ libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java	2009-10-23 00:06:34.149730481 +0200
-@@ -17,12 +17,13 @@
- package org.springframework.web.servlet.view.tiles2;
- 
- import javax.servlet.ServletRequest;
-+import javax.servlet.ServletContext;
- 
- import org.apache.tiles.TilesException;
- import org.apache.tiles.context.TilesRequestContext;
- import org.apache.tiles.preparer.PreparerFactory;
- import org.apache.tiles.preparer.ViewPreparer;
--import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
-+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
- 
- import org.springframework.web.context.WebApplicationContext;
- import org.springframework.web.servlet.support.RequestContextUtils;
-@@ -45,16 +46,16 @@
- 		if (context.getRequest() instanceof ServletRequest) {
- 			servletRequest = (ServletRequest) context.getRequest();
- 		}
--		ServletTilesApplicationContext tilesApplicationContext = null;
--		if (context instanceof ServletTilesApplicationContext) {
--			tilesApplicationContext = (ServletTilesApplicationContext) context;
-+		ServletTilesRequestContext tilesApplicationContext = null;
-+		if (context instanceof ServletTilesRequestContext) {
-+			tilesApplicationContext = (ServletTilesRequestContext) context;
- 		}
- 		if (servletRequest == null && tilesApplicationContext == null) {
- 			throw new IllegalStateException("SpringBeanPreparerFactory requires either a " +
--					"ServletRequest or a ServletTilesApplicationContext to operate on");
-+					"ServletRequest or a ServletTilesRequestContext to operate on");
- 		}
- 		WebApplicationContext webApplicationContext = RequestContextUtils.getWebApplicationContext(
--				servletRequest, tilesApplicationContext.getServletContext());
-+				servletRequest, (ServletContext) tilesApplicationContext.getContext());
- 		return getPreparer(name, webApplicationContext);
- 	}
- 
-diff -urNad libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
---- libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java	2009-10-22 23:59:37.013231035 +0200
-+++ libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java	2009-10-22 23:59:38.945231027 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2002-2007 the original author or authors.
-+ * Copyright 2002-2009 the original author or authors.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-@@ -17,11 +17,13 @@
- package org.springframework.web.servlet.view.tiles2;
- 
- import java.util.Locale;
--
- import javax.servlet.http.HttpServletRequest;
-+import javax.servlet.jsp.PageContext;
- 
- import org.apache.tiles.context.TilesRequestContext;
-+import org.apache.tiles.jsp.context.JspTilesRequestContext;
- import org.apache.tiles.locale.impl.DefaultLocaleResolver;
-+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
- 
- import org.springframework.web.servlet.support.RequestContextUtils;
- 
-@@ -41,8 +43,12 @@
- public class SpringLocaleResolver extends DefaultLocaleResolver {
- 
- 	public Locale resolveLocale(TilesRequestContext context) {
--		if (context.getRequest() instanceof HttpServletRequest) {
--			return RequestContextUtils.getLocale((HttpServletRequest) context.getRequest());
-+		if (context instanceof ServletTilesRequestContext) {
-+			return RequestContextUtils.getLocale(((ServletTilesRequestContext) context).getRequest());
-+		}
-+		else if (context instanceof JspTilesRequestContext) {
-+			PageContext pc = ((JspTilesRequestContext) context).getPageContext();
-+			return RequestContextUtils.getLocale((HttpServletRequest) pc.getRequest());
- 		}
- 		else {
- 			return super.resolveLocale(context);
-diff -urNad libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
---- libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java	2009-10-22 23:59:37.013231035 +0200
-+++ libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java	2009-10-22 23:59:38.945231027 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2002-2007 the original author or authors.
-+ * Copyright 2002-2009 the original author or authors.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-@@ -18,23 +18,23 @@
- 
- import java.util.Enumeration;
- import java.util.Properties;
--
- import javax.servlet.ServletConfig;
- import javax.servlet.ServletContext;
- 
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
--import org.apache.tiles.TilesContainer;
- import org.apache.tiles.TilesException;
--import org.apache.tiles.access.TilesAccess;
--import org.apache.tiles.context.ChainedTilesContextFactory;
--import org.apache.tiles.definition.UrlDefinitionsFactory;
-+import org.apache.tiles.context.AbstractTilesApplicationContextFactory;
-+import org.apache.tiles.definition.DefinitionsFactory;
- import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
-+import org.apache.tiles.evaluator.el.ELAttributeEvaluator;
- import org.apache.tiles.factory.TilesContainerFactory;
--import org.apache.tiles.impl.BasicTilesContainer;
--import org.apache.tiles.jsp.context.JspTilesContextFactory;
- import org.apache.tiles.preparer.BasicPreparerFactory;
--import org.apache.tiles.servlet.context.ServletTilesContextFactory;
-+import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
-+import org.apache.tiles.servlet.context.ServletUtil;
-+import org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContextFactory;
-+import org.apache.tiles.startup.BasicTilesInitializer;
-+import org.apache.tiles.startup.TilesInitializer;
- import org.apache.tiles.web.util.ServletContextAdapter;
- 
- import org.springframework.beans.factory.DisposableBean;
-@@ -48,15 +48,15 @@
-  * <a href="http://tiles.apache.org">http://tiles.apache.org</a>
-  * for more information about Tiles, which basically is a templating
-  * mechanism for JSP-based web applications.
-+ * <b>Note: Spring 3.0 requires Tiles 2.1.2 or above.</b>
-  *
-- * <p>The TilesConfigurer simply configures a TilesContainer using a set
-- * of files containing definitions, to be accessed by {@link TilesView}
-- * instances.
-+ * <p>The TilesConfigurer simply configures a TilesContainer using a set of files
-+ * containing definitions, to be accessed by {@link TilesView} instances. This is a
-+ * Spring-based alternative (for usage in Spring configuration) to the Tiles-provided
-+ * {@link org.apache.tiles.web.startup.TilesListener} (for usage in <code>web.xml</code>).
-  *
-  * <p>TilesViews can be managed by any {@link org.springframework.web.servlet.ViewResolver}.
-- * For simple convention-based view resolution, consider using
-- * {@link org.springframework.web.servlet.view.UrlBasedViewResolver} with the
-- * "viewClass" property set to "org.springframework.web.servlet.view.tiles2.TilesView".
-+ * For simple convention-based view resolution, consider using {@link TilesViewResolver}.
-  *
-  * <p>A typical TilesConfigurer bean definition looks as follows:
-  *
-@@ -73,12 +73,12 @@
-  *   &lt;/property>
-  * &lt;/bean></pre>
-  *
-- * The values in the list are the actual files containing the definitions.
-+ * The values in the list are the actual Tiles XML files containing the definitions.
-  *
-  * @author Juergen Hoeller
-  * @since 2.5
-  * @see TilesView
-- * @see org.springframework.web.servlet.view.UrlBasedViewResolver
-+ * @see TilesViewResolver
-  */
- public class TilesConfigurer implements ServletContextAware, InitializingBean, DisposableBean {
- 
-@@ -90,24 +90,16 @@
- 
- 
- 	public TilesConfigurer() {
--		this.tilesPropertyMap.put(
--				TilesContainerFactory.CONTAINER_FACTORY_INIT_PARAM,
--				TilesContainerFactory.class.getName());
--		this.tilesPropertyMap.put(
--				TilesContainerFactory.CONTEXT_FACTORY_INIT_PARAM,
--				ChainedTilesContextFactory.class.getName());
--		this.tilesPropertyMap.put(
--				TilesContainerFactory.DEFINITIONS_FACTORY_INIT_PARAM,
--				UrlDefinitionsFactory.class.getName());
--		this.tilesPropertyMap.put(
--				TilesContainerFactory.PREPARER_FACTORY_INIT_PARAM,
-+		this.tilesPropertyMap.put(AbstractTilesApplicationContextFactory.APPLICATION_CONTEXT_FACTORY_INIT_PARAM,
-+				WildcardServletTilesApplicationContextFactory.class.getName());
-+		this.tilesPropertyMap.put(TilesContainerFactory.PREPARER_FACTORY_INIT_PARAM,
- 				BasicPreparerFactory.class.getName());
--		this.tilesPropertyMap.put(
--				ChainedTilesContextFactory.FACTORY_CLASS_NAMES,
--				ServletTilesContextFactory.class.getName() + "," + JspTilesContextFactory.class.getName());
--		this.tilesPropertyMap.put(
--				UrlDefinitionsFactory.LOCALE_RESOLVER_IMPL_PROPERTY,
-+		this.tilesPropertyMap.put(DefinitionsFactory.LOCALE_RESOLVER_IMPL_PROPERTY,
- 				SpringLocaleResolver.class.getName());
-+		this.tilesPropertyMap.put(TilesContainerFactory.ATTRIBUTE_EVALUATOR_INIT_PARAM,
-+				ELAttributeEvaluator.class.getName());
-+		this.tilesPropertyMap.put(TilesContainerFactory.CONTAINER_FACTORY_MUTABLE_INIT_PARAM,
-+				Boolean.toString(false));
- 	}
- 
- 
-@@ -121,7 +113,7 @@
- 			if (logger.isInfoEnabled()) {
- 				logger.info("TilesConfigurer: adding definitions [" + defs + "]");
- 			}
--			this.tilesPropertyMap.put(BasicTilesContainer.DEFINITIONS_CONFIG, defs);
-+			this.tilesPropertyMap.put(DefinitionsFactory.DEFINITIONS_CONFIG, defs);
- 		}
- 	}
- 
-@@ -194,24 +186,23 @@
- 
- 
- 	/**
--	 * Creates and exposes a TilesContainer for this web application.
-+	 * Creates and exposes a TilesContainer for this web application,
-+	 * delegating to the TilesInitializer.
- 	 * @throws TilesException in case of setup failure
-+	 * @see #createTilesInitializer()
- 	 */
- 	public void afterPropertiesSet() throws TilesException {
--		TilesContainer container = createTilesContainer(this.servletContext);
--		TilesAccess.setContainer(this.servletContext, container);
-+		ServletContextAdapter adaptedContext = new ServletContextAdapter(new DelegatingServletConfig());
-+		createTilesInitializer().initialize(new ServletTilesApplicationContext(adaptedContext));
- 	}
- 
- 	/**
--	 * Create a TilesContainer for this web application.
--	 * @param context this web application's ServletContext
--	 * @return the TilesContainer to expose
--	 * @throws TilesException in case of setup failure
-+	 * Creates a new instance of {@link org.apache.tiles.startup.BasicTilesInitializer}.
-+	 * Override it to use a different initializer.
-+	 * @see org.apache.tiles.web.startup.TilesListener#createTilesInitializer()
- 	 */
--	protected TilesContainer createTilesContainer(ServletContext context) throws TilesException {
--		ServletContextAdapter adaptedContext = new ServletContextAdapter(new DelegatingServletConfig());
--		TilesContainerFactory factory = TilesContainerFactory.getFactory(adaptedContext);
--		return factory.createContainer(adaptedContext);
-+	protected TilesInitializer createTilesInitializer() {
-+		return new BasicTilesInitializer();
- 	}
- 
- 	/**
-@@ -219,7 +210,7 @@
- 	 * @throws TilesException in case of cleanup failure
- 	 */
- 	public void destroy() throws TilesException {
--		TilesAccess.setContainer(this.servletContext, null);
-+		ServletUtil.setContainer(this.servletContext, null);
- 	}
- 
- 
-diff -urNad libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/TilesView.java libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/TilesView.java
---- libspring-2.5-java~/src/org/springframework/web/servlet/view/tiles2/TilesView.java	2009-10-22 23:59:37.013231035 +0200
-+++ libspring-2.5-java/src/org/springframework/web/servlet/view/tiles2/TilesView.java	2009-10-22 23:59:38.945231027 +0200
-@@ -23,8 +23,13 @@
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
- 
-+import org.apache.tiles.TilesApplicationContext;
- import org.apache.tiles.TilesContainer;
--import org.apache.tiles.access.TilesAccess;
-+import org.apache.tiles.context.TilesRequestContext;
-+import org.apache.tiles.impl.BasicTilesContainer;
-+import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
-+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
-+import org.apache.tiles.servlet.context.ServletUtil;
- 
- import org.springframework.web.servlet.support.JstlUtils;
- import org.springframework.web.servlet.support.RequestContext;
-@@ -53,7 +58,7 @@
- 			throws Exception {
- 
- 		ServletContext servletContext = getServletContext();
--		TilesContainer container = TilesAccess.getContainer(servletContext);
-+		TilesContainer container = ServletUtil.getContainer(servletContext);
- 		if (container == null) {
- 			throw new ServletException("Tiles container is not initialized. " +
- 					"Have you added a TilesConfigurer to your web application context?");

Added: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/series	2009-12-12 14:07:20 UTC (rev 11255)
@@ -0,0 +1,12 @@
+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

Modified: trunk/libspring-2.5-java/debian/rules
===================================================================
--- trunk/libspring-2.5-java/debian/rules	2009-12-12 13:19:17 UTC (rev 11254)
+++ trunk/libspring-2.5-java/debian/rules	2009-12-12 14:07:20 UTC (rev 11255)
@@ -8,35 +8,19 @@
 
 MODULES = aop beans context context-support core jdbc jms orm test tx web webmvc
 
-include /usr/share/dpatch/dpatch.make
+JAVA_HOME       := /usr/lib/jvm/default-java
+ANT             := CLASSPATH=/usr/share/java/jarjar.jar JAVA_HOME=$(JAVA_HOME) ant
 
-build: build-stamp
+%:
+	dh $@ --buildsystem=ant --with quilt
 
-build-stamp: patch-stamp
-	ant alljars
-	touch $@
+override_dh_auto_clean:
+	$(ANT) clean
 
-clean: pre-clean unpatch
+override_dh_auto_build:
+	$(ANT) alljars
 
-pre-clean: patch-stamp
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	ant clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs changelog.txt
-	dh_installdocs -i
-	dh_install
+override_dh_auto_install:
 	for MYMOD in $(MODULES); do \
 		BASENAME=`echo spring-$$MYMOD-2.5`; \
 		JAR=`echo dist/modules/spring-$$MYMOD.jar`; \
@@ -44,21 +28,8 @@
 		PACKAGE=`echo lib$$BASENAME-java`; \
 		mh_installpom -p$$PACKAGE $$POM ; \
 		mh_installjar -p$$PACKAGE -nspring-$$MYMOD -i2.5 -l $$POM $$JAR ; \
-        done
-	dh_link
-	dh_strip
-	dh_compress
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	done
 
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
 # Make a Debian version of upstream tarball
 # Details given in README.source
 get-orig-source:




More information about the pkg-java-commits mailing list