This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sitemesh.
commit 5d866ce06f52809626ddbf50c85b942af84713cb Author: Emmanuel Bourg <[email protected]> Date: Tue Mar 31 14:27:00 2015 +0200 Transition to the Servlet API 3.1 --- debian/changelog | 1 + debian/classpath-debian | 4 +- debian/control | 2 +- .../add_compatability_with_servlet_3.1.diff | 45 ++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e772ef..ebdac0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ sitemesh (2.4.1+dfsg-4) UNRELEASED; urgency=medium + * Transition to the Servlet API 3.1 * debian/control: - Updated Standards-Version to 3.9.6 (no changes) diff --git a/debian/classpath-debian b/debian/classpath-debian index a50d296..af18378 100644 --- a/debian/classpath-debian +++ b/debian/classpath-debian @@ -1,6 +1,6 @@ usr/share/java/JFlex.jar -usr/share/java/servlet-api-3.0.jar -usr/share/java/jsp-api-2.1.jar +usr/share/java/servlet-api-3.1.jar +usr/share/java/jsp-api-2.3.jar usr/share/java/velocity-tools-view.jar usr/share/java/freemarker.jar usr/share/java/velocity.jar diff --git a/debian/control b/debian/control index bd78a98..7f6ee1e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Uploaders: Miguel Landaeta <[email protected]>, Emmanuel Bourg <[email protected] Section: java Priority: optional Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, javahelper, jflex, - libservlet3.0-java, velocity, libvelocity-tools-java, + libservlet3.1-java, velocity, libvelocity-tools-java, libfreemarker-java, junit, ant-optional, default-jdk-doc Standards-Version: 3.9.6 Homepage: http://www.sitemesh.org diff --git a/debian/patches/add_compatability_with_servlet_3.1.diff b/debian/patches/add_compatability_with_servlet_3.1.diff new file mode 100644 index 0000000..61262f2 --- /dev/null +++ b/debian/patches/add_compatability_with_servlet_3.1.diff @@ -0,0 +1,45 @@ +Description: Implement the missing methods required to build against the Servlet API 3.1 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/java/com/opensymphony/module/sitemesh/filter/RoutableServletOutputStream.java ++++ b/src/java/com/opensymphony/module/sitemesh/filter/RoutableServletOutputStream.java +@@ -121,4 +121,24 @@ + public void flush() throws IOException { + getDestination().flush(); + } ++ ++ public void setWriteListener(javax.servlet.WriteListener listener) { ++ try { ++ getDestination(); ++ } catch (IOException e) { ++ throw new RuntimeException("Failed to initialize the destination", e); ++ } ++ ++ destination.setWriteListener(listener); ++ } ++ ++ public boolean isReady() { ++ try { ++ getDestination(); ++ } catch (IOException e) { ++ throw new RuntimeException("Failed to initialize the destination", e); ++ } ++ ++ return destination.isReady(); ++ } + } +--- a/src/java/com/opensymphony/module/sitemesh/filter/Buffer.java ++++ b/src/java/com/opensymphony/module/sitemesh/filter/Buffer.java +@@ -70,6 +70,12 @@ + public void write(int b) { + bufferedStream.write(b); + } ++ ++ public void setWriteListener(javax.servlet.WriteListener listener) {} ++ ++ public boolean isReady() { ++ return true; ++ } + }; + } + return exposedStream; diff --git a/debian/patches/series b/debian/patches/series index 27ec825..36dd74e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ disable_network.diff add_compatability_with_servlet_2.4.diff 625764.diff link_javadocs_to_system.diff +add_compatability_with_servlet_3.1.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sitemesh.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
