jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref

10 files changed, 55 insertions, 324 deletions

diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml
index fbc577bb65..a3d8d1dc23 100644
--- a/aggregates/jetty-all/pom.xml
+++ b/aggregates/jetty-all/pom.xml
@@ -119,6 +119,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty.spdy</groupId>
+      <artifactId>spdy-http-server</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.servlet</artifactId>
       <scope>compile</scope>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 314cc8a113..32407a0471 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -110,7 +110,7 @@
                   <overWrite>true</overWrite>
                   <includes>**</includes>
                   <outputDirectory>${assembly-directory}/webapps</outputDirectory>
-                  <destFileName>javadoc-proxy.war</destFileName>
+                  <destFileName>xref-proxy.war</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty.example-async-rest</groupId>
@@ -181,6 +181,18 @@
             </configuration>
           </execution>
           <execution>
+            <id>copy-lib-spdy-deps</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.spdy</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib/spdy</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
             <id>copy-orbit-lib-annotations-deps</id>
             <phase>generate-resources</phase>
             <goals>
@@ -447,6 +459,13 @@
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all</artifactId>
+      <classifier>javadoc</classifier>
+      <type>jar</type>
+      <version>${project.version}</version>
+    </dependency>
     <!--
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-distribution/src/main/resources/webapps/ROOT/index.html b/jetty-distribution/src/main/resources/webapps/ROOT/index.html
index 4c92545937..69ebf0025c 100644
--- a/jetty-distribution/src/main/resources/webapps/ROOT/index.html
+++ b/jetty-distribution/src/main/resources/webapps/ROOT/index.html
@@ -29,7 +29,8 @@ The project is 100% <a href="http://en.wikipedia.org/wiki/Open_source">Open Sour
           <ul>
             <li><a href="/test/">Test Jetty Webapp</a></li>
             <li><a href="/async-rest/">Async Rest</a></li>
-            <li><a href="/javadoc/">Proxy to javadoc</a></li>
+            <li><a href="/javadoc/">Javadoc context</a></li>
+            <li><a href="/xref/">Proxy to xref</a></li>
 	    <li><a href="/oldContextPath/">Redirected Context</a></li>
           </ul>
       </td>
diff --git a/jetty-distribution/src/main/resources/webapps/javadoc.xml b/jetty-distribution/src/main/resources/webapps/javadoc.xml
new file mode 100644
index 0000000000..df854d27ac
--- /dev/null
+++ b/jetty-distribution/src/main/resources/webapps/javadoc.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
+
+<!--
+Configure a custom context for serving javadoc as static resources 
+-->
+
+<Configure class="org.eclipse.jetty.server.handler.ContextHandler">
+  <Set name="contextPath">/javadoc</Set>
+  <Set name="resourceBase"><SystemProperty name="jetty.home" default="."/>/javadoc/</Set>
+  <Set name="handler">
+    <New class="org.eclipse.jetty.server.handler.ResourceHandler">
+      <Set name="welcomeFiles">
+        <Array type="String">
+          <Item>index.html</Item>
+        </Array>
+      </Set>
+      <Set name="cacheControl">max-age=3600,public</Set>
+    </New>
+  </Set>
+</Configure>
+
diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
index bab3b9197c..2a620a5ec0 100644
--- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
+++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
@@ -892,6 +892,7 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable
         ByteBuffer buffer = null;
         synchronized (queue)
         {
+            LOG.info("Flush "+queue.size()+" -> "+this.lastStreamId);
             if (flushing || queue.isEmpty())
                 return;
             
diff --git a/pom.xml b/pom.xml
index 4e778abde0..badcf139cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,6 +412,7 @@
     <module>jetty-nosql</module>
     <module>examples</module>
     <module>tests</module>
+    <module>aggregates/jetty-all</module>
     <module>jetty-distribution</module>
 
     <!-- modules that need fixed and added back, or simply dropped and not maintained
diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
index b794a0ba7c..9db3b74b53 100644
--- a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
+++ b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
@@ -118,7 +118,7 @@ public class TestServer
         
         // Spdy Connector
         SPDYServerConnectionFactory.checkNPNAvailable();
-        PushStrategy push = null; /*new ReferrerPushStrategy();*/
+        PushStrategy push = new ReferrerPushStrategy();
         HTTPSPDYServerConnectionFactory spdy2 = new HTTPSPDYServerConnectionFactory(2,config,push);
         spdy2.setInputBufferSize(8192);
         spdy2.setInitialWindowSize(32768);
diff --git a/tests/test-webapps/test-proxy-webapp/jetty-chat.jmx b/tests/test-webapps/test-proxy-webapp/jetty-chat.jmx
deleted file mode 100644
index 088b7e0c48..0000000000
--- a/tests/test-webapps/test-proxy-webapp/jetty-chat.jmx
+++ /dev/null
@@ -1,318 +0,0 @@
-<jmeterTestPlan version="1.2" properties="1.8">
-  <hashTree>
-    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
-      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="TestPlan.user_define_classpath"></stringProp>
-      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <stringProp name="TestPlan.comments"></stringProp>
-    </TestPlan>
-    <hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
-        <longProp name="ThreadGroup.start_time">1165945030000</longProp>
-        <stringProp name="ThreadGroup.delay"></stringProp>
-        <stringProp name="ThreadGroup.duration"></stringProp>
-        <stringProp name="ThreadGroup.num_threads">400</stringProp>
-        <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-          <stringProp name="LoopController.loops">1</stringProp>
-          <boolProp name="LoopController.continue_forever">false</boolProp>
-        </elementProp>
-        <longProp name="ThreadGroup.end_time">1165945030000</longProp>
-        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">10</stringProp>
-      </ThreadGroup>
-      <hashTree>
-        <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="rooms" elementType="Argument">
-              <stringProp name="Argument.metadata">=</stringProp>
-              <stringProp name="Argument.value">50</stringProp>
-              <stringProp name="Argument.name">rooms</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Argument">
-              <stringProp name="Argument.metadata">=</stringProp>
-              <stringProp name="Argument.value"></stringProp>
-              <stringProp name="Argument.name"></stringProp>
-            </elementProp>
-          </collectionProp>
-        </Arguments>
-        <hashTree/>
-        <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
-          <stringProp name="HTTPSampler.path">/test/chat/</stringProp>
-          <stringProp name="HTTPSampler.domain">localhost</stringProp>
-          <stringProp name="HTTPSampler.protocol">http</stringProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
-          </elementProp>
-          <stringProp name="HTTPSampler.port">8080</stringProp>
-        </ConfigTestElement>
-        <hashTree/>
-        <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-          <boolProp name="CookieManager.clearEachIteration">true</boolProp>
-          <collectionProp name="CookieManager.cookies"/>
-        </CookieManager>
-        <hashTree/>
-        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="HTTP Poll 0" enabled="true">
-          <stringProp name="HTTPSampler.path"></stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <stringProp name="HTTPSampler.port"></stringProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">poll</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">ajax</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">poll</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">message</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">0</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">timeout</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">${__javaScript(${__threadNum}%${rooms},room)}</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">room</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.mimetype"></stringProp>
-          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-          <stringProp name="HTTPSampler.monitor">false</stringProp>
-          <stringProp name="HTTPSampler.domain"></stringProp>
-          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        </HTTPSampler>
-        <hashTree/>
-        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="HTTP Join" enabled="true">
-          <stringProp name="HTTPSampler.path"></stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <stringProp name="HTTPSampler.port"></stringProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">join</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">ajax</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">Elvis${__threadNum}</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">message</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">${__javaScript(${__threadNum}%${rooms},room)}</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">room</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.mimetype"></stringProp>
-          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-          <stringProp name="HTTPSampler.monitor">false</stringProp>
-          <stringProp name="HTTPSampler.domain"></stringProp>
-          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        </HTTPSampler>
-        <hashTree/>
-        <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-          <intProp name="LoopController.loops">-1</intProp>
-          <boolProp name="LoopController.continue_forever">true</boolProp>
-        </LoopController>
-        <hashTree>
-          <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-            <stringProp name="LoopController.loops">${__Random(3,20,random)}</stringProp>
-            <boolProp name="LoopController.continue_forever">true</boolProp>
-          </LoopController>
-          <hashTree>
-            <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="HTTP Poll n" enabled="true">
-              <stringProp name="HTTPSampler.path"></stringProp>
-              <stringProp name="HTTPSampler.method">GET</stringProp>
-              <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-              <stringProp name="HTTPSampler.protocol"></stringProp>
-              <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-              <stringProp name="HTTPSampler.port"></stringProp>
-              <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-                <collectionProp name="Arguments.arguments">
-                  <elementProp name="" elementType="HTTPArgument">
-                    <stringProp name="Argument.metadata">=</stringProp>
-                    <stringProp name="Argument.value">poll</stringProp>
-                    <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                    <stringProp name="Argument.name">ajax</stringProp>
-                    <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  </elementProp>
-                  <elementProp name="" elementType="HTTPArgument">
-                    <stringProp name="Argument.metadata">=</stringProp>
-                    <stringProp name="Argument.value">poll</stringProp>
-                    <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                    <stringProp name="Argument.name">message</stringProp>
-                    <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  </elementProp>
-                  <elementProp name="" elementType="HTTPArgument">
-                    <stringProp name="Argument.metadata">=</stringProp>
-                    <stringProp name="Argument.value">${__Random(3000,10000,poll)}</stringProp>
-                    <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                    <stringProp name="Argument.name">timeout</stringProp>
-                    <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  </elementProp>
-                  <elementProp name="" elementType="HTTPArgument">
-                    <stringProp name="Argument.metadata">=</stringProp>
-                    <stringProp name="Argument.value">${__javaScript(${__threadNum}%${rooms},room)}</stringProp>
-                    <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                    <stringProp name="Argument.name">room</stringProp>
-                    <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  </elementProp>
-                </collectionProp>
-              </elementProp>
-              <stringProp name="HTTPSampler.mimetype"></stringProp>
-              <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-              <stringProp name="HTTPSampler.monitor">false</stringProp>
-              <stringProp name="HTTPSampler.domain"></stringProp>
-              <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
-              <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            </HTTPSampler>
-            <hashTree/>
-          </hashTree>
-          <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="HTTP chat" enabled="true">
-            <stringProp name="HTTPSampler.path"></stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <stringProp name="HTTPSampler.protocol"></stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-            <stringProp name="HTTPSampler.port"></stringProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-              <collectionProp name="Arguments.arguments">
-                <elementProp name="" elementType="HTTPArgument">
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <stringProp name="Argument.value">chat</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">ajax</stringProp>
-                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                </elementProp>
-                <elementProp name="" elementType="HTTPArgument">
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <stringProp name="Argument.value">Give me ${__Random(1,200,mars)} deep fried mars bars</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">message</stringProp>
-                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                </elementProp>
-                <elementProp name="" elementType="HTTPArgument">
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <stringProp name="Argument.value">${__javaScript(${__threadNum}%${rooms},room)}</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">room</stringProp>
-                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                </elementProp>
-              </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.mimetype"></stringProp>
-            <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-            <stringProp name="HTTPSampler.monitor">false</stringProp>
-            <stringProp name="HTTPSampler.domain"></stringProp>
-            <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          </HTTPSampler>
-          <hashTree/>
-        </hashTree>
-        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="HTTP Leave" enabled="true">
-          <stringProp name="HTTPSampler.path"></stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <stringProp name="HTTPSampler.protocol"></stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <stringProp name="HTTPSampler.port"></stringProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">leave</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">ajax</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">Elvis${__threadNum}</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">message</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-              <elementProp name="" elementType="HTTPArgument">
-                <stringProp name="Argument.metadata">=</stringProp>
-                <stringProp name="Argument.value">${__javaScript(${__threadNum}%${rooms},room)}</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">room</stringProp>
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.mimetype"></stringProp>
-          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-          <stringProp name="HTTPSampler.monitor">false</stringProp>
-          <stringProp name="HTTPSampler.domain"></stringProp>
-          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        </HTTPSampler>
-        <hashTree/>
-      </hashTree>
-      <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
-        <objProp>
-          <value class="SampleSaveConfiguration">
-            <time>true</time>
-            <latency>true</latency>
-            <timestamp>true</timestamp>
-            <success>true</success>
-            <label>true</label>
-            <code>true</code>
-            <message>true</message>
-            <threadName>true</threadName>
-            <dataType>true</dataType>
-            <encoding>false</encoding>
-            <assertions>true</assertions>
-            <subresults>true</subresults>
-            <responseData>false</responseData>
-            <samplerData>false</samplerData>
-            <xml>false</xml>
-            <fieldNames>false</fieldNames>
-            <responseHeaders>false</responseHeaders>
-            <requestHeaders>false</requestHeaders>
-            <responseDataOnError>false</responseDataOnError>
-            <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
-            <assertionsResultsToSave>0</assertionsResultsToSave>
-          </value>
-          <name>saveConfig</name>
-        </objProp>
-        <stringProp name="filename"></stringProp>
-        <boolProp name="ResultCollector.error_logging">false</boolProp>
-      </ResultCollector>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-</jmeterTestPlan>
diff --git a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index e4b4f3cadf..f4c22281ed 100644
--- a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="contextPath">/javadoc</Set>
+  <Set name="contextPath">/xref</Set>
 </Configure>
diff --git a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml
index 410591f567..018a5b734f 100644
--- a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -7,13 +7,12 @@
    version="3.0"> 
 
   <display-name>Transparent Proxy WebApp</display-name>
-  
  
   <servlet>
     <servlet-name>TransparentProxy</servlet-name>
     <servlet-class>org.eclipse.jetty.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
-      <param-name>proxyTo</param-name><param-value>http://download.eclipse.org/jetty/stable-9/apidocs</param-value>
+      <param-name>proxyTo</param-name><param-value>http://download.eclipse.org/jetty/stable-9/xref</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name><param-value>download.eclipse.org</param-value>