From fce8ec33fc0bc03f25d85bdb30651ae9ac7e1c40 Mon Sep 17 00:00:00 2001
From: WalkerWatch
Date: Wed, 5 Apr 2017 16:16:46 -0400
Subject: [PATCH] Resolves #1453
Signed-off-by: WalkerWatch
---
.../main/asciidoc/configuring/security/jaas-support.adoc | 8 ++++----
.../test-jaas-webapp/src/main/webapp/index.html | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
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 55fa0399098..1d2dd0b6e1e 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc
@@ -226,10 +226,10 @@ As `LoginModules` are free to use their own implementation of the JAAS Principal
===== Sample LoginModules
-* link:{JXURL}/org/eclipse/jetty/jaas/spi/JDBCLoginModule.html[`org.eclipse.jetty.jaas.spi.JDBCLoginModule`]
-* link:{JXURL}/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.html[`org.eclipse.jetty.jaas.spi.PropertyFileLoginModule`]
-* link:{JXURL}/org/eclipse/jetty/jaas/spi/DataSourceLoginModule.html[`org.eclipse.jetty.jaas.spi.DataSourceLoginModule`]
-* link:{JXURL}/org/eclipse/jetty/jaas/spi/LdapLoginModule.html[`org.eclipse.jetty.jaas.ldap.LdapLoginModule`]
+* link:{JDURL}/org/eclipse/jetty/jaas/spi/JDBCLoginModule.html[`org.eclipse.jetty.jaas.spi.JDBCLoginModule`]
+* link:{JDURL}/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.html[`org.eclipse.jetty.jaas.spi.PropertyFileLoginModule`]
+* link:{JDURL}/org/eclipse/jetty/jaas/spi/DataSourceLoginModule.html[`org.eclipse.jetty.jaas.spi.DataSourceLoginModule`]
+* link:{JDURL}/org/eclipse/jetty/jaas/spi/LdapLoginModule.html[`org.eclipse.jetty.jaas.ldap.LdapLoginModule`]
____
[NOTE]
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 aa4df43c17a..148e11d8601 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
@@ -17,11 +17,11 @@
To enable JAAS in a base jetty instance do:
$ cd $JETTY_BASE
- $ java -jar $JETTY_HOME/start.jar --add-to-startd=jaas
+ $ java -jar $JETTY_HOME/start.jar --add-to-start=jaas
- This will create a $JETTY_BASE/start.d/jaas.ini file to enable and parameterise JAAS. 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 JAAS enabled in the start.ini file.
+ This will create a $JETTY_BASE/start.d/jaas.ini file to enable and parameterize JAAS. If no start.d directory exists, then the same initialisation will be appended to the
+ $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.