Skip to content

H
h2database
提交 9785360f authored 作者: Noel Grandin's avatar Noel Grandin 提交者： GitHub
浏览文件
操作

Merge pull request #329 from mbooth101/servlet-3.1.0 

Update to servlet API version 3.1.0 from 3.0.1
上级 cf0ab438 47e5cb96
显示空白字符变更
内嵌 并排
正在显示 包含 48 行增加 和 10 行删除
h2/pom.xml
浏览文件 @ 9785360f
......@@ -45,7 +45,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
......
h2/src/test/org/h2/test/server/TestWeb.java
浏览文件 @ 9785360f
......@@ -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;
}
}
/**
......@@ -1016,6 +1035,11 @@ public class TestWeb extends TestBase {
// ignore
}
@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
}
}
}
h2/src/test/org/h2/test/unit/TestServlet.java
浏览文件 @ 9785360f
......@@ -335,6 +335,10 @@ public class TestServlet extends TestBase {
throw new UnsupportedOperationException();
}
@Override
public String getVirtualServerName() {
throw new UnsupportedOperationException();
}
}
......
h2/src/tools/org/h2/build/Build.java
浏览文件 @ 9785360f
......@@ -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" +
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论