Fix distribution test

Signed-off-by: Olivier Lamy <olamy@apache.org>
jetty · Aug 20, 2024 · 8c99fa8 · 8c99fa8
1 parent e900e42
commit 8c99fa8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -13,19 +13,19 @@
     <servlet-class>org.eclipse.jetty.ee10.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
       <param-name>proxyTo</param-name>
-      <param-value>https://javadoc.jetty.org/jetty-12/index.html</param-value>
+      <param-value>https://javadoc.jetty.org/</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name>
-      <param-value>www.eclipse.org</param-value>
+      <param-value>javadoc.jetty.org</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
     <async-supported>true</async-supported>
   </servlet>
 
   <servlet-mapping>
     <servlet-name>JavadocTransparentProxy</servlet-name>
-    <url-pattern>/current/*</url-pattern>
+    <url-pattern>/jetty-12/*</url-pattern>
   </servlet-mapping>
 
 </web-app>
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -13,19 +13,19 @@
     <servlet-class>org.eclipse.jetty.ee9.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
       <param-name>proxyTo</param-name>
-      <param-value>https://javadoc.jetty.org/jetty-12/index.html</param-value>
+      <param-value>https://javadoc.jetty.org/</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name>
-      <param-value>www.eclipse.org</param-value>
+      <param-value>javadoc.jetty.org</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
     <async-supported>true</async-supported>
   </servlet>
 
   <servlet-mapping>
     <servlet-name>JavadocTransparentProxy</servlet-name>
-    <url-pattern>/current/*</url-pattern>
+    <url-pattern>/jetty-12/*</url-pattern>
   </servlet-mapping>
 
 </web-app>
diff --git a/...ribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/...ribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
@@ -602,7 +602,7 @@ public void testWebAppWithProxyAndJPMS(String env) throws Exception
                 assertTrue(run2.awaitConsoleLogsFor("Started oejs.Server@", START_TIMEOUT, TimeUnit.SECONDS));
 
                 startHttpClient(() -> new HttpClient(new HttpClientTransportOverHTTP(1)));
-                ContentResponse response = client.GET("http://localhost:" + port + "/proxy/current/");
+                ContentResponse response = client.GET("http://localhost:" + port + "/proxy/jetty-12/index.html");
                 assertEquals(HttpStatus.OK_200, response.getStatus(), () ->
                 {
                     StringBuilder rawResponse = new StringBuilder();