mcardle 2005/11/03 11:31:51 CET
Modified files:
src/net/sf/j2ep ProxyFilter.java
Log:
* code cleanup
Revision Changes Path
1.7 +1 -90 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.6&r2=1.7&f=h
Index: ProxyFilter.java
===================================================================
RCS file: /home/cvs/repository/esi_server/src/net/sf/j2ep/ProxyFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProxyFilter.java 2 Nov 2005 15:44:53 -0000 1.6
+++ ProxyFilter.java 3 Nov 2005 10:31:51 -0000 1.7
@@ -85,83 +85,7 @@
return httpClient;
}
-
- StringBuffer xmlInvReqMsg = new StringBuffer(
-"<?xml version=\"1.0\"?> \n" +
-"<!DOCTYPE INVALIDATION SYSTEM
\"file:///C://EsiServerTomcat2/WCSinvalidation.dtd\"> \n" +
-//"<!DOCTYPE INVALIDATION SYSTEM \"internal:///WCSinvalidation.dtd\"> "+
-"<INVALIDATION VERSION=\"WCS-1.1\"> \n" +
-" <SYSTEM> \n" +
-" <SYSTEMINFO NAME=\"name\" VALUE=\"value\"/> \n" +
-" </SYSTEM> \n" +
-" <OBJECT> \n" +
-" <ADVANCEDSELECTOR URIPREFIX=\"prefix\" \n" +
-" URIEXP=\"URL_expression\" \n" +
-" HOST=\"host_name:port\" \n" +
-" METHOD=\"HTTP_request_method\" \n" +
-" BODYEXP=\"HTTP_body\"> \n" +
-" <COOKIE NAME=\"cookie_name\" VALUE=\"value\"/> \n" +
-" <HEADER NAME=\"HTTP_request_header\" VALUE=\"value\"/>
\n" +
-" <OTHER NAME=\"URI|BODY|QUERYSTRING_PARAMETER|SEARCHKEY\"
\n" +
-" TYPE=\"SUBSTRING|REGEX\" \n" +
-" VALUE=\"value\"/> \n" +
-" </ADVANCEDSELECTOR> \n" +
-" <ACTION REMOVALTTL=\"TTL\"/> \n" +
-" <INFO VALUE=\"value\"/> \n" +
-" </OBJECT> \n" +
-"</INVALIDATION> " );
-
-StringBuffer xmlInvReqMsg2 = new StringBuffer(
-"<?xml version=\"1.0\"?> \n" +
-"<!DOCTYPE INVALIDATION SYSTEM \"WCSinvalidation.dtd\"> \n" +
-"<INVALIDATION VERSION=\"WCS-1.1\"> \n" +
-"<OBJECT> \n" +
-"<ADVANCEDSELECTOR URIPREFIX=\"cacacaca\" URIEXP=\"pipipipi\"/> \n" +
-"<ACTION REMOVALTTL=\"0\"/> \n" +
-"</OBJECT> \n" +
-"</INVALIDATION> " );
-
- StringBuffer xmlInvReqMsg3 = new StringBuffer(
-"<?xml version=\"1.0\"?> \n" +
-"<!DOCTYPE INVALIDATION SYSTEM \"WCSinvalidation.dtd\"> \n" +
-"<INVALIDATION VERSION=\"WCS-1.1\"> \n" +
-"<OBJECT> \n" +
-"<ADVANCEDSELECTOR URIPREFIX=\"cacacaca\"
URIEXP=\"/pid/1\\?__esi_fragment=1\"/> \n" +
-"<ACTION REMOVALTTL=\"20\"/> \n" +
-"</OBJECT> \n" +
- "<OBJECT> \n" +
- "<ADVANCEDSELECTOR URIPREFIX=\"22222\" URIEXP=\"333333\"/> \n" +
- "<ACTION REMOVALTTL=\"10\"/> \n" +
- "</OBJECT> \n" +
- "</INVALIDATION> " );
-
- StringBuffer xmlInvReqMsg4 = new StringBuffer(
-"<?xml version=\"1.0\"?> \n" +
-"<!DOCTYPE INVALIDATION SYSTEM \"WCSinvalidation.dtd\"> \n" +
-"<INVALIDATION VERSION=\"WCS-1.1\"> \n" +
-"<OBJECT> \n" +
-"<ADVANCEDSELECTOR uriPrefix=\"cacacaca\" uriExp=\"pipipipi\"> \n" +
-" <COOKIE NAME=\"cookie_name\" VALUE=\"value\"/> \n" +
-" <HEADER NAME=\"HTTP_request_header\" VALUE=\"value\"/>
\n" +
-" </ADVANCEDSELECTOR> \n" +
-"<ACTION REMOVALTTL=\"0\"/> \n" +
-"</OBJECT> \n" +
-"</INVALIDATION> " );
-
- StringBuffer xmlInvReqMsg5 = new StringBuffer(
-"<?xml version=\"1.0\"?> \n" +
-"<!DOCTYPE INVALIDATION SYSTEM \"connard\"> \n" +
-"<INVALIDATION VERSION=\"WCS-1.1\"> \n" +
-"<OBJECT> \n" +
-"<ADVANCEDSELECTOR uriPrefix=\"cacacaca\" uriExp=\"pipipipi\"> \n" +
-" <COOKIE NAME=\"cookie_name\" VALUE=\"value\"/> \n" +
-" <HEADER NAME=\"HTTP_request_header\" VALUE=\"value\"/>
\n" +
-" </ADVANCEDSELECTOR> \n" +
-"<ACTION REMOVALTTL=\"0\"/> \n" +
-"</OBJECT> \n" +
-"</INVALIDATION> " );
-
- /**
+ /**
* Implementation of a reverse-proxy. All request go through here. This
is
* the main class where are handling starts.
*
@@ -172,19 +96,6 @@
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain filterChain) throws IOException,
ServletException, MalformedURLException {
-
- /*log.debug(xmlInvReqMsg);
- Invalidator.parseInvalidationMsg(xmlInvReqMsg);
- log.debug(xmlInvReqMsg2);
- Invalidator.parseInvalidationMsg(xmlInvReqMsg2);
- log.debug(xmlInvReqMsg3);
- Invalidator.parseInvalidationMsg(xmlInvReqMsg3);
- log.debug(xmlInvReqMsg4);
- Invalidator.parseInvalidationMsg(xmlInvReqMsg4);
- log.debug(xmlInvReqMsg5);
- Invalidator.parseInvalidationMsg(xmlInvReqMsg5); */
-
-
HttpServletResponse clientHttpResponse = (HttpServletResponse)
response;
HttpServletRequest clientHttpRequest = (HttpServletRequest) request;
