tags 658804 + patch thanks On Sun, Feb 05, 2012 at 10:09:31PM -0430, Miguel Landaeta wrote: > Source: libjasper-java > Version: 5.5.33-2 > Severity: normal > > Please migrate your dependencies on libservlet2.4-java to libservlet-2.5-java.
Hi folks, Do you think this package would work after applying the attached patch and rebuilding it with libservlet2.5-java? I didn't commit that patch to the repo since I don't know if this package needs libservlet2.4-java explicitly and I guess changes to this package could impact to eclipse. What do you think? Is my patch sane or do we have to carry libservlet2.4-java just because of this package? Cheers, -- Miguel Landaeta, miguel at miguel.cc secure email with PGP 0x6E608B637D8967E9 available at http://keyserver.pgp.com/ "Faith means not wanting to know what is true." -- Nietzsche
diff -Nru libjasper-java-5.5.33/debian/ant.properties libjasper-java-5.5.33/debian/ant.properties --- libjasper-java-5.5.33/debian/ant.properties 2010-01-31 08:32:36.000000000 -0430 +++ libjasper-java-5.5.33/debian/ant.properties 2012-02-05 20:59:44.000000000 -0430 @@ -1,5 +1,5 @@ -jsp-api.jar=/usr/share/java/jsp-api-2.0.jar -servlet-api.jar=/usr/share/java/servlet-api-2.4.jar +jsp-api.jar=/usr/share/java/jsp-api-2.1.jar +servlet-api.jar=/usr/share/java/servlet-api-2.5.jar #ant.home=/usr/share/ant/ ant.jar=/usr/share/java/ant.jar compile.source=1.5 diff -Nru libjasper-java-5.5.33/debian/changelog libjasper-java-5.5.33/debian/changelog --- libjasper-java-5.5.33/debian/changelog 2011-12-07 14:36:03.000000000 -0430 +++ libjasper-java-5.5.33/debian/changelog 2012-03-10 17:09:59.000000000 -0430 @@ -1,3 +1,11 @@ +libjasper-java (5.5.33-3) UNRELEASED; urgency=low + + * Team upload. + * Replace dependencies on Servlet 2.4 library with 2.5 one. (Closes: #658804). + * Bump Standards-Version to 3.9.3. No changes were required. + + -- Miguel Landaeta <[email protected]> Sat, 10 Mar 2012 17:07:23 -0430 + libjasper-java (5.5.33-2) unstable; urgency=low * d/control: Update Vcs-Svn and Vcs-Browser diff -Nru libjasper-java-5.5.33/debian/control libjasper-java-5.5.33/debian/control --- libjasper-java-5.5.33/debian/control 2011-12-07 14:45:37.000000000 -0430 +++ libjasper-java-5.5.33/debian/control 2012-03-09 17:39:52.000000000 -0430 @@ -5,8 +5,8 @@ Uploaders: Marcus Better <[email protected]>, Michael Koch <[email protected]>, Niels Thykier <[email protected]>, Jakub Adam <[email protected]> Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libcommons-el-java, - libcommons-logging-java, libecj-java, libservlet2.4-java -Standards-Version: 3.9.2 + libcommons-logging-java, libecj-java, libservlet2.5-java +Standards-Version: 3.9.3 Homepage: http://tomcat.apache.org Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjasper-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjasper-java @@ -14,7 +14,7 @@ Package: libjasper-java Architecture: all Depends: libcommons-el-java, libcommons-logging-java, libecj-java, - libservlet2.4-java, ${misc:Depends} + libservlet2.5-java, ${misc:Depends} Description: Implementation of the JSP Container Jasper2 is a implementation of the JSP Container for Apache Tomcat 5.5 that is clean and easy to extend. It also forms the basis of the diff -Nru libjasper-java-5.5.33/debian/patches/series libjasper-java-5.5.33/debian/patches/series --- libjasper-java-5.5.33/debian/patches/series 1969-12-31 20:00:00.000000000 -0400 +++ libjasper-java-5.5.33/debian/patches/series 2012-03-10 16:43:52.000000000 -0430 @@ -0,0 +1 @@ +servlet25.diff diff -Nru libjasper-java-5.5.33/debian/patches/servlet25.diff libjasper-java-5.5.33/debian/patches/servlet25.diff --- libjasper-java-5.5.33/debian/patches/servlet25.diff 1969-12-31 20:00:00.000000000 -0400 +++ libjasper-java-5.5.33/debian/patches/servlet25.diff 2012-03-10 16:52:07.000000000 -0430 @@ -0,0 +1,104 @@ +Description: Dummy compatibility with Servlet 2.5 API +Author: Miguel Landaeta <[email protected]> +Bug-Debian: http://bugs.debian.org/658804 +Forwarded: no +Last-Update: 2012-03-10 + +--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/runtime/JspFactoryImpl.java ++++ libjasper-java-5.5.33/src/share/org/apache/jasper/runtime/JspFactoryImpl.java +@@ -20,8 +20,10 @@ import java.security.AccessController; + import java.security.PrivilegedAction; + + import javax.servlet.Servlet; ++import javax.servlet.ServletContext; + import javax.servlet.ServletRequest; + import javax.servlet.ServletResponse; ++import javax.servlet.jsp.JspApplicationContext; + import javax.servlet.jsp.JspFactory; + import javax.servlet.jsp.JspEngineInfo; + import javax.servlet.jsp.PageContext; +@@ -175,4 +177,8 @@ public class JspFactoryImpl extends JspF + return null; + } + } ++ ++ public JspApplicationContext getJspApplicationContext(ServletContext context) { ++ throw new UnsupportedOperationException("getJspApplicationContext"); ++ } + } +--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/runtime/JspContextWrapper.java ++++ libjasper-java-5.5.33/src/share/org/apache/jasper/runtime/JspContextWrapper.java +@@ -41,6 +41,8 @@ import javax.servlet.jsp.el.VariableReso + import javax.servlet.jsp.tagext.BodyContent; + import javax.servlet.jsp.tagext.VariableInfo; + ++import javax.el.ELContext; ++ + import org.apache.commons.el.VariableResolverImpl; + import org.apache.jasper.compiler.Localizer; + +@@ -451,5 +453,9 @@ public class JspContextWrapper + } + return alias; + } ++ ++ public ELContext getELContext() { ++ throw new UnsupportedOperationException("getELContext"); ++ } + } + +--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/servlet/JspCServletContext.java ++++ libjasper-java-5.5.33/src/share/org/apache/jasper/servlet/JspCServletContext.java +@@ -427,5 +427,10 @@ public class JspCServletContext implemen + } + + ++ public String getContextPath() { ++ throw new UnsupportedOperationException("getContextPath"); ++ } ++ ++ + + } +--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java ++++ libjasper-java-5.5.33/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java +@@ -142,4 +142,8 @@ class ImplicitTagLibraryInfo extends Tag + + return tagFile; + } ++ ++ public TagLibraryInfo[] getTagLibraryInfos() { ++ throw new UnsupportedOperationException("getTagLibraryInfos"); ++ } + } +--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/runtime/PageContextImpl.java ++++ libjasper-java-5.5.33/src/share/org/apache/jasper/runtime/PageContextImpl.java +@@ -44,6 +44,8 @@ import javax.servlet.jsp.el.ExpressionEv + import javax.servlet.jsp.el.VariableResolver; + import javax.servlet.jsp.tagext.BodyContent; + ++import javax.el.ELContext; ++ + import org.apache.commons.el.ExpressionEvaluatorImpl; + import org.apache.commons.el.VariableResolverImpl; + import org.apache.jasper.Constants; +@@ -933,4 +935,8 @@ public class PageContextImpl extends Pag + return retValue; + } + ++ public ELContext getELContext() { ++ throw new UnsupportedOperationException("getELContext"); ++ } ++ + } +--- libjasper-java-5.5.33.orig/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java ++++ libjasper-java-5.5.33/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java +@@ -763,4 +763,8 @@ class TagLibraryInfoImpl extends TagLibr + } + + protected TagLibraryValidator tagLibraryValidator; ++ ++ public TagLibraryInfo[] getTagLibraryInfos() { ++ throw new UnsupportedOperationException("getTagLibraryInfos"); ++ } + } diff -Nru libjasper-java-5.5.33/debian/rules libjasper-java-5.5.33/debian/rules --- libjasper-java-5.5.33/debian/rules 2011-09-08 15:18:26.000000000 -0430 +++ libjasper-java-5.5.33/debian/rules 2012-03-10 09:26:07.000000000 -0430 @@ -9,7 +9,7 @@ JAVA_HOME := /usr/lib/jvm/default-java JAR := $(JAVA_HOME)/bin/jar -DEB_JARS := ant ant-launcher ant-trax +DEB_JARS := ant ant-launcher ant-trax el-api-2.1 install/libjasper-java:: cd build/shared/classes/ && $(JAR) cf ../../jasper.jar *
signature.asc
Description: Digital signature
