Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).

This commit is contained in:
Jan Bartel 2013-04-15 17:44:35 +10:00
parent 07b844bf85
commit db21b42b4f
18 changed files with 96 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/async-rest/async-rest-jar/pom.xml
View File

@ -23,7 +23,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
<scope>provided</scope>
</dependency>
</dependencies>

2
examples/async-rest/async-rest-webapp/pom.xml
View File

@ -27,7 +27,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
<scope>provided</scope>
</dependency>
</dependencies>

5
jetty-jsp/pom.xml
View File

@ -96,5 +96,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b08</version>
</dependency>
</dependencies>
</project>

2
jetty-osgi/pom.xml
View File

@ -25,7 +25,9 @@
<module>jetty-osgi-httpservice</module>
<module>test-jetty-osgi-webapp</module>
<module>test-jetty-osgi-context</module>
<!--
<module>test-jetty-osgi</module>
-->
</modules>
<build>
<resources>

20
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
View File

@ -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;
}
};

20
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -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;
}
}

12
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -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 extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException
{
// TODO Auto-generated method stub
// TODO Auto-generated method stub
return null;
}
}

24
jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java
View File

@ -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 extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException
{
// TODO 3.1 Auto-generated method stub
return null;
}

10
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -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;
}
}

17
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
View File

@ -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.

10
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
View File

@ -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)

2
jetty-websocket/websocket-servlet/pom.xml
View File

@ -23,7 +23,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
</dependency>
<!--

2
pom.xml
View File

@ -465,7 +465,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
<!--
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>

2
tests/test-webapps/test-mock-resources/pom.xml
View File

@ -30,7 +30,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
</dependency>
<!--

2
tests/test-webapps/test-proxy-webapp/pom.xml
View File

@ -49,7 +49,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
<scope>provided</scope>
</dependency>

2
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
View File

@ -24,7 +24,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
<scope>provided</scope>
</dependency>

2
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
View File

@ -138,7 +138,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
<scope>provided</scope>
</dependency>

2
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
View File

@ -25,7 +25,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1-b01</version>
<version>3.1-b08</version>
</dependency>
<!--