You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2008/09/03 22:06:02 UTC
svn commit: r691753 - in /incubator/jspwiki/trunk: ChangeLog
src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
Author: metskem
Date: Wed Sep 3 13:06:01 2008
New Revision: 691753
URL: http://svn.apache.org/viewvc?rev=691753&view=rev
Log:
reverted modifications for JSPWIKI-348 (delaying until 2.8.1)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=691753&r1=691752&r2=691753&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Sep 3 13:06:01 2008
@@ -1,9 +1,3 @@
-2008-09-03 Harry Metske <ha...@gmail.com>
-
- * 2.7.0-alpha-38
-
- * JSPWIKI-364: Introduced UtilJ2EECompat to check for container type (thanks to Lutz Tietze)
-
2008-09-03 Dirk Frederickx <di...@gmail.com>
* 2.7.0-alpha-37
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java?rev=691753&r1=691752&r2=691753&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java Wed Sep 3 13:06:01 2008
@@ -20,7 +20,9 @@
*/
package com.ecyrd.jspwiki.ui;
-import java.io.*;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
@@ -34,7 +36,6 @@
import com.ecyrd.jspwiki.event.WikiEventManager;
import com.ecyrd.jspwiki.event.WikiPageEvent;
import com.ecyrd.jspwiki.url.DefaultURLConstructor;
-import com.ecyrd.jspwiki.util.UtilJ2eeCompat;
import com.ecyrd.jspwiki.util.WatchDog;
/**
@@ -68,24 +69,7 @@
*/
public class WikiJSPFilter extends WikiServletFilter
{
- private Boolean m_useOutputStream;
-
/** {@inheritDoc} */
- public void init( FilterConfig config ) throws ServletException
- {
- super.init( config );
- ServletContext context = config.getServletContext();
- m_useOutputStream = UtilJ2eeCompat.useOutputStream( context.getServerInfo() );
- if( m_useOutputStream )
- {
- log.debug( "Using ByteArrayResponseWrapper" );
- }
- else
- {
- log.debug( "Using MyServletResponseWrapper" );
- }
- }
-
public void doFilter( ServletRequest request,
ServletResponse response,
FilterChain chain )
@@ -97,16 +81,8 @@
NDC.push( m_engine.getApplicationName()+":"+((HttpServletRequest)request).getRequestURI() );
w.enterState("Filtering for URL "+((HttpServletRequest)request).getRequestURI(), 90 );
- HttpServletResponseWrapper responseWrapper;
-
- if( m_useOutputStream )
- {
- responseWrapper = new ByteArrayResponseWrapper( (HttpServletResponse)response );
- }
- else
- {
- responseWrapper = new MyServletResponseWrapper( (HttpServletResponse)response );
- }
+
+ HttpServletResponseWrapper responseWrapper = new MyServletResponseWrapper( (HttpServletResponse)response );
// fire PAGE_REQUESTED event
String pagename = DefaultURLConstructor.parsePageFromURL(
@@ -308,75 +284,6 @@
}
}
- /**
- * Response wrapper for application servers which do not work with
- * CharArrayWriter Currently only OC4J
- */
- private static class ByteArrayResponseWrapper extends HttpServletResponseWrapper
- {
- private ByteArrayOutputStream m_output;
-
- private HttpServletResponse m_response;
-
- /**
- * How large the initial buffer should be. This should be tuned to
- * achieve a balance in speed and memory consumption.
- */
- private static final int INIT_BUFFER_SIZE = 4096;
-
- public ByteArrayResponseWrapper( HttpServletResponse r )
- {
- super( r );
- m_output = new ByteArrayOutputStream( INIT_BUFFER_SIZE );
- m_response = r;
- }
-
- /**
- * Returns a writer for output; this wraps the internal buffer into a
- * PrintWriter.
- */
- public PrintWriter getWriter()
- {
- return new PrintWriter( getOutputStream(), true );
- }
-
- public ServletOutputStream getOutputStream()
- {
- return new MyServletOutputStream( m_output );
- }
-
- static class MyServletOutputStream extends ServletOutputStream
- {
- private DataOutputStream m_stream;
-
- public MyServletOutputStream( OutputStream aOutput )
- {
- super();
- m_stream = new DataOutputStream( aOutput );
- }
-
- public void write( int aInt ) throws IOException
- {
- m_stream.write( aInt );
- }
- }
-
- /**
- * Returns whatever was written so far into the Writer.
- */
- public String toString()
- {
- try
- {
- return m_output.toString( m_response.getCharacterEncoding() );
- }
- catch( UnsupportedEncodingException e )
- {
- log.error( ByteArrayResponseWrapper.class + " Unsupported Encoding", e );
- return null;
- }
- }
- }
// events processing .......................................................