svn commit: r887425 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application: _SystemEventServletRequest.java _SystemEventServletResponse.java

[lu...@apache.org]

Author: lu4242
Date: Fri Dec  4 23:02:39 2009
New Revision: 887425

URL: http://svn.apache.org/viewvc?rev=887425&view=rev
Log:
MYFACES-2434 dummy request/response classes for system event listeners will break with Servlet 3.0

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java?rev=887425&r1=887424&r2=887425&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java Fri Dec  4 23:02:39 2009
@@ -18,21 +18,16 @@
  */
 package org.apache.myfaces.application;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletInputStream;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRequestWrapper;
-import javax.naming.OperationNotSupportedException;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Locale;
-import java.util.HashMap;
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-import java.io.BufferedReader;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpSession;
 
 /**
  * @author Werner Punz (latest modification by $Author$)
@@ -46,14 +41,14 @@
  */
 
 
-public class _SystemEventServletRequest extends ServletRequestWrapper{
+public class _SystemEventServletRequest extends HttpServletRequestWrapper{
 
     Map<String, Object> _attributesMap = new HashMap<String, Object>();
     public _SystemEventServletRequest()
     {
-        super( (ServletRequest) Proxy.newProxyInstance(
-                ServletRequest.class.getClassLoader(),
-                new Class[] { ServletRequest.class },
+        super( (HttpServletRequest) Proxy.newProxyInstance(
+                HttpServletRequest.class.getClassLoader(),
+                new Class[] { HttpServletRequest.class },
                 new InvocationHandler()
                 {
                     public Object invoke(Object proxy, Method m, Object[] args) 
@@ -74,4 +69,27 @@
     public void removeAttribute(String s) {
         _attributesMap.remove(s);
     }
+
+    public String getServletPath()
+    {
+        return null;
+    }
+
+    public String getPathInfo()
+    {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession()
+    {
+        return null;
+    }
+
+    @Override
+    public HttpSession getSession(boolean create)
+    {
+        return null;
+    }
+    
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java?rev=887425&r1=887424&r2=887425&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java Fri Dec  4 23:02:39 2009
@@ -18,16 +18,12 @@
  */
 package org.apache.myfaces.application;
 
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletResponseWrapper;
-
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.Locale;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
 
 /**
  * @author Werner Punz (latest modification by $Author$)
@@ -38,13 +34,13 @@
  * hence we have to provide dummy objects
  */
 
-public class _SystemEventServletResponse extends ServletResponseWrapper {
+public class _SystemEventServletResponse extends HttpServletResponseWrapper {
 
     public _SystemEventServletResponse()
     {
-        super( (ServletResponse) Proxy.newProxyInstance(
-                ServletResponse.class.getClassLoader(),
-                new Class[] { ServletResponse.class },
+        super( (HttpServletResponse) Proxy.newProxyInstance(
+                HttpServletResponse.class.getClassLoader(),
+                new Class[] { HttpServletResponse.class },
                 new InvocationHandler()
                 {
                     public Object invoke(Object proxy, Method m, Object[] args)