Author: jacopoc
Date: Sun Sep 7 06:32:25 2014
New Revision: 1622976
URL: http://svn.apache.org/r1622976
Log:
Removed the old UtilJ2eeCompat util class that was probably created for
compatibility with some old application servers.
UtilJ2eeCompat was used to figure out, by checking the servlet container
implementation, if the response should be sent using a Writer or a
OutputStream; a Writer was used for Tomcat, Websphere, Jetty, Orion, Jrun,
Tradecity and an OutputStream was used for all the other servlet containers.
However accordingly to the Servlet api:
ServletResponse.getWriter():
Returns a PrintWriter object that can send character text to the
client.
ServletResponse.getOutputStream():
Returns a ServletOutputStream suitable for writing binary data in the
response.
Based on this getWriter() should always be used (for html pages) in all the
containers, not just Tomcat, Websphere, Jetty, Orion, Jrun, Tradecity.
Removed:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJ2eeCompat.java
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1622976&r1=1622975&r2=1622976&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
(original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
Sun Sep 7 06:32:25 2014
@@ -20,7 +20,6 @@
package org.ofbiz.content.cms;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.List;
import java.util.Locale;
@@ -28,7 +27,6 @@ import java.util.Locale;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -37,7 +35,6 @@ import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.GeneralRuntimeException;
import org.ofbiz.base.util.UtilHttp;
-import org.ofbiz.base.util.UtilJ2eeCompat;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
@@ -266,19 +263,8 @@ public class CmsEvents {
//String contextLinkPrefix = rh.makeLink(request, response,
"", true, false, true);
//templateMap.put("_CONTEXT_LINK_PREFIX_", contextLinkPrefix);
- Writer writer;
try {
- // use UtilJ2eeCompat to get this setup properly
- boolean useOutputStreamNotWriter = false;
- if (servletContext != null) {
- useOutputStreamNotWriter =
UtilJ2eeCompat.useOutputStreamNotWriter(servletContext);
- }
- if (useOutputStreamNotWriter) {
- ServletOutputStream ros = response.getOutputStream();
- writer = new OutputStreamWriter(ros, "UTF-8");
- } else {
- writer = response.getWriter();
- }
+ Writer writer = response.getWriter();
// TODO: replace "screen" to support dynamic rendering of
different output
FormStringRenderer formStringRenderer = new
MacroFormRenderer(UtilProperties.getPropertyValue("widget",
"screen.formrenderer"), request, response);
templateMap.put("formStringRenderer", formStringRenderer);
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java?rev=1622976&r1=1622975&r2=1622976&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java
(original)
+++
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java
Sun Sep 7 06:32:25 2014
@@ -20,7 +20,6 @@
package org.ofbiz.workeffort.workeffort;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.Date;
import java.util.Enumeration;
@@ -29,7 +28,6 @@ import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -40,7 +38,6 @@ import javolution.util.FastMap;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilHttp;
-import org.ofbiz.base.util.UtilJ2eeCompat;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
@@ -142,17 +139,6 @@ public class ICalWorker {
}
}
- protected static Writer getWriter(HttpServletResponse response,
ServletContext context) throws IOException {
- Writer writer = null;
- if (UtilJ2eeCompat.useOutputStreamNotWriter(context)) {
- ServletOutputStream ros = response.getOutputStream();
- writer = new OutputStreamWriter(ros, "UTF-8");
- } else {
- writer = response.getWriter();
- }
- return writer;
- }
-
public static void handleGetRequest(HttpServletRequest request,
HttpServletResponse response, ServletContext context) throws ServletException,
IOException {
if (!isValidRequest(request, response)) {
return;
@@ -221,7 +207,7 @@ public class ICalWorker {
Debug.logVerbose("[handlePropFindRequest] PROPFIND
response:\r\n" + UtilXml.writeXmlDocument(responseDocument), module);
}
ResponseHelper.prepareResponse(response, 207, "Multi-Status");
- Writer writer = getWriter(response, context);
+ Writer writer = response.getWriter();
try {
helper.writeResponse(response, writer);
} finally {
@@ -332,7 +318,7 @@ public class ICalWorker {
}
if (responseProps.statusMessage != null) {
response.setContentLength(responseProps.statusMessage.length());
- Writer writer = getWriter(response, context);
+ Writer writer = response.getWriter();
try {
writer.write(responseProps.statusMessage);
} finally {
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1622976&r1=1622975&r2=1622976&view=diff
==============================================================================
---
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
(original)
+++
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
Sun Sep 7 06:32:25 2014
@@ -35,7 +35,6 @@ import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilHttp;
-import org.ofbiz.base.util.UtilJ2eeCompat;
import org.ofbiz.base.util.UtilTimer;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -254,11 +253,7 @@ public class ControlServlet extends Http
String errorMessage = "ERROR rendering error page [" +
errorPage + "], but here is the error text: " +
request.getAttribute("_ERROR_MESSAGE_");
try {
- if
(UtilJ2eeCompat.useOutputStreamNotWriter(getServletContext())) {
- response.getOutputStream().print(errorMessage);
- } else {
- response.getWriter().print(errorMessage);
- }
+ response.getWriter().print(errorMessage);
} catch (Throwable t2) {
try {
int errorToSend =
HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
@@ -277,11 +272,7 @@ public class ControlServlet extends Http
}
String errorMessage = "<html><body>ERROR in error page,
(infinite loop or error page not found with name [" + errorPage + "]), but here
is the text just in case it helps you: " +
request.getAttribute("_ERROR_MESSAGE_") + "</body></html>";
- if
(UtilJ2eeCompat.useOutputStreamNotWriter(getServletContext())) {
- response.getOutputStream().print(errorMessage);
- } else {
- response.getWriter().print(errorMessage);
- }
+ response.getWriter().print(errorMessage);
}
}
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp?rev=1622976&r1=1622975&r2=1622976&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp Sun
Sep 7 06:32:25 2014
@@ -38,11 +38,7 @@ under the License.
PrintWriter writer = null;
ServletContext context = pageContext.getServletContext();
- if (UtilJ2eeCompat.useOutputStreamNotWriter(context)) {
- writer = new PrintWriter(response.getOutputStream(), true);
- } else {
- writer = response.getWriter();
- }
+ writer = response.getWriter();
writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
writer.println("<entity-engine-xml>");
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java?rev=1622976&r1=1622975&r2=1622976&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
Sun Sep 7 06:32:25 2014
@@ -19,11 +19,9 @@
package org.ofbiz.widget.screen;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.Writer;
import javax.servlet.ServletContext;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
@@ -31,7 +29,6 @@ import javax.xml.parsers.ParserConfigura
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.StringUtil;
-import org.ofbiz.base.util.UtilJ2eeCompat;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.webapp.view.AbstractViewHandler;
@@ -58,19 +55,8 @@ public class MacroScreenViewHandler exte
}
public void render(String name, String page, String info, String
contentType, String encoding, HttpServletRequest request, HttpServletResponse
response) throws ViewHandlerException {
- Writer writer = null;
try {
- // use UtilJ2eeCompat to get this setup properly
- boolean useOutputStreamNotWriter = false;
- if (this.servletContext != null) {
- useOutputStreamNotWriter =
UtilJ2eeCompat.useOutputStreamNotWriter(this.servletContext);
- }
- if (useOutputStreamNotWriter) {
- ServletOutputStream ros = response.getOutputStream();
- writer = new OutputStreamWriter(ros,
UtilProperties.getPropertyValue("widget", getName() + ".default.contenttype",
"UTF-8"));
- } else {
- writer = response.getWriter();
- }
+ Writer writer = response.getWriter();
// compress output if configured to do so
if (UtilValidate.isEmpty(encoding)) {
