From 1233ae108eb6f87546f753a28c52f0c5c7a012a7 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 30 Sep 2020 09:23:35 -0500 Subject: [PATCH] Fixing bad html links --- jetty-documentation/pom.xml | 2 +- .../configuring/security/jaas-support.adoc | 2 +- .../security/jetty-home-and-jetty-base.adoc | 26 ++++++++++--------- .../continuations/continuations-patterns.adoc | 3 ++- .../src/main/webapp/index.html | 4 +-- .../src/main/webapp/index.html | 6 ++--- .../src/main/webapp/index.html | 2 +- .../src/main/webapp/index.html | 2 +- 8 files changed, 25 insertions(+), 22 deletions(-) diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index 509a9401a78..53b7f512228 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -226,7 +226,7 @@ https://download.eclipse.org/jetty/stable-9/apidocs https://download.eclipse.org/jetty/stable-9/xref ${basedir}/../jetty.project/ - https://github.com/eclipse/jetty.project/master + https://github.com/eclipse/jetty.project/tree/jetty-9.4.x font diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc index 3d9cc8b9ec7..9e4c311dc92 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc @@ -411,4 +411,4 @@ public class FooLoginModule extends AbstractLoginModule An example webapp using JAAS can be found in the Jetty GitHub repository: -* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/master/tests/test-webapps/test-jaas-webapp] +* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-9.4.x/tests/test-webapps/test-jaas-webapp] diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc index 4f17253d3c6..96e7f9acb5e 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc @@ -65,18 +65,20 @@ Adding modules in this way will append the associated module properties to the ` .... [my-base]$ java -jar /home/user/jetty-distribution-{VERSION}/start.jar --add-to-start=http,https,deploy -ssl initialised in ${jetty.base}/start.ini (appended) -ssl enabled in ${jetty.base}/start.ini -DOWNLOAD: https://github.com/eclipse/jetty.project/raw/master/jetty-server/src/main/config/etc/keystore to etc/keystore -server initialised in ${jetty.base}/start.ini (appended) -server enabled in ${jetty.base}/start.ini -http initialised in ${jetty.base}/start.ini (appended) -http enabled in ${jetty.base}/start.ini -server enabled in ${jetty.base}/start.ini -deploy initialised in ${jetty.base}/start.ini (appended) -deploy enabled in ${jetty.base}/start.ini -MKDIR: ${jetty.base}/webapps -server enabled in ${jetty.base}/start.ini +INFO : webapp transitively enabled, ini template available with --add-to-start=webapp +INFO : server transitively enabled, ini template available with --add-to-start=server +INFO : security transitively enabled +INFO : servlet transitively enabled +INFO : http initialized in ${jetty.base}/start.ini +INFO : https initialized in ${jetty.base}/start.ini +INFO : threadpool transitively enabled, ini template available with --add-to-start=threadpool +INFO : ssl transitively enabled, ini template available with --add-to-start=ssl +INFO : bytebufferpool transitively enabled, ini template available with --add-to-start=bytebufferpool +INFO : deploy initialized in ${jetty.base}/start.ini +MKDIR : ${jetty.base}/etc +COPY : ${jetty.home}/modules/ssl/keystore to ${jetty.base}/etc/keystore +MKDIR : ${jetty.base}/webapps +INFO : Base directory was modified .... 3. Look at your directory. + diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc index 5911afdea64..22107b3651b 100644 --- a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc +++ b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc @@ -104,7 +104,8 @@ If many responses are to be sent (e.g., a chat room), then writing one response ==== Examples -* The https://github.com/eclipse/jetty.project/blob/jetty-8/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java[ChatServlet example] shows how the suspend/resume style can be used to directly code a chat room (See similar https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java[example] using Async Servlets). +* The https://github.com/eclipse/jetty.project/blob/jetty-9.4.x/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java[ChatServlet example] +shows how to make a chat room using Async Servlets. The same principles are applied to frameworks like http://cometd.org/[cometd] which provide an richer environment for such applications, based on Continuations. * The link:{JDURL}/org/eclipse/jetty/servlets/QoSFilter.html[QoSFilter] uses suspend/resume style to limit the number of requests simultaneously within the filter. diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html index 6c684ff1310..23ba3a117d8 100644 --- a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html @@ -24,7 +24,7 @@ $JETTY_BASE/start.ini file. The Jetty demo-base already has JAAS enabled in its start.ini file.

The full source of this demonstration is available here.

+href="https://github.com/eclipse/jetty.project/tree/jetty-9.4.x/tests/test-webapps/test-jaas-webapp">here.

Using the Demo

@@ -38,7 +38,7 @@ href="https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/te

-
+
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html index cf45bed5a94..14336ced0a9 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html @@ -58,11 +58,11 @@ It is configured as a jetty base directory in $JETTY_HOME/demo_base.

Useful links:

diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html index 7fb67941ef0..bd3526175af 100644 --- a/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html @@ -27,7 +27,7 @@ This example shows how to configure and lookup resources such as DataSources, a

This will create a $JETTY_BASE/start.d/jndi.ini file to enable and parameterise JNDI. If the --add-to-start option instead, then the same initialisation will be appended to the $JETTY_BASE/start.ini file instead. The jetty demo-base already has JNDI enabled in the start.ini file and some mock resources included.

-

The full source of this demonstration is available here.

+

The full source of this demonstration is available here.

Execution

diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html index 8a0e49603ca..950830f9f4d 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html @@ -21,7 +21,7 @@ This example tests some aspects of the servlet 3.1 specification:
  • servlet container initializers.
  • multi-part upload support.
-The source repository for this test is available here. +The source repository for this test is available here.

Test Servlet 2.5/3.0 Annotations, Fragments and Initializers