[utilities COMMIT] in /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net: ThreadLocalHttpSer...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue May 20 21:18:55 2014
New Revision: 569

URL: http://svn.shibboleth.net/view/utilities?rev=569&view=rev
Log:
Upgrade Servlet API dependency to 3.1.0 and Servlet JSP API to 2.3.1 to match Jetty 9.1.5 and later.
Add Servlet JSTL as managed dependency to parent-v3 POM.
Add methods to ThreadLocalHttpServlet*Proxy classes for compatibility with the Servlet 3.1.0 API.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java?rev=569&r1=568&r2=569&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java Tue May 20 21:18:55 2014
@@ -38,6 +38,7 @@
 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 net.shibboleth.utilities.java.support.logic.Constraint;
@@ -74,6 +75,11 @@
     }
 
     /** {@inheritDoc} */
+    public long getContentLengthLong() {
+        return getCurrent().getContentLengthLong();
+    }
+
+    /** {@inheritDoc} */
     public String getContentType() {
         return getCurrent().getContentType();
     }
@@ -300,6 +306,11 @@
     }
 
     /** {@inheritDoc} */
+    public String changeSessionId() {
+       return getCurrent().changeSessionId();
+    }
+
+    /** {@inheritDoc} */
     public boolean isRequestedSessionIdValid() {
         return getCurrent().isRequestedSessionIdValid();
     }
@@ -378,6 +389,11 @@
     /** {@inheritDoc} */
     public Part getPart(String name) throws IOException, ServletException {
         return getCurrent().getPart(name);
+    }
+
+    /** {@inheritDoc} */
+    public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
+        return getCurrent().upgrade(handlerClass);
     }
 
     /**

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java?rev=569&r1=568&r2=569&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java Tue May 20 21:18:55 2014
@@ -65,6 +65,11 @@
     }
 
     /** {@inheritDoc} */
+    public void setContentLengthLong(long len) {
+        getCurrent().setContentLengthLong(len);
+    }
+
+    /** {@inheritDoc} */
     public void setContentType(String type) {
         getCurrent().setContentType(type);
     }