Fix r1645628:
- Remove merge markers
- Replace <> notation
- Replace try-with-resources


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1645926 13f79535-47bb-0310-9956-ffa450edef68
- Add lots of info the SnoopServlet output.
- Add SnoopResult class to parse SnoopServlet
  response body.
- Adjust TestRewriteValve to use the new
  SnoopServlet / SnoopResult

The more powerful SnoopServlet will be used in
forthcoming AJP protocol tests.

Backport of r1645358 from trunk resp. r1645903
from TC 8.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1645927 13f79535-47bb-0310-9956-ffa450edef68
Add new RequestDescriptor class which contains
parsed data returned from the SnoopServlet.

Adjust TestRewriteValve to use RequestDescriptor.

Backport of r1645486 from trunk resp. r1645904
and 1645909 from TC 8.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1645928 13f79535-47bb-0310-9956-ffa450edef68