[pkg-java] r9926 - in trunk/libspring-2.5-java: . debian debian/excludesfiles debian/patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Mon Aug 10 22:15:55 UTC 2009
Author: drazzib-guest
Date: 2009-08-10 22:15:55 +0000 (Mon, 10 Aug 2009)
New Revision: 9926
Added:
trunk/libspring-2.5-java/debian/
trunk/libspring-2.5-java/debian/README.Debian
trunk/libspring-2.5-java/debian/README.source
trunk/libspring-2.5-java/debian/ant-classpath-debian
trunk/libspring-2.5-java/debian/attribute-compiler-classpath-debian
trunk/libspring-2.5-java/debian/changelog
trunk/libspring-2.5-java/debian/classpath-debian
trunk/libspring-2.5-java/debian/compat
trunk/libspring-2.5-java/debian/control
trunk/libspring-2.5-java/debian/copyright
trunk/libspring-2.5-java/debian/docs
trunk/libspring-2.5-java/debian/excludesfiles/
trunk/libspring-2.5-java/debian/excludesfiles/main.excludes
trunk/libspring-2.5-java/debian/excludesfiles/mainmock.excludes
trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes
trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes
trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-context-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-context-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-core-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-core-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-test-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-test-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-web-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-web-2.5-java.links
trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.install
trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.links
trunk/libspring-2.5-java/debian/patches/
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/07_no_aspectj.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/rules
trunk/libspring-2.5-java/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: trunk/libspring-2.5-java/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/libspring-2.5-java/debian/README.Debian
===================================================================
--- trunk/libspring-2.5-java/debian/README.Debian (rev 0)
+++ trunk/libspring-2.5-java/debian/README.Debian 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,83 @@
+-----------------------------
+libspring-2.5-java for Debian
+-----------------------------
+
+
+*** Removal of functionnalities ***
+
+SpringFramework Debian package doesn't contains some of the functionnalities of
+upstream binary releases.
+
+Here is a list of excluded files regarding original content of SpringFramework.
+
+* spring-aop
+ [contrib] AspectJ is in contrib (#480132)
+ org/springframework/aop/aspectj/**
+ org/springframework/aop/config/ConfigBeanDefinitionParser.java
+ org/springframework/context/weaving/AspectJWeavingEnabler.java
+ org/springframework/core/type/filter/AspectJTypeFilter.java
+
+* spring-context
+ [not-in-debian] Glassfish Debian package is too old
+ org/springframework/instrument/classloading/glassfish/**
+ [non-free] Oracle OC4J is non-free
+ org/springframework/instrument/classloading/oc4j/**
+
+* spring-context-support
+ [non-free] BEA CommonJ is non-free
+ org/springframework/scheduling/commonj/**
+
+* spring-orm
+ [non-free] Oracle TopLink 9.0.4 is non-free
+ org/springframework/orm/toplink/SessionBrokerSessionFactory.java
+ org/springframework/orm/toplink/support/CommonsLoggingSessionLog904.java
+ [non-free] JPA API is not in Debian yet
+ org/springframework/orm/jpa/vendor/**
+
+* spring-web
+ [non-free] JSF RI is not DFSG-free
+ org/springframework/web/jsf/**
+ org/springframework/web/context/request/Faces*
+ [not-in-debian] no Caucho package in Debbian
+ org/springframework/remoting/caucho/**
+ [not-in-debian] JasperReport is not yet in Debian (#281346)
+ org/springframework/ui/jasperreports/**
+ org/springframework/web/servlet/view/jasperreports/**
+
+* spring-webmvc-portlet
+ [non-free] Portlet RI is not DFSG-free
+ org/springframework/web/portlet/**
+
+* spring-test
+ [contrib] AspectJ is in contrib (#480132)
+ org/springframework/test/jpa/AbstractAspectjJpaTests.java
+ [non-free] Portlet RI is not DFSG-free
+ org/springframework/mock/web/portlet/**
+
+* spring-tx
+ [non-free] IBM Websphere is non-free
+ org/springframework/transaction/jta/WebSphereUowTransactionManager.java
+ org/springframework/transaction/jta/WebSphereTransactionManagerFactoryBean.java
+ org/springframework/transaction/jta/JotmFactoryBean.java
+
+
+*** Changes in dependencies ***
+
+Glassfish TopLink Essentials JPA
+(from glassfish-toplink-essentials package)
+instead of Oracle Toplink
+ see debian/patches/08_use_glasshfish_toplink.dpatch in debian diff
+
+JUnit 4.5 instead of JUnit 4.3
+ see debian/patches/09_junit_45.dpatch in debian diff
+
+JRuby 1.1 instead of JRuby 1.0
+ see debian/patches/10_jruby_11.dpatch in debian diff
+
+Compatibility with Servlet 2.5 and JSP 2.1 API
+ see debian/patches/11_servlet_jsp_api.dpatch in debian diff
+
+Use debian ASM2 JAR instead of CGLIB-nodep version
+ see debian/patches/03_use_debian_asm2.dpatch in debian diff
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 20:32:25 +0200
Added: trunk/libspring-2.5-java/debian/README.source
===================================================================
--- trunk/libspring-2.5-java/debian/README.source (rev 0)
+++ trunk/libspring-2.5-java/debian/README.source 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,25 @@
+How to prepare the original source:
+
+- Download full distribution, e.g. spring-framework-2.5.5-with-dependencies.zip
+
+- unzip spring-framework-2.5.5-with-dependencies.zip
+
+- remove derived sources:
+
+ cd spring-framework-2.5.5
+ ant clean
+ cd ..
+
+- remove entire lib directory, because some libs are not redistributable:
+
+ rm -r spring-framework-2.5.5/lib
+
+- rename to original:
+
+ mv spring-framework-2.5.5 libspring-2.5-java
+
+- create original archive:
+
+ tar czf libspring-2.5-java_2.5.5.orig.tar.gz libspring-2.5-java
+
+- move original archive to tarballs/
Added: trunk/libspring-2.5-java/debian/ant-classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/ant-classpath-debian (rev 0)
+++ trunk/libspring-2.5-java/debian/ant-classpath-debian 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/jarjar.jar
Added: trunk/libspring-2.5-java/debian/attribute-compiler-classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/attribute-compiler-classpath-debian (rev 0)
+++ trunk/libspring-2.5-java/debian/attribute-compiler-classpath-debian 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,4 @@
+usr/share/java/commons-attributes-api.jar
+usr/share/java/commons-attributes-compiler.jar
+usr/share/java/commons-collections3.jar
+usr/share/java/qdox.jar
Added: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog (rev 0)
+++ trunk/libspring-2.5-java/debian/changelog 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,82 @@
+libspring-2.5-java (2.5.6.SEC01-1) unstable; urgency=low
+
+ * New upstream release.
+ - [SECURITY] Include fix for CVE-2009-1190:
+ Spring Framework Remote Denial of Service Vulnerability
+ * Refresh all debian/patches to handle Spring linefeed change
+ * New patch 11_servlet_api_api to handle compat with
+ Servlet 2.5 and JSP 2.1 API's. Remove MockPageContext
+ from exclusion list in debian/excludesfiles/mainmock
+ * Use JRuby 1.1 instead of 1.0:
+ - debian/classpath-debian: replace jruby1.0 by jruby1.1
+ - debian/control: change Build-Depends for jruby1.1 package
+ and Suggest for spring-context package
+ - debian/patches/10_jruby_11.dpatch: update Spring
+ source code to be compliant with jruby 1.1
+ * Now build with testng:
+ - Add Build-Depends on testng in debian/control
+ - Add Recommends on testng to spring-test module
+ - Update debian/excludesfiles/tigermock
+ - Add this testng.jar to debian/classpath-debian
+ * debian/watch:
+ - new upstream releases are not on sf.net anymore
+ - upstream download site is not checkeable by uscan
+ (need POST request - form submit - to access to download area)
+ * debian/README.Debian: complete list of changes regarding upstream modules
+ * debian/copyright: Debian packaging should be licenced under same licence as
+ upstream. Clarify Apache 2.0 licence copyright attribution.
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 20:25:01 +0200
+
+libspring-2.5-java (2.5.5-2) UNRELEASED; urgency=low
+
+ [ Damien Raude-Morvan ]
+ * Now build with tiles and velocity-tools helpers:
+ - Add Build-Depends on libtiles-java and libvelocity-tools-java
+ in debian/control
+ - Update debian/excludesfiles/main accordingly
+ - Add this JAR to debian/classpath-debian to build
+ * New libspring-2.5-test-java debian package (include mock tools):
+ - Re-activate buildmock target in 01_build_xml patch
+ - Build-Depends on junit4 (>= 4.5) in debian/control
+ - New 09_junit_45 patch to build Spring 2.5 with JUnit 4.5
+ - Add debian/excludesfiles/tigermock and debian/excludesfiles/mainmock
+ to exclude some classes from build
+ - Update 02_read_excludefile_build_xml patch to read these files
+ - Add libspring-test-2.5-java.links and libspring-test-2.5-java.install
+ * Bump Standards-Version to 3.8.1 (no changes needed)
+ * Move all libspring2.5-* to "java" section
+
+ [ Andreas Schildbach ]
+ * Removed comment in debian/control, as it seems to confuse pbuilder
+
+ [ Damien Raude-Morvan ]
+ * Fix policy issue : Remove aspectj from libspring-2.5-aop-java Recommends
+ since this package is not in main yet.
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 15:41:19 +0200
+
+libspring-2.5-java (2.5.5-1) unstable; urgency=low
+
+ [ Andreas Schildbach ]
+ * Initial release (Closes: #426259)
+ * Created README.source, documenting preparation of original source archive
+
+ [ Damien Raude-Morvan ]
+ * Use dpath as patch system for packaging (debian/rules and debian/control)
+ - 01_build_xml: Create /usr/share/java based classpath
+ - 02_read_excludefile_build_xml: Read some excludesfile to exclude
+ some java source file from build
+ - 03_use_debian_asm2: Use debian ASM2 JAR instead of CGLIB-nodep version
+ - 05_remove_glassfish_weaving: Remove usage of GlassFishLoadTimeWeaver
+ - 06_no_jsf: There is no DFSG-free Java Server Faces so disable
+ - 07_no_aspectj: AspectJ is not in main, so disable it
+ - 08_glassfish_toplink: Use Toplink Essentials from Glassfish package
+ * debian/watch: use Debian QA Sourceforge redirector for downloading from SF
+ * debian/rules: create get-orig-source make rule for preparation of debian
+ orig.tar.gz from upstream archives (as documented in README.source)
+ * debian/control: Prepare all spring modules in separates packages
+ - every Spring module would get is own Debian package
+ - set Depends for all packages (based on Maven pom.xml dependencies)
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Sat, 14 Feb 2009 14:51:44 +0100
Added: trunk/libspring-2.5-java/debian/classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/classpath-debian (rev 0)
+++ trunk/libspring-2.5-java/debian/classpath-debian 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,52 @@
+# buildmain
+usr/share/java/commons-logging.jar
+usr/share/java/aopalliance.jar
+usr/share/java/cglib.jar
+usr/share/java/asm2.jar
+usr/share/java/jamon.jar
+usr/share/java/commons-pool.jar
+usr/share/java/commons-collections3.jar
+usr/share/java/backport-util-concurrent.jar
+usr/share/java/asm2.jar
+usr/share/java/asm2-commons.jar
+usr/share/java/c3p0.jar
+usr/share/java/xapool.jar
+usr/share/java/jdo2-api.jar
+usr/share/java/commons-httpclient.jar
+usr/share/java/axis.jar
+usr/share/java/groovy.jar
+usr/share/java/jruby1.1.jar
+usr/share/java/freemarker.jar
+usr/share/java/velocity.jar
+usr/share/java/log4j-1.2.jar
+usr/share/java/commons-attributes-api.jar
+usr/share/java/jakarta-poi.jar
+usr/share/java/jxl.jar
+usr/share/java/itext.jar
+usr/share/java/struts-1.2.jar
+usr/share/java/dom4j.jar
+usr/share/java/glassfish-javaee.jar
+usr/share/java/jsp-api.jar
+usr/share/java/bsh.jar
+#usr/share/java/jasperreports.jar
+usr/share/java/ehcache.jar
+#usr/share/java/aspectjlib.jar
+#usr/share/java/aspectjweaver.jar
+usr/share/java/quartz-all.jar
+usr/share/java/tiles-api.jar
+usr/share/java/tiles-core.jar
+usr/share/java/tiles-core.jar
+usr/share/java/tiles-jsp.jar
+usr/share/java/velocity-tools-view.jar
+usr/share/java/hibernate3.jar
+usr/share/java/hibernate-commons-annotations.jar
+usr/share/java/hibernate-annotations.jar
+usr/share/java/jaxrpc.jar
+usr/share/java/ibatis.jar
+usr/share/java/glassfish-appserv-jstl.jar
+usr/share/java/testng.jar
+
+# buildtiger
+usr/share/tomcat5.5/server/lib/catalina.jar
+usr/share/java/glassfish-toplink-essentials.jar
+usr/share/java/junit4.jar
Added: trunk/libspring-2.5-java/debian/compat
===================================================================
--- trunk/libspring-2.5-java/debian/compat (rev 0)
+++ trunk/libspring-2.5-java/debian/compat 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+5
Added: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control (rev 0)
+++ trunk/libspring-2.5-java/debian/control 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,156 @@
+Source: libspring-2.5-java
+Section: java
+Priority: extra
+Maintainer: Andreas Schildbach <debian.org at schildbach.de>
+Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: dpatch, debhelper (>= 5), 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, libservlet2.4-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
+ jruby1.1, libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
+ libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
+ libcglib2.1-java, bsh, glassfish-javaee, glassfish-appserv, libqdox-java, libjarjar-java,
+ libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
+ libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java, libvelocity-tools-java,
+ glassfish-toplink-essentials, libtomcat5.5-java, junit4 (>= 4.5), testng
+Standards-Version: 3.8.1
+Homepage: http://springframework.org/about
+Vcs-Svn: http://dev.schildbach.de/svn/debian/libspring-2.5-java/trunk
+
+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
+Recommends: libcommons-attributes-java
+Description: modular Java/J2EE application framework - Core
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-core.jar : Core abstractions and utilities,
+ source-level metadata support.
+
+Package: libspring-beans-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libcglib2.1-java
+Description: modular Java/J2EE application framework - Beans
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-beans.jar : JavaBeans support and bean container.
+
+Package: libspring-aop-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
+Recommends: libaopalliance-java
+Description: modular Java/J2EE application framework - AOP
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-aop.jar : Aspect-oriented programming framework.
+
+Package: libspring-context-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
+Recommends: libspring-aop-2.5-java, glassfish-javaee
+Suggests: jruby1.1, bsh, groovy
+Description: modular Java/J2EE application framework - Context
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-context.jar : application context, JNDI, JMX,
+ instrumentation, remoting, scripting, scheduling and validation
+
+Package: libspring-context-support-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-context-2.5-java
+Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity
+Description: modular Java/J2EE application framework - Context Support
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-context-support.jar : Quartz/CommonJ scheduling,
+ UI templating, mail and caching
+
+Package: libspring-web-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-context-2.5-java, glassfish-appserv
+Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java
+Description: modular Java/J2EE application framework - Web
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-web.jar : web application context, multipart
+ resolver, HTTP-based remoting support
+
+Package: libspring-webmvc-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-web-2.5-java
+Recommends: libspring-context-support-2.5-java, libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
+Description: modular Java/J2EE application framework - MVC
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-webmvc.jar : framework servlets, web MVC framework,
+ web controllers, web views for JSP, Velocity, Tiles, iText and POI
+
+Package: libspring-test-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+Recommends: junit4 (>= 4.5), testng
+Description: modular Java/J2EE application framework - Test helpers
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-test.jar : unit-testing helpers and mock
+ classes
+
+Package: libspring-tx-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+Recommends: libspring-aop-2.5-java, libspring-context-2.5-java, glassfish-javaee
+Description: modular Java/J2EE application framework - transaction
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-tx.jar : transaction infrastructure, JCA support,
+ DAO support
+
+Package: libspring-jdbc-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, libc3p0-java
+Description: modular Java/J2EE application framework - JDBC tools
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-jdbc.jar : Java DataBase Connectivity support
+
+Package: libspring-jms-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, glassfish-javaee
+Description: modular Java/J2EE application framework - JMS tools
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-jms.jar : Java Message Service 1.0.2/1.1 support
+
+Package: libspring-orm-2.5-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime, libspring-jdbc-2.5-java
+Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java
+Description: modular Java/J2EE application framework - ORM tools
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-orm.jar : JDO support, JPA support, Hibernate
+ support, TopLink support, iBATIS support
Added: trunk/libspring-2.5-java/debian/copyright
===================================================================
--- trunk/libspring-2.5-java/debian/copyright (rev 0)
+++ trunk/libspring-2.5-java/debian/copyright 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,43 @@
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=226
+Upstream-Name: Spring Framework
+Upstream-Maintainer: SpringSource
+Upstream-Source: http://springframework.org/download
+
+Files: *
+Copyright: Copyright 2002-2009, the original author or authors
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ On Debian systems the full text of the Apache License can be found
+ in the `/usr/share/common-licenses/Apache-2.0' file.
+
+
+Files: debian/*
+Copyright: Copyright 2008-2009, Andreas Schildbach <debian.org at schildbach.de>
+Copyright: Copyright 2008-2009, Damien Raude-Morvan <drazzib at drazzib.com>
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ On Debian systems the full text of the Apache License can be found
+ in the `/usr/share/common-licenses/Apache-2.0' file.
Added: trunk/libspring-2.5-java/debian/docs
===================================================================
--- trunk/libspring-2.5-java/debian/docs (rev 0)
+++ trunk/libspring-2.5-java/debian/docs 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,2 @@
+changelog.txt
+readme.txt
Added: trunk/libspring-2.5-java/debian/excludesfiles/main.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/main.excludes (rev 0)
+++ trunk/libspring-2.5-java/debian/excludesfiles/main.excludes 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,33 @@
+# spring-aop
+# aspectj is in contrib (#480132)
+org/springframework/aop/aspectj/**
+org/springframework/aop/config/ConfigBeanDefinitionParser.java
+
+# spring-context-support
+# BEA CommonJ is non-free
+org/springframework/scheduling/commonj/**
+
+# spring-orm
+# We doesn't support TopLink 9.0.4 (non-free)
+org/springframework/orm/toplink/SessionBrokerSessionFactory.java
+org/springframework/orm/toplink/support/CommonsLoggingSessionLog904.java
+
+# spring-tx
+# IBM Websphere is non-free
+org/springframework/transaction/jta/WebSphereUowTransactionManager.java
+org/springframework/transaction/jta/WebSphereTransactionManagerFactoryBean.java
+org/springframework/transaction/jta/JotmFactoryBean.java
+
+# spring-web
+# JSF RI is not DFSG-free
+org/springframework/web/jsf/**
+org/springframework/web/context/request/Faces*
+# no Caucho package in Debbian
+org/springframework/remoting/caucho/**
+# JasperReport is not yet in Debian (#281346)
+org/springframework/ui/jasperreports/**
+org/springframework/web/servlet/view/jasperreports/**
+
+# spring-webmvc-portlet
+# Portlet RI is not DFSG-free
+org/springframework/web/portlet/**
Added: trunk/libspring-2.5-java/debian/excludesfiles/mainmock.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/mainmock.excludes (rev 0)
+++ trunk/libspring-2.5-java/debian/excludesfiles/mainmock.excludes 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,3 @@
+# spring-webmvc-portlet
+# Portlet RI is not DFSG-free
+org/springframework/mock/web/portlet/**
Added: trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes (rev 0)
+++ trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,22 @@
+# spring-aop
+# aspectj is in contrib (#480132)
+org/springframework/aop/aspectj/**
+org/springframework/context/weaving/AspectJWeavingEnabler.java
+org/springframework/core/type/filter/AspectJTypeFilter.java
+
+# spring-context
+# Glassfish Debian package is too old
+org/springframework/instrument/classloading/glassfish/**
+# Oracle OC4J is non-free
+org/springframework/instrument/classloading/oc4j/**
+
+# spring-orm
+org/springframework/orm/jpa/vendor/**
+
+# spring-web
+# JSF RI is not DFSG-free
+org/springframework/web/jsf/**
+
+# spring-webmvc-portlet
+# Portlet RI is not DFSG-free
+org/springframework/web/portlet/**
Added: trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes (rev 0)
+++ trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,2 @@
+# aspectj is in contrib (#480132)
+org/springframework/test/jpa/AbstractAspectjJpaTests.java
Added: trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-aop.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-aop-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-aop.jar usr/share/java/spring-aop-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-beans.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-beans-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-beans.jar usr/share/java/spring-beans-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-context-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-context-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-context-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-context.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-context-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-context-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-context-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-context.jar usr/share/java/spring-context-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-context-support.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-context-support-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-context-support.jar usr/share/java/spring-context-support-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-core-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-core-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-core-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-core.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-core-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-core-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-core-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-core.jar usr/share/java/spring-core-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-jdbc.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-jdbc-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-jdbc.jar usr/share/java/spring-jdbc-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-jms.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-jms-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-jms.jar usr/share/java/spring-jms-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-orm.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-orm-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-orm.jar usr/share/java/spring-orm-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-test-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-test-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-test-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-test.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-test-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-test-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-test-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-test.jar usr/share/java/spring-test-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-tx.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-tx-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-tx.jar usr/share/java/spring-tx-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-web-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-web-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-web-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-web.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-web-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-web-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-web-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-web.jar usr/share/java/spring-web-2.5.jar
Added: trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.install
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.install (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.install 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+dist/modules/spring-webmvc.jar usr/share/java
Added: trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.links
===================================================================
--- trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.links (rev 0)
+++ trunk/libspring-2.5-java/debian/libspring-webmvc-2.5-java.links 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1 @@
+usr/share/java/spring-webmvc.jar usr/share/java/spring-webmvc-2.5.jar
Added: trunk/libspring-2.5-java/debian/patches/00list
===================================================================
--- trunk/libspring-2.5-java/debian/patches/00list (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/00list 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,12 @@
+01_build_xml
+02_read_excludefile_build_xml
+03_use_debian_asm2
+04_remove_oc4j_weaving
+05_remove_glassfish_weaving
+06_no_jsf
+07_no_aspectj
+08_use_glasshfish_toplink
+09_junit_45
+10_jruby_11
+11_servlet_jsp_api
+
Added: trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,62 @@
+#! /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"/>
+
+
Property changes on: trunk/libspring-2.5-java/debian/patches/01_build_xml.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: 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 (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,42 @@
+#! /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 -->
Property changes on: trunk/libspring-2.5-java/debian/patches/02_read_excludefile_build_xml.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,45 @@
+#! /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;
Property changes on: trunk/libspring-2.5-java/debian/patches/03_use_debian_asm2.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,28 @@
+#! /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);
+ }
Property changes on: trunk/libspring-2.5-java/debian/patches/04_remove_oc4j_weaving.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,30 @@
+#! /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());
Property changes on: trunk/libspring-2.5-java/debian/patches/05_remove_glassfish_weaving.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,48 @@
+#! /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);
+- }
+- }
+-
+ }
Property changes on: trunk/libspring-2.5-java/debian/patches/06_no_jsf.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,87 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_no_aspectj.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: AspectJ is not in main, so disable it
+## DP: <http://bugs.debian.org/480132>
+
+ at DPATCH@
+diff -urNad trunk~/src/org/springframework/aop/config/AopConfigUtils.java trunk/src/org/springframework/aop/config/AopConfigUtils.java
+--- trunk~/src/org/springframework/aop/config/AopConfigUtils.java 2009-02-14 13:40:10.000000000 +0100
++++ trunk/src/org/springframework/aop/config/AopConfigUtils.java 2009-02-14 13:40:12.000000000 +0100
+@@ -19,7 +19,7 @@
+ import java.util.ArrayList;
+ import java.util.List;
+
+-import org.springframework.aop.aspectj.autoproxy.AspectJAwareAdvisorAutoProxyCreator;
++//import org.springframework.aop.aspectj.autoproxy.AspectJAwareAdvisorAutoProxyCreator;
+ import org.springframework.aop.framework.autoproxy.InfrastructureAdvisorAutoProxyCreator;
+ import org.springframework.beans.factory.config.BeanDefinition;
+ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+@@ -70,7 +70,7 @@
+ */
+ static {
+ APC_PRIORITY_LIST.add(InfrastructureAdvisorAutoProxyCreator.class.getName());
+- APC_PRIORITY_LIST.add(AspectJAwareAdvisorAutoProxyCreator.class.getName());
++ //APC_PRIORITY_LIST.add(AspectJAwareAdvisorAutoProxyCreator.class.getName());
+ APC_PRIORITY_LIST.add(ASPECTJ_ANNOTATION_AUTO_PROXY_CREATOR_CLASS_NAME);
+ }
+
+@@ -88,7 +88,8 @@
+ }
+
+ public static BeanDefinition registerAspectJAutoProxyCreatorIfNecessary(BeanDefinitionRegistry registry, Object source) {
+- return registerOrEscalateApcAsRequired(AspectJAwareAdvisorAutoProxyCreator.class, registry, source);
++ //return registerOrEscalateApcAsRequired(AspectJAwareAdvisorAutoProxyCreator.class, registry, source);
++ return null;
+ }
+
+ public static BeanDefinition registerAspectJAnnotationAutoProxyCreatorIfNecessary(BeanDefinitionRegistry registry) {
+diff -urNad trunk~/src/org/springframework/aop/config/AopNamespaceHandler.java trunk/src/org/springframework/aop/config/AopNamespaceHandler.java
+--- trunk~/src/org/springframework/aop/config/AopNamespaceHandler.java 2009-02-14 13:40:10.000000000 +0100
++++ trunk/src/org/springframework/aop/config/AopNamespaceHandler.java 2009-02-14 13:40:12.000000000 +0100
+@@ -16,7 +16,7 @@
+
+ package org.springframework.aop.config;
+
+-import org.springframework.aop.aspectj.AspectJExpressionPointcut;
++//import org.springframework.aop.aspectj.AspectJExpressionPointcut;
+ import org.springframework.beans.factory.xml.BeanDefinitionParser;
+ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+@@ -61,8 +61,8 @@
+ */
+ public void init() {
+ // In 2.0 XSD as well as in 2.1 XSD.
+- registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());
+- registerBeanDefinitionParser("aspectj-autoproxy", new AspectJAutoProxyBeanDefinitionParser());
++ // registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());
++ // registerBeanDefinitionParser("aspectj-autoproxy", new AspectJAutoProxyBeanDefinitionParser());
+ registerBeanDefinitionDecorator("scoped-proxy", new ScopedProxyBeanDefinitionDecorator());
+
+ // Only in 2.0 XSD: moved to context namespace as of 2.1
+diff -urNad trunk~/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java trunk/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
+--- trunk~/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java 2008-05-19 13:44:56.000000000 +0200
++++ trunk/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java 2009-02-14 13:40:42.000000000 +0100
+@@ -37,7 +37,7 @@
+ import org.springframework.beans.factory.xml.ParserContext;
+ import org.springframework.beans.factory.xml.XmlReaderContext;
+ import org.springframework.core.type.filter.AnnotationTypeFilter;
+-import org.springframework.core.type.filter.AspectJTypeFilter;
++//import org.springframework.core.type.filter.AspectJTypeFilter;
+ import org.springframework.core.type.filter.AssignableTypeFilter;
+ import org.springframework.core.type.filter.RegexPatternTypeFilter;
+ import org.springframework.core.type.filter.TypeFilter;
+@@ -235,9 +235,9 @@
+ else if ("assignable".equals(filterType)) {
+ return new AssignableTypeFilter(classLoader.loadClass(expression));
+ }
+- else if ("aspectj".equals(filterType)) {
+- return new AspectJTypeFilter(expression, classLoader);
+- }
++ //else if ("aspectj".equals(filterType)) {
++ // return new AspectJTypeFilter(expression, classLoader);
++ //}
+ else if ("regex".equals(filterType)) {
+ return new RegexPatternTypeFilter(Pattern.compile(expression));
+ }
Property changes on: trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,436 @@
+#! /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;
Property changes on: trunk/libspring-2.5-java/debian/patches/08_use_glasshfish_toplink.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,50 @@
+#! /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;
Property changes on: trunk/libspring-2.5-java/debian/patches/09_junit_45.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,50 @@
+#! /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) {
Property changes on: trunk/libspring-2.5-java/debian/patches/10_jruby_11.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,31 @@
+#! /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;
+ }
Property changes on: trunk/libspring-2.5-java/debian/patches/11_servlet_jsp_api.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/rules
===================================================================
--- trunk/libspring-2.5-java/debian/rules (rev 0)
+++ trunk/libspring-2.5-java/debian/rules 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,69 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
+VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//')
+
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+
+build-stamp: patch-stamp
+ ant alljars
+ touch $@
+
+clean: pre-clean unpatch
+
+pre-clean: patch-stamp
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ ant clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs changelog.txt
+ dh_installdocs -i
+ dh_install
+ dh_link
+ dh_strip
+ dh_compress
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# 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:
+ wget -O ../spring-framework.zip http://s3.amazonaws.com/dist.springframework.org/release/SPR/spring-framework-${VERSION}-with-dependencies.zip
+ mkdir orig_tmp
+ (cd orig_tmp && \
+ unzip ../../spring-framework.zip && \
+ cd spring-framework-${VERSION} && ant clean && cd .. && \
+ rm -r spring-framework-${VERSION}/lib && \
+ mv spring-framework-${VERSION} ${PACKAGE} && \
+ tar -czf ../../${PACKAGE}_${VERSION}.orig.tar.gz ${PACKAGE})
+ rm -rf orig_tmp
Property changes on: trunk/libspring-2.5-java/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libspring-2.5-java/debian/watch
===================================================================
--- trunk/libspring-2.5-java/debian/watch (rev 0)
+++ trunk/libspring-2.5-java/debian/watch 2009-08-10 22:15:55 UTC (rev 9926)
@@ -0,0 +1,11 @@
+version=3
+
+# SpringFramework new release are no more uploaded to sf.net
+# http://sf.net/springframework/spring-framework-(.+)-with-dependencies.zip
+
+# New download site is
+# http://www.springsource.com/download/community?project=Spring Framework
+#
+# NOT uscan-aware because:
+# - Need form submission to access file list
+# - Backend is hosted on Amazon S3 and disallow file listing
More information about the pkg-java-commits
mailing list