mcardle 2005/11/18 17:22:46 CET
Modified files:
src/net/sf/j2ep ProxyFilter.java
Added files:
src/net/sf/j2ep DebugHttpServletResponseWrapper.java
Log:
* added response wrapper support
Revision Changes Path
1.1 +81 -0
esi_server/src/net/sf/j2ep/DebugHttpServletResponseWrapper.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/net/sf/j2ep/DebugHttpServletResponseWrapper.java?rev=1.1&content-type=text/plain
1.9 +8 -13 esi_server/src/net/sf/j2ep/ProxyFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/net/sf/j2ep/ProxyFilter.java.diff?r1=1.8&r2=1.9&f=h
Index: DebugHttpServletResponseWrapper.java
====================================================================
package net.sf.j2ep;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.Locale;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
/**
* Created by IntelliJ IDEA.
* User: jahia
* Date: 11-Oct-2005
* Time: 14:00:21
* To change this template use File | Settings | File Templates.
*/
public class DebugHttpServletResponseWrapper extends
HttpServletResponseWrapper {
private static org.apache.log4j.Logger log =
org.apache.log4j.Logger.getLogger
(DebugHttpServletResponseWrapper.class);
String requestUrl;
public DebugHttpServletResponseWrapper(HttpServletResponse response,
String requestUrl) {
super(response);
this.requestUrl = requestUrl;
}
/**
* Set a header field
*
* @param name The header name
* @param value The header value
*/
public void setHeader(String name, String value) {
if (log.isDebugEnabled()) {
log.debug("header: " + name + ": " + value + "\t\t---- for
reqURL: "+requestUrl);
}
super.setHeader(name, value);
}
/**
* Add a header field
*
* @param name The header name
* @param value The header value
*/
public void addHeader(String name, String value) {
if (log.isDebugEnabled()) {
log.debug("header: " + name + ": " + value+ "---- for reqURL:
"+requestUrl);
}
super.addHeader(name, value);
}
/**
* Set the int value of the header
*
* @param name The header name
* @param value The int value
*/
public void setIntHeader(String name, int value) {
if (log.isDebugEnabled()) {
log.debug("intheader: " + name + ": " + value+ "---- for reqURL:
"+requestUrl);
}
super.setIntHeader(name, value);
}
public void sendRedirect(String location) throws IOException {
if (log.isDebugEnabled()) {
log.debug("redirect location : " + location+ "---- for reqURL:
"+requestUrl);
}
super.sendRedirect(location);
}
}
Index: ProxyFilter.java
===================================================================
RCS file: /home/cvs/repository/esi_server/src/net/sf/j2ep/ProxyFilter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProxyFilter.java 4 Nov 2005 16:54:17 -0000 1.8
+++ ProxyFilter.java 18 Nov 2005 16:22:46 -0000 1.9
@@ -76,11 +76,6 @@
*/
private static HttpClient httpClient;
- /**
- * The Invalidation Server
- */
- private static XmlServer invalidationServer;
-
public static HttpClient getHttpClient() {
return httpClient;
}
@@ -96,11 +91,12 @@
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain filterChain) throws IOException,
ServletException, MalformedURLException {
- HttpServletResponse clientHttpResponse = (HttpServletResponse)
response;
- HttpServletRequest clientHttpRequest = (HttpServletRequest) request;
+ HttpServletRequest clientHttpRequest = (HttpServletRequest) request;
+ URL origRequestUrl = getURL(clientHttpRequest);//TODO: remove this or
something since we call this twice
+ log.info("\n**** " + clientHttpRequest.getMethod() + " " +
origRequestUrl + " *****" );
- URL origRequestUrl = getURL(clientHttpRequest);//TODO: remove this
or something since we call this twice
- log.info("\n**** " + clientHttpRequest.getMethod() + " " +
origRequestUrl + " *****" );
+ HttpServletResponse clientHttpResponse = (HttpServletResponse)
response;
+ //DebugHttpServletResponseWrapper clientHttpResponse = new
DebugHttpServletResponseWrapper((HttpServletResponse) response,
((HttpServletRequest)request).getMethod()+" on " + origRequestUrl );
Server server = (Server)
clientHttpRequest.getAttribute("proxyServer");
if (server == null) {
@@ -109,10 +105,11 @@
if (server == null) {
filterChain.doFilter(request, response);
- } else {
+ }
+ else {
String uri = server.getRule().process(getURI(clientHttpRequest));
String newUrl = request.getScheme() + "://" +
server.getDomainName() + server.getPath() + uri;
- log.debug("Connecting to " + newUrl);
+ //log.debug("Client Request for :" + newUrl);
ResponseHandler responseHandler = null;
@@ -287,7 +284,5 @@
log = null;
httpClient = null;
serverChain = null;
- invalidationServer.stopServer();
-
}
}
\ No newline at end of file
