From 298a623fe98a1cd800cc0dcadc64071c8ecef0f1 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 16 Sep 2011 11:05:07 -0700 Subject: [PATCH] 357959 - Include javadoc in distribution + Adjusting /javadoc/ proxy configuration in test-jetty-webapp to now be /javadoc-proxy/, along with providing a link to the distribution's /javadoc/ path as well. --- test-jetty-webapp/src/main/webapp/WEB-INF/web.xml | 4 ++-- test-jetty-webapp/src/main/webapp/index.html | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml index eee0a8801b3..b71cb0fdc8b 100644 --- a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml +++ b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml @@ -235,7 +235,7 @@ TransparentProxy org.eclipse.jetty.servlets.ProxyServlet$Transparent - Prefix/javadoc + Prefix/javadoc-proxy ProxyTohttp://download.eclipse.org/jetty/stable-7/apidocs @@ -247,7 +247,7 @@ TransparentProxy - /javadoc/* + /javadoc-proxy/* diff --git a/test-jetty-webapp/src/main/webapp/index.html b/test-jetty-webapp/src/main/webapp/index.html index 28f1b26eeb7..74ef907a75a 100644 --- a/test-jetty-webapp/src/main/webapp/index.html +++ b/test-jetty-webapp/src/main/webapp/index.html @@ -3,6 +3,11 @@ Powered By Jetty + @@ -11,8 +16,8 @@ This is the Test webapp for the Jetty 7 HTTP Server and Servlet Container. For more information about Jetty, please visit our website -or wiki. -Commercial support for Jetty is available via webtide. +or wiki or see the bundled javadoc.
+Commercial support for Jetty is available via Webtide and Intalio.

This is a test context that serves: @@ -29,7 +34,7 @@ This is a test context that serves:

  • Dispatcher Servlet
  • Request Rewrite Servlet
  • JSP examples
    • -
  • Transparent Proxy (to javadoc @ eclipse.org)
    • +
  • Transparent Proxy (to javadoc @ eclipse.org)
  • Comet Chat: Long Polling, WebSocket
  • Authentication