[pkg-java] r13423 - in trunk/libspring-2.5-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Mon Mar 14 19:29:01 UTC 2011
Author: drazzib
Date: 2011-03-14 19:28:59 +0000 (Mon, 14 Mar 2011)
New Revision: 13423
Added:
trunk/libspring-2.5-java/debian/patches/17_velocitytools2.diff
Modified:
trunk/libspring-2.5-java/debian/changelog
trunk/libspring-2.5-java/debian/control
trunk/libspring-2.5-java/debian/patches/series
Log:
* d/control: Drop all Depends on JRE packages since libspring-*-java
are libraries (conform to latest Debian Java Policy).
* d/patches/17_velocitytools2.diff: New patch to drop old code needed
only for (really) old velocity-tools. Fix FTBFS (Closes: #617868).
Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog 2011-03-14 03:38:00 UTC (rev 13422)
+++ trunk/libspring-2.5-java/debian/changelog 2011-03-14 19:28:59 UTC (rev 13423)
@@ -1,3 +1,12 @@
+libspring-2.5-java (2.5.6.SEC02-3) unstable; urgency=low
+
+ * d/control: Drop all Depends on JRE packages since libspring-*-java
+ are libraries (conform to latest Debian Java Policy).
+ * d/patches/17_velocitytools2.diff: New patch to drop old code needed
+ only for (really) old velocity-tools. Fix FTBFS (Closes: #617868).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 14 Mar 2011 20:25:26 +0100
+
libspring-2.5-java (2.5.6.SEC02-2) unstable; urgency=low
[ Miguel Landaeta ]
Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control 2011-03-14 03:38:00 UTC (rev 13422)
+++ trunk/libspring-2.5-java/debian/control 2011-03-14 19:28:59 UTC (rev 13423)
@@ -22,7 +22,7 @@
Package: libspring-core-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libasm3-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
+Depends: ${misc:Depends}, libasm3-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
Recommends: libcommons-attributes-java
Description: modular Java/J2EE application framework - Core
Spring is a layered Java/J2EE application framework offering a lot of freedom
@@ -34,7 +34,7 @@
Package: libspring-beans-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libcglib-java
+Depends: ${misc:Depends}, libspring-core-2.5-java, libcglib-java
Description: modular Java/J2EE application framework - Beans
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
@@ -44,7 +44,7 @@
Package: libspring-aop-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
+Depends: ${misc:Depends}, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
Recommends: libaopalliance-java, aspectj
Description: modular Java/J2EE application framework - AOP
Spring is a layered Java/J2EE application framework offering a lot of freedom
@@ -55,7 +55,7 @@
Package: libspring-context-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
+Depends: ${misc:Depends}, libspring-beans-2.5-java
Recommends: libspring-aop-2.5-java, glassfish-javaee
Suggests: bsh, groovy
Description: modular Java/J2EE application framework - Context
@@ -68,7 +68,7 @@
Package: libspring-context-support-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
+Depends: ${misc:Depends}, libspring-context-2.5-java
Recommends: libspring-aop-2.5-java, libspring-jdbc-2.5-java, libquartz-java, libjasperreports-java, libehcache-java, libfreemarker-java, velocity,
libgeronimo-commonj-spec-java
Description: modular Java/J2EE application framework - Context Support
@@ -81,7 +81,7 @@
Package: libspring-web-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-context-2.5-java
+Depends: ${misc:Depends}, libspring-context-2.5-java
Recommends: libstruts1.2-java, libcommons-httpclient-java, libaxis-java, libjsf-api-java, libhessian-java
Suggests: glassfish-javaee
Description: modular Java/J2EE application framework - Web
@@ -94,7 +94,7 @@
Package: libspring-webmvc-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-web-2.5-java
+Depends: ${misc:Depends}, 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
@@ -106,7 +106,7 @@
Package: libspring-webmvc-struts-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-webmvc-2.5-java, libstruts1.2-java
+Depends: ${misc:Depends}, libspring-webmvc-2.5-java, libstruts1.2-java
Description: modular Java/J2EE application framework - Struts MVC
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
@@ -117,7 +117,7 @@
Package: libspring-webmvc-portlet-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-webmvc-2.5-java, libportlet-api-2.0-spec-java, libcommons-fileupload-java
+Depends: ${misc:Depends}, libspring-webmvc-2.5-java, libportlet-api-2.0-spec-java, libcommons-fileupload-java
Description: modular Java/J2EE application framework - Portlet MVC
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
@@ -128,7 +128,7 @@
Package: libspring-test-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+Depends: ${misc:Depends}, 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
@@ -140,7 +140,7 @@
Package: libspring-tx-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java
+Depends: ${misc:Depends}, 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
@@ -152,7 +152,7 @@
Package: libspring-jdbc-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, libc3p0-java
+Depends: ${misc:Depends}, 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
@@ -162,7 +162,7 @@
Package: libspring-jms-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java, libspring-tx-2.5-java, glassfish-javaee
+Depends: ${misc:Depends}, 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
@@ -172,7 +172,7 @@
Package: libspring-orm-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-jdbc-2.5-java
+Depends: ${misc:Depends}, libspring-jdbc-2.5-java
Recommends: libspring-web-2.5-java, libjdo-api-java, glassfish-toplink-essentials, libibatis-java, libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
libeclipselink-java, libopenjpa-java
Description: modular Java/J2EE application framework - ORM tools
@@ -185,7 +185,7 @@
Package: libspring-aspects-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime
+Depends: ${misc:Depends}
Description: modular Java/J2EE application framework - Bundled aspects
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
Added: trunk/libspring-2.5-java/debian/patches/17_velocitytools2.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/17_velocitytools2.diff (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/17_velocitytools2.diff 2011-03-14 19:28:59 UTC (rev 13423)
@@ -0,0 +1,43 @@
+Description: ViewTool not needed anymore since 1.3.
+ Drop its usage from Spring and use init(Object) method.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-03-12
+--- a/src/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java
++++ b/src/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java
+@@ -27,7 +27,6 @@
+ import org.apache.velocity.tools.view.ToolboxManager;
+ import org.apache.velocity.tools.view.context.ChainedContext;
+ import org.apache.velocity.tools.view.servlet.ServletToolboxManager;
+-import org.apache.velocity.tools.view.tools.ViewTool;
+
+ import org.springframework.util.ClassUtils;
+ import org.springframework.util.ReflectionUtils;
+@@ -64,7 +63,6 @@
+ * @see #initTool
+ * @see org.apache.velocity.tools.view.context.ViewContext
+ * @see org.apache.velocity.tools.view.context.ChainedContext
+- * @see org.apache.velocity.tools.view.tools.ViewTool
+ * @see org.apache.velocity.tools.view.tools.LinkTool
+ */
+ public class VelocityToolboxView extends VelocityView {
+@@ -122,19 +120,13 @@
+ * Overridden to check for the ViewContext interface which is part of the
+ * view package of Velocity Tools. This requires a special Velocity context,
+ * like ChainedContext as set up by {@link #createVelocityContext} in this class.
+- * @see org.apache.velocity.tools.view.tools.ViewTool#init(Object)
+- * @see org.apache.velocity.tools.view.tools.LinkTool#init(Object)
+ */
+ protected void initTool(Object tool, Context velocityContext) throws Exception {
+ // Initialize ViewTool instances with the Velocity context.
+ // Despite having an "init(Object)" method, all known ViewTool
+ // implementations expect a ViewContext implementation as argument.
+ // ChainedContext implements the ViewContext interface.
+- if (tool instanceof ViewTool) {
+- // Velocity Tools 1.2: an actual ViewTool implementation.
+- ((ViewTool) tool).init(velocityContext);
+- }
+- else {
++ {
+ // Velocity Tools 1.3: a class-level "init(Object)" method.
+ Method initMethod =
+ ClassUtils.getMethodIfAvailable(tool.getClass(), "init", new Class[] {Object.class});
Modified: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series 2011-03-14 03:38:00 UTC (rev 13422)
+++ trunk/libspring-2.5-java/debian/patches/series 2011-03-14 19:28:59 UTC (rev 13423)
@@ -13,3 +13,4 @@
14_portlet_api.diff
15_fix_build_with_asm3.diff
16_commonj.diff
+17_velocitytools2.diff
More information about the pkg-java-commits
mailing list