JETTY-1125

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@994 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -13,6 +13,7 @@ jetty-7.0.1-SNAPSHOT
  + JETTY-1114 unsynchronised WebAppClassloader.getResource(String)
  + JETTY-1121 Merge Multipart query parameters 
  + JETTY-1122 Handle multi-byte utf that causes buffer overflow
+ + JETTY-1125 TransparentProxy incorrectly configured for test webapp
  + JETTY-1129 Filter control characters out of StdErrLog
  + Continuations ISE rather than ignore bad transitions
  + Fixed XSS issue in CookieDump demo servlet.

test-jetty-webapp/src/main/webapp/WEB-INF/web.xml

@@ -205,17 +205,17 @@
     <servlet-name>TransparentProxy</servlet-name>
     <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class>
     <init-param>
-      <param-name>Prefix</param-name><param-value>/jetty</param-value>
+      <param-name>Prefix</param-name><param-value>/google</param-value>
     </init-param>
     <init-param>
-      <param-name>ProxyTo</param-name><param-value>http://jetty.mortbay.org/test</param-value>
+      <param-name>ProxyTo</param-name><param-value>http://www.google.com</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>
   
   <servlet-mapping>
     <servlet-name>TransparentProxy</servlet-name>
-    <url-pattern>/jetty/*</url-pattern>
+    <url-pattern>/google/*</url-pattern>
   </servlet-mapping>
   
   <error-page>

test-jetty-webapp/src/main/webapp/index.html

@@ -30,7 +30,7 @@ This is a test context that serves:
 <li>a <a href="cookie/">Cookie Dump Servlet</a></li>
 <li>a <a href="dispatch">Dispatcher Servlet</a></li>
 <li>a <a href="rewrite/">Request Rewrite Servlet</a></li>
-<li>a <a href="jetty/">Transparent Proxy</a> (to jetty.mortbay.org)</li>
+<li>a <a href="google/">Transparent Proxy</a> (to www.google.com)</li>
 <li>a <a href="cgi-bin/hello.sh">CGI script</a> (unix only)</li>
 <li>a <a href="auth.html">Authentication</a></li>
 </ul>