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

[mc...@apache.org]

Author: mconcini
Date: Tue Dec  1 21:11:58 2009
New Revision: 885934

URL: http://svn.apache.org/viewvc?rev=885934&view=rev
Log:
MYFACES-2434 - revert initial change for now

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
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.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=885934&r1=885933&r2=885934&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 Tue Dec  1 21:11:58 2009
@@ -19,7 +19,6 @@
 package org.apache.myfaces.application;
 
 import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
 import javax.servlet.ServletInputStream;
 import javax.servlet.RequestDispatcher;
 import javax.naming.OperationNotSupportedException;
@@ -43,12 +42,7 @@
  */
 
 
-public class _SystemEventServletRequest extends ServletRequestWrapper{
-    public _SystemEventServletRequest(ServletRequest request)
-    {
-        super(request);
-    }
-
+public class _SystemEventServletRequest implements ServletRequest{
     private static final String ERR_OP = "This request class is an empty placeholder";
 
     Map<String, Object> _attributesMap = new HashMap<String, Object>();

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=885934&r1=885933&r2=885934&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 Tue Dec  1 21:11:58 2009
@@ -19,7 +19,6 @@
 package org.apache.myfaces.application;
 
 import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
 import javax.servlet.ServletOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -34,12 +33,7 @@
  * hence we have to provide dummy objects
  */
 
-public class _SystemEventServletResponse extends ServletResponseWrapper {
-    public _SystemEventServletResponse(ServletResponse response)
-    {
-        super(response);
-    }
-
+public class _SystemEventServletResponse implements ServletResponse {
     private static final String ERR_OP = "This response class is an empty placeholder";
 
 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=885934&r1=885933&r2=885934&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Tue Dec  1 21:11:58 2009
@@ -33,8 +33,6 @@
 import javax.faces.event.PreDestroyApplicationEvent;
 import javax.faces.lifecycle.LifecycleFactory;
 import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 
 import org.apache.myfaces.application.ApplicationImpl;
 import org.apache.myfaces.application._SystemEventServletRequest;
@@ -136,12 +134,10 @@
         FacesContext fc = null;
 
         fc = FacesContext.getCurrentInstance();
-        ExternalContext ec = fc.getExternalContext();
-        
         if (fc == null) {
             LifecycleFactory lifeFac = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
             FacesContextFactory facFac = (FacesContextFactory) FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
-            fc = facFac.getFacesContext(servletContext, new _SystemEventServletRequest((ServletRequest)ec.getRequest()), new _SystemEventServletResponse((ServletResponse)ec.getResponse()), lifeFac.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE));
+            fc = facFac.getFacesContext(servletContext, new _SystemEventServletRequest(), new _SystemEventServletResponse(), lifeFac.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE));
         }
         appFac.getApplication().publishEvent(fc, eventClass, Application.class, appFac.getApplication());
     }