diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 79618bb947a..6defdb5cfc5 100644 --- a/examples/async-rest/async-rest-jar/pom.xml +++ b/examples/async-rest/async-rest-jar/pom.xml @@ -23,7 +23,7 @@ javax.servlet javax.servlet-api - 3.1-b01 + 3.1-b08 provided diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index 866339d96f6..0cb49409ec9 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/examples/async-rest/async-rest-webapp/pom.xml @@ -27,7 +27,7 @@ javax.servlet javax.servlet-api - 3.1-b01 + 3.1-b08 provided diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 5fc0eb2c310..b010b8119c6 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -96,5 +96,10 @@ + + javax.servlet + javax.servlet-api + 3.1-b08 + diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index bcf99908049..cf2713808d9 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -25,7 +25,9 @@ jetty-osgi-httpservice test-jetty-osgi-webapp test-jetty-osgi-context + diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java index 422a40ce2ed..1dedf0fb2cc 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java @@ -359,27 +359,33 @@ public class DeferredAuthentication implements Authentication.Deferred /* ------------------------------------------------------------ */ private static ServletOutputStream __nullOut = new ServletOutputStream() { + @Override public void write(int b) throws IOException { } - + + @Override public void print(String s) throws IOException { } - + + @Override public void println(String s) throws IOException { } - public boolean canWrite() - { - return false; - } - + + @Override public void setWriteListener(WriteListener writeListener) { } + + @Override + public boolean isReady() + { + return false; + } }; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index 951c2345de1..667353805b6 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -347,20 +347,14 @@ public class HttpOutput extends ServletOutputStream BufferUtil.clear(_aggregate); } - @Override - public boolean canWrite() - { - // TODO implement behaviour - // return true if data can be written without blocking - return false; - } + @Override public void setWriteListener(WriteListener writeListener) { _writeListener = writeListener; - // TODO implement behaviour + // TODO 3.1 implement behaviour /* Registering a WriteListener will start non-blocking IO. It is illegal to switch to the traditional blocking IO at that point. @@ -370,7 +364,15 @@ public class HttpOutput extends ServletOutputStream called AND has returned false AND a writeListener has previously been set. */ - + } + /** + * @see javax.servlet.ServletOutputStream#isReady() + */ + @Override + public boolean isReady() + { + // TODO 3.1 Auto-generated method stub + return false; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index 4218daf54e6..e8af1bea9be 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -56,8 +56,8 @@ 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.http.ProtocolHandler; import org.eclipse.jetty.http.HttpCookie; import org.eclipse.jetty.http.HttpFields; @@ -2203,10 +2203,14 @@ public class Request implements HttpServletRequest } - /* ------------------------------------------------------------ */ + + /** + * @see javax.servlet.http.HttpServletRequest#upgrade(java.lang.Class) + */ @Override - public void upgrade(ProtocolHandler arg0) throws IOException + public T upgrade(Class handlerClass) throws IOException, ServletException { - // TODO Auto-generated method stub + // TODO Auto-generated method stub + return null; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java index ea6396fd67a..b0c6270e962 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java @@ -31,8 +31,9 @@ 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.http.ProtocolHandler; + /* ------------------------------------------------------------ */ /** @@ -212,12 +213,25 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements } - + + /** + * @see javax.servlet.http.HttpServletRequest#changeSessionId() + */ @Override - public void upgrade(ProtocolHandler handler) throws IOException + public String changeSessionId() { - // TODO Auto-generated method stub - + // TODO 3.1 Auto-generated method stub + return null; + } + + /** + * @see javax.servlet.http.HttpServletRequest#upgrade(java.lang.Class) + */ + @Override + public T upgrade(Class handlerClass) throws IOException, ServletException + { + // TODO 3.1 Auto-generated method stub + return null; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 3d5fad459cb..6d913fb30f2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -2525,6 +2525,16 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu { LOG.warn(__unimplmented); } + + /** + * @see javax.servlet.ServletContext#getVirtualServerName() + */ + @Override + public String getVirtualServerName() + { + // TODO 3.1 Auto-generated method stub + return null; + } } diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java index 60456a53ac3..45d504a7dcd 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java @@ -352,19 +352,20 @@ public abstract class AbstractCompressedStream extends ServletOutputStream _response.setHeader(name, value); } - @Override - public boolean canWrite() - { - // TODO Auto-generated method stub - return false; - } - @Override public void setWriteListener(WriteListener writeListener) { - // TODO Auto-generated method stub + // TODO 3.1 Auto-generated method stub } + + + @Override + public boolean isReady() + { + // TODO 3.1 Auto-generated method stub + return false; + } /** * Create the stream fitting to the underlying compression type. diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java index 68901e3d476..c81d1839e91 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java @@ -217,6 +217,16 @@ public class MultiPartInputStreamParser } } + + /** + * @see javax.servlet.http.Part#getSubmittedFileName() + */ + @Override + public String getSubmittedFileName() + { + return getContentDispositionFilename(); + } + public byte[] getBytes() { if (_bout!=null) diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 826b5ccbfc2..abe6ee687f5 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -23,7 +23,7 @@ javax.servlet javax.servlet-api - 3.1-b01 + 3.1-b08