aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-03-14 06:23:28 (EDT)
committerThomas Becker2013-03-14 06:23:55 (EDT)
commit93efdcf080e3e42fdf8b419b7695210fc3891d3c (patch)
tree5c9a6d07e71c4e66dd3b7a332561cce9afae388f
parentcd47727ce491d6bb1984ac1f6934080abc608c90 (diff)
downloadorg.eclipse.jetty.project-93efdcf080e3e42fdf8b419b7695210fc3891d3c.zip
org.eclipse.jetty.project-93efdcf080e3e42fdf8b419b7695210fc3891d3c.tar.gz
org.eclipse.jetty.project-93efdcf080e3e42fdf8b419b7695210fc3891d3c.tar.bz2
384552 add comment to jetty-https.xml describing keymanager password
-rw-r--r--jetty-server/src/main/config/etc/jetty-https.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/jetty-server/src/main/config/etc/jetty-https.xml b/jetty-server/src/main/config/etc/jetty-https.xml
index d1e41eb..93c8fe1 100644
--- a/jetty-server/src/main/config/etc/jetty-https.xml
+++ b/jetty-server/src/main/config/etc/jetty-https.xml
@@ -17,6 +17,14 @@
<!-- Consult the javadoc of o.e.j.util.ssl.SslContextFactory -->
<!-- o.e.j.server.HttpConnectionFactory for all configuration -->
<!-- that may be set here. -->
+ <!-- -->
+ <!-- The keyManagerPassword is passed as the password arg to -->
+ <!-- KeyManagerFactory.init(...) -->
+ <!-- If there is no keymanagerpassword, then the -->
+ <!-- keystorepassword is used instead. -->
+ <!-- If there is no trustmanager set, then the keystore is used -->
+ <!-- as the trust store and the keystorepassword is used as the -->
+ <!-- truststore password. -->
<!-- =========================================================== -->
<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><Property name="jetty.home" default="." />/etc/keystore</Set>