mcardle 2005/12/02 11:47:06 CET
Modified files:
src/org/jahia/esi Utils.java
src/net/sf/j2ep/responsehandlers ResponseHandlerBase.java
Log:
* refactoring
Revision Changes Path
1.16 +2 -47
esi_server/src/net/sf/j2ep/responsehandlers/ResponseHandlerBase.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/net/sf/j2ep/responsehandlers/ResponseHandlerBase.java.diff?r1=1.15&r2=1.16&f=h
1.12 +49 -1 esi_server/src/org/jahia/esi/Utils.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/org/jahia/esi/Utils.java.diff?r1=1.11&r2=1.12&f=h
Index: Utils.java
===================================================================
RCS file: /home/cvs/repository/esi_server/src/org/jahia/esi/Utils.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Utils.java 30 Nov 2005 17:59:07 -0000 1.11
+++ Utils.java 2 Dec 2005 10:47:05 -0000 1.12
@@ -9,7 +9,11 @@
import org.jahia.esi.settings.GeneralSettings;
import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Enumeration;
+
+import net.sf.j2ep.responsehandlers.ResponseHandlerBase;
/**
* Created by IntelliJ IDEA.
@@ -331,7 +335,7 @@
page.append (" /____ >\\___ >__| \\_/ \\___
>__| \n");
page.append (" \\/ \\/ \\/
</pre>\n");
page.append ("\n");
- page.append("<fieldset style='border-width: 4px; border-color: red;
border: inset'> <font color=\"red\">\n" );
+ page.append("<fieldset style='border-width: 7px; border-color: red;
border: inset'> <font color=\"red\">\n" );
page.append("<h1>Error due to Response from Application Web
Server</h1>\n" );
page.append("<p>No Response from Application Web Server</p>\n" );
page.append("</font>\n" );
@@ -346,4 +350,48 @@
return page.toString();
}
+ public static void printRequestHeaders(HttpServletRequest clientRequest)
{
+ printRequestHeaders( clientRequest, null);
+ }
+
+ public static void printRequestHeaders(HttpServletRequest clientRequest,
String msg) {
+ StringBuffer buffer = new StringBuffer();
+ Enumeration headerNamesEnum = clientRequest.getHeaderNames();
+ while (headerNamesEnum.hasMoreElements()) {
+ String hName = (String) headerNamesEnum.nextElement();
+ Enumeration hValEnum = clientRequest.getHeaders(hName);
+ while (hValEnum.hasMoreElements()) {
+ String hVal = (String) hValEnum.nextElement();
+ buffer.append(hName +":"+ hVal+"\n");
+ }
+ }
+ if (log.isDebugEnabled()) log.debug("HTTP client REQUEST Headers :
"+((msg==null)?"":msg)+"\n" + buffer.toString());
+ }
+
+ public static void printRequestHeaders(HttpMethod method) {
+ printRequestHeaders(method, null);
+ }
+
+ public static void printRequestHeaders(HttpMethod method, String msg) {
+ Header[] headers = method.getRequestHeaders();
+ StringBuffer buffer = new StringBuffer();
+ for (int i=0; i<headers.length; i++){
+ buffer.append(headers[i]);
+ }
+ if (log.isDebugEnabled()) log.debug("HTTP Server REQUEST Headers :
"+((msg==null)?"":msg)+"\n" + buffer.toString());
+ }
+
+ public static void printResponseHeaders(HttpMethod method) {
+ printResponseHeaders( method, null);
+ }
+
+ public static void printResponseHeaders(HttpMethod method, String msg) {
+ Header[] headers = method.getResponseHeaders();
+ StringBuffer buffer = new StringBuffer();
+ for (int i=0; i<headers.length; i++){
+ buffer.append(headers[i]);
+ }
+ if (log.isDebugEnabled()) log.debug("HTTP Server
["+method.getStatusCode()+"] RESPONSE Headers "+((msg==null)?"":msg)+" : \n"
+ + buffer.toString());
+ }
}
Index: ResponseHandlerBase.java
===================================================================
RCS file:
/home/cvs/repository/esi_server/src/net/sf/j2ep/responsehandlers/ResponseHandlerBase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ResponseHandlerBase.java 24 Nov 2005 17:25:16 -0000 1.15
+++ ResponseHandlerBase.java 2 Dec 2005 10:47:05 -0000 1.16
@@ -331,8 +331,8 @@
ProxyFilter.getHttpClient().executeMethod(methodToServer);
- printRequestHeaders(methodToServer, " for POST");
- printResponseHeaders(methodToServer, " for POST");
+ Utils.printRequestHeaders(methodToServer, " for POST");
+ Utils.printResponseHeaders(methodToServer, " for POST");
if (methodToServer.getStatusCode() == 405) {
Header allow = methodToServer.getResponseHeader("allow");
@@ -647,50 +647,5 @@
return return304NotModified;
}
- public static void printRequestHeaders(HttpServletRequest clientRequest)
{
- printRequestHeaders( clientRequest, null);
- }
- public static void printRequestHeaders(HttpServletRequest clientRequest,
String msg) {
- StringBuffer buffer = new StringBuffer();
- Enumeration headerNamesEnum = clientRequest.getHeaderNames();
- while (headerNamesEnum.hasMoreElements()) {
- String hName = (String) headerNamesEnum.nextElement();
- Enumeration hValEnum = clientRequest.getHeaders(hName);
- while (hValEnum.hasMoreElements()) {
- String hVal = (String) hValEnum.nextElement();
- buffer.append(hName +":"+ hVal+"\n");
- }
- }
- if (log.isDebugEnabled()) log.debug("HTTP client REQUEST Headers :
"+((msg==null)?"":msg)+"\n" + buffer.toString());
- }
-
- public static void printRequestHeaders(HttpMethod method) {
- printRequestHeaders(method, null);
- }
- public static void printRequestHeaders(HttpMethod method, String msg) {
- Header[] headers = method.getRequestHeaders();
- StringBuffer buffer = new StringBuffer();
- for (int i=0; i<headers.length; i++){
- buffer.append(headers[i]);
- }
- if (log.isDebugEnabled()) log.debug("HTTP Server REQUEST Headers :
"+((msg==null)?"":msg)+"\n" + buffer.toString());
- }
-
- public static void printResponseHeaders(HttpMethod method) {
- printResponseHeaders( method, null);
- }
-
- public static void printResponseHeaders(HttpMethod method, String msg) {
- Header[] headers = method.getResponseHeaders();
- StringBuffer buffer = new StringBuffer();
- for (int i=0; i<headers.length; i++){
- buffer.append(headers[i]);
- }
- if (log.isDebugEnabled()) log.debug("HTTP Server
["+method.getStatusCode()+"] RESPONSE Headers "+((msg==null)?"":msg)+" : \n"
- + buffer.toString());
- }
-
-
-
} //end class
