From 47e5cb965d16ccefb62978239d03d4cc8c57c3b7 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 8 Aug 2016 16:42:53 +0100
Subject: [PATCH] Update to servlet API version 3.1.0 from 3.0.1
---
h2/pom.xml | 2 +-
h2/src/test/org/h2/test/server/TestWeb.java | 34 +++++++++++++++++++++++++++
h2/src/test/org/h2/test/unit/TestServlet.java | 4 ++++
h2/src/tools/org/h2/build/Build.java | 18 +++++++-------
4 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/h2/src/test/org/h2/test/server/TestWeb.java b/h2/src/test/org/h2/test/server/TestWeb.java
index 9a20358..845084d 100644
--- a/h2/src/test/org/h2/test/server/TestWeb.java
+++ b/h2/src/test/org/h2/test/server/TestWeb.java
@@ -28,12 +28,15 @@ import javax.servlet.ServletInputStream;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.WriteListener;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import org.h2.api.ErrorCode;
import org.h2.engine.Constants;
@@ -938,6 +941,22 @@ public class TestWeb extends TestBase {
return null;
}
+ @Override
+ public long getContentLengthLong() {
+ return 0;
+ }
+
+ @Override
+ public String changeSessionId() {
+ return null;
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass)
+ throws IOException, ServletException {
+ return null;
+ }
+
}
/**
@@ -1017,6 +1036,11 @@ public class TestWeb extends TestBase {
}
@Override
+ public void setContentLengthLong(long arg0) {
+ // ignore
+ }
+
+ @Override
public void setContentType(String arg0) {
// ignore
}
@@ -1157,6 +1181,16 @@ public class TestWeb extends TestBase {
}
}
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ // ignore
+ }
+
}
}
diff --git a/h2/src/test/org/h2/test/unit/TestServlet.java b/h2/src/test/org/h2/test/unit/TestServlet.java
index 6400dfe..3a3630c 100644
--- a/h2/src/test/org/h2/test/unit/TestServlet.java
+++ b/h2/src/test/org/h2/test/unit/TestServlet.java
@@ -335,6 +335,10 @@ public class TestServlet extends TestBase {
throw new UnsupportedOperationException();
}
+ @Override
+ public String getVirtualServerName() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java
index b62b8ce..a599656 100644
--- a/h2/src/tools/org/h2/build/Build.java
+++ b/h2/src/tools/org/h2/build/Build.java
@@ -125,7 +125,7 @@ public class Build extends BuildBase {
String cp = "temp" + File.pathSeparator + "bin" +
File.pathSeparator + "ext/emma-2.0.5312.jar" +
File.pathSeparator + "ext/postgresql-8.3-603.jdbc3.jar" +
- File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" +
File.pathSeparator + "ext/lucene-core-3.6.2.jar" +
File.pathSeparator + "ext/h2mig_pagestore_addon.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
@@ -203,7 +203,7 @@ public class Build extends BuildBase {
mkdir("temp");
download();
String classpath = "temp" +
- File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" +
File.pathSeparator + "ext/lucene-core-3.6.2.jar" +
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
@@ -296,9 +296,9 @@ public class Build extends BuildBase {
}
private void downloadOrVerify(boolean offline) {
- downloadOrVerify("ext/servlet-api-3.0.1.jar",
- "javax/servlet", "javax.servlet-api", "3.0.1",
- "6bf0ebb7efd993e222fc1112377b5e92a13b38dd", offline);
+ downloadOrVerify("ext/servlet-api-3.1.0.jar",
+ "javax/servlet", "javax.servlet-api", "3.1.0",
+ "3cd63d075497751784b2fa84be59432f4905bf7c", offline);
downloadOrVerify("ext/lucene-core-3.6.2.jar",
"org/apache/lucene", "lucene-core", "3.6.2",
"9ec77e2507f9cc01756964c71d91efd8154a8c47", offline);
@@ -617,7 +617,7 @@ public class Build extends BuildBase {
"-d", "docs/javadocImpl2",
"-classpath", javaToolsJar +
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
- File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" +
File.pathSeparator + "ext/lucene-core-3.6.2.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
@@ -632,7 +632,7 @@ public class Build extends BuildBase {
"-d", "docs/javadocImpl3",
"-classpath", javaToolsJar +
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
- File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" +
File.pathSeparator + "ext/lucene-core-3.6.2.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
@@ -647,7 +647,7 @@ public class Build extends BuildBase {
File.pathSeparator + "src/tools",
"-classpath", javaToolsJar +
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
- File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" +
File.pathSeparator + "ext/lucene-core-3.6.2.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
@@ -916,7 +916,7 @@ public class Build extends BuildBase {
downloadTest();
String cp = "temp" + File.pathSeparator + "bin" +
File.pathSeparator + "ext/postgresql-8.3-603.jdbc3.jar" +
- File.pathSeparator + "ext/servlet-api-3.0.1.jar" +
+ File.pathSeparator + "ext/servlet-api-3.1.0.jar" +
File.pathSeparator + "ext/lucene-core-3.6.2.jar" +
File.pathSeparator + "ext/h2mig_pagestore_addon.jar" +
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
--
2.5.5