You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2006/02/13 17:44:44 UTC
svn commit: r377419 - in
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util:
ExtensionsFilter.java ExtensionsResponseWrapper.java
Author: baranda
Date: Mon Feb 13 08:44:42 2006
New Revision: 377419
URL: http://svn.apache.org/viewcvs?rev=377419&view=rev
Log:
Patch for MYFACES-1114. Thanks to Peter Mahoney
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsResponseWrapper.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java?rev=377419&r1=377418&r2=377419&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java Mon Feb 13 08:44:42 2006
@@ -42,12 +42,8 @@
private ServletContext _servletContext;
- private static final String ORG_APACHE_MYFACES_MY_FACES_JAVASCRIPT = "org.apache.myfaces.myFacesJavascript";
-
private static final String DOFILTER_CALLED = "org.apache.myfaces.component.html.util.ExtensionFilter.doFilterCalled";
- private static final String OLD_VIEW_ID = "org.apache.myfaces.renderkit.html.util.JavascriptUtils" + ".OLD_VIEW_ID";
-
/**
* Init method for this filter
*/
@@ -132,23 +128,31 @@
// write the javascript stuff for myfaces and headerInfo, if needed
HttpServletResponse servletResponse = (HttpServletResponse)response;
- addResource.parseResponse(extendedRequest, extendedResponse.toString(),
- servletResponse);
-
- addResource.writeMyFacesJavascriptBeforeBodyEnd(extendedRequest,
- servletResponse);
-
- if( ! addResource.hasHeaderBeginInfos(extendedRequest) ){
- // writes the response if no header info is needed
- addResource.writeResponse(extendedRequest, servletResponse);
- return;
+ // only parse HTML responses
+ if (extendedResponse.getContentType() != null && extendedResponse.getContentType().startsWith("text/html"))
+ {
+ addResource.parseResponse(extendedRequest, extendedResponse.toString(),
+ servletResponse);
+
+ addResource.writeMyFacesJavascriptBeforeBodyEnd(extendedRequest,
+ servletResponse);
+
+ if( ! addResource.hasHeaderBeginInfos(extendedRequest) ){
+ // writes the response if no header info is needed
+ addResource.writeResponse(extendedRequest, servletResponse);
+ return;
+ }
+
+ // Some headerInfo has to be added
+ addResource.writeWithFullHeader(extendedRequest, servletResponse);
+
+ // writes the response
+ addResource.writeResponse(extendedRequest, servletResponse);
+ }
+ else
+ {
+ servletResponse.getWriter().write(extendedResponse.toString());
}
-
- // Some headerInfo has to be added
- addResource.writeWithFullHeader(extendedRequest, servletResponse);
-
- // writes the response
- addResource.writeResponse(extendedRequest, servletResponse);
}
/**
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsResponseWrapper.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsResponseWrapper.java?rev=377419&r1=377418&r2=377419&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsResponseWrapper.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsResponseWrapper.java Mon Feb 13 08:44:42 2006
@@ -36,6 +36,7 @@
public class ExtensionsResponseWrapper extends HttpServletResponseWrapper {
private ByteArrayOutputStream stream = null;
private PrintWriter printWriter = null;
+ private String contentType;
public ExtensionsResponseWrapper(HttpServletResponse response){
super( response );
@@ -86,6 +87,15 @@
// noop
}
+ public void setContentType(String contentType) {
+ super.setContentType(contentType);
+ this.contentType = contentType;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
public void flushBuffer() throws IOException{
stream.flush();
}