You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/20 10:35:16 UTC
svn commit: r1291162 - in
/openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd:
HttpRequestImpl.java HttpResponseImpl.java OpenEJBHttpServer.java
Author: rmannibucau
Date: Mon Feb 20 09:35:16 2012
New Revision: 1291162
URL: http://svn.apache.org/viewvc?rev=1291162&view=rev
Log:
updating openejb http to use logger instead of sysout
Modified:
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
Modified: openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java?rev=1291162&r1=1291161&r2=1291162&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java (original)
+++ openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java Mon Feb 20 09:35:16 2012
@@ -16,20 +16,41 @@
*/
package org.apache.openejb.server.httpd;
-import javax.servlet.*;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-
import org.apache.openejb.core.security.jaas.UserPrincipal;
import org.apache.openejb.util.ArrayEnumeration;
+import org.apache.openejb.util.Logger;
-import java.io.*;
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
/**
* A class to take care of HTTP Requests. It parses headers, content, form and url
@@ -295,22 +316,25 @@ public class HttpRequestImpl implements
parameters.putAll(this.getQueryParameters());
}
- public void print(boolean formatXml) {
+ public void print(final Logger log, boolean formatXml) {
+ if (log.isDebugEnabled()) {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("******************* REQUEST ******************\n");
+ builder.append(method + " " + uri).append("\n");
+ for (Map.Entry<String, String> entry : headers.entrySet()) {
+ builder.append(entry).append("\n");
+ }
+ builder.append("\n");
- System.out.println("******************* REQUEST ******************");
- System.out.println(method + " "+this.uri);
- for (Map.Entry<String, String> entry : headers.entrySet()) {
- System.out.println(entry);
- }
- System.out.println();
-
- final String text = new String(body);
- if (formatXml && OpenEJBHttpServer.isTextXml(headers)) {
- System.out.println(OpenEJBHttpServer.reformat(text));
- } else {
- System.out.println(text);
+ final String text = new String(body);
+ if (formatXml && OpenEJBHttpServer.isTextXml(headers)) {
+ builder.append(OpenEJBHttpServer.reformat(text)).append("\n");
+ } else {
+ builder.append(text).append("\n");
+ }
+ builder.append("**********************************************").append("\n");
+ log.debug(builder.toString());
}
- System.out.println("**********************************************");
}
/**
Modified: openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java?rev=1291162&r1=1291161&r2=1291162&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java (original)
+++ openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java Mon Feb 20 09:35:16 2012
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.server.httpd;
-import org.apache.openejb.loader.IO;
-
import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
Modified: openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java?rev=1291162&r1=1291161&r2=1291162&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java (original)
+++ openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java Mon Feb 20 09:35:16 2012
@@ -165,7 +165,7 @@ public class OpenEJBHttpServer implement
try {
response.writeMessage(out, false);
if (print.size() > 0 && print.contains(Output.RESPONSE)) {
- response.writeMessage(System.out, indent);
+ response.writeMessage(new LoggerOutputStream(log, "debug"), indent);
}
} catch (Throwable t2) {
log.error("Could not write response", t2);
@@ -182,7 +182,7 @@ public class OpenEJBHttpServer implement
req.readMessage(in);
if (print.size() > 0 && print.contains(Output.REQUEST)) {
- req.print(this.indent);
+ req.print(log, indent);
}
res.setRequest(req);
@@ -246,5 +246,23 @@ public class OpenEJBHttpServer implement
}
}
+ private static class LoggerOutputStream extends OutputStream {
+ private final Logger logger;
+ private final String level;
+
+ public LoggerOutputStream(final Logger log, final String lvl) {
+ logger = log;
+ level = lvl;
+ }
+
+ @Override
+ public void write(int b) throws IOException {
+ logger.log(level, Character.toString((char) b));
+ }
+ @Override // shortcut for String - because we know what we have ;)
+ public void write(byte b[]) throws IOException {
+ logger.log(level, new String(b));
+ }
+ }
}