[pkg-java] r19074 - in trunk/oscache/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-06-03 12:53:22 +0000 (Fri, 03 Jun 2016)
New Revision: 19074

Added:
   trunk/oscache/debian/patches/
   trunk/oscache/debian/patches/01-servlet-api-compatibility.patch
   trunk/oscache/debian/patches/series
Modified:
   trunk/oscache/debian/changelog
   trunk/oscache/debian/control
   trunk/oscache/debian/maven.rules
   trunk/oscache/debian/rules
Log:
Transition to the Servlet API 3.1



Modified: trunk/oscache/debian/changelog
===================================================================
--- trunk/oscache/debian/changelog	2016-05-30 17:14:50 UTC (rev 19073)
+++ trunk/oscache/debian/changelog	2016-06-03 12:53:22 UTC (rev 19074)
@@ -1,3 +1,10 @@
+oscache (2.4.1+ds1-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Jun 2016 14:52:21 +0200
+
 oscache (2.4.1+ds1-4) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/oscache/debian/control
===================================================================
--- trunk/oscache/debian/control	2016-05-30 17:14:50 UTC (rev 19073)
+++ trunk/oscache/debian/control	2016-06-03 12:53:22 UTC (rev 19074)
@@ -10,7 +10,7 @@
                      libcommons-logging-java,
                      libhibernate3-java,
                      libjgroups-java (>= 2.12.2.Final),
-                     libservlet3.0-java
+                     libservlet3.1-java
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/oscache
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/oscache

Modified: trunk/oscache/debian/maven.rules
===================================================================
--- trunk/oscache/debian/maven.rules	2016-05-30 17:14:50 UTC (rev 19073)
+++ trunk/oscache/debian/maven.rules	2016-06-03 12:53:22 UTC (rev 19074)
@@ -16,4 +16,4 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\..*/3.x/
 
-javax.servlet servlet-api jar s/2\..*/2.5/
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/

Added: trunk/oscache/debian/patches/01-servlet-api-compatibility.patch
===================================================================
--- trunk/oscache/debian/patches/01-servlet-api-compatibility.patch	                        (rev 0)
+++ trunk/oscache/debian/patches/01-servlet-api-compatibility.patch	2016-06-03 12:53:22 UTC (rev 19074)
@@ -0,0 +1,15 @@
+Description: Fix the compatibility with the latest version of the Servlet API
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/java/com/opensymphony/oscache/web/filter/SplitServletOutputStream.java
++++ b/src/java/com/opensymphony/oscache/web/filter/SplitServletOutputStream.java
+@@ -91,4 +91,9 @@
+         passThroughStream.close();
+     }    
+ 
++    public void setWriteListener(javax.servlet.WriteListener writeListener) { }
++
++    public boolean isReady() {
++        return true;
++    }
+ }

Added: trunk/oscache/debian/patches/series
===================================================================
--- trunk/oscache/debian/patches/series	                        (rev 0)
+++ trunk/oscache/debian/patches/series	2016-06-03 12:53:22 UTC (rev 19074)
@@ -0,0 +1 @@
+01-servlet-api-compatibility.patch

Modified: trunk/oscache/debian/rules
===================================================================
--- trunk/oscache/debian/rules	2016-05-30 17:14:50 UTC (rev 19073)
+++ trunk/oscache/debian/rules	2016-06-03 12:53:22 UTC (rev 19074)
@@ -6,7 +6,7 @@
 JAVA_HOME 		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= commons-logging jgroups servlet-api-3.0 jsp-api-2.2 \
+DEB_JARS		:= commons-logging jgroups servlet-api-3.1 jsp-api-2.3 \
   glassfish-javaee hibernate-core
 
 install/liboscache-java::