Author: markt
Date: Fri May 1 18:31:01 2015
New Revision: 1677204
URL: http://svn.apache.org/r1677204
Log:
Rename keystoreFile ->certificateKeystoreFile
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1677204&r1=1677203&r2=1677204&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri
May 1 18:31:01 2015
@@ -371,7 +371,7 @@ public abstract class AbstractHttp11Prot
public void setKeystoreFile(String keystoreFile) {
registerDefaultSSLHostConfig();
- defaultSSLHostConfig.setKeystoreFile(keystoreFile);
+ defaultSSLHostConfig.setCertificateKeystoreFile(keystoreFile);
}
public void setSSLCertificateFile(String certificateFile) {
registerDefaultSSLHostConfig();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1677204&r1=1677203&r2=1677204&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Fri May 1
18:31:01 2015
@@ -52,8 +52,8 @@ public class SSLHostConfig {
private Set<String> protocols = new HashSet<>();
// JSSE
+ private String certificateKeystoreFile =
System.getProperty("user.home")+"/.keystore";
private String keyManagerAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
- private String keystoreFile = System.getProperty("user.home")+"/.keystore";
// OpenSSL
private String certificateFile;
private String certificateKeyFile;
@@ -218,14 +218,14 @@ public class SSLHostConfig {
}
- public void setKeystoreFile(String keystoreFile) {
- setProperty("keystoreFile", Type.JSSE);
- this.keystoreFile = keystoreFile;
+ public void setCertificateKeystoreFile(String certificateKeystoreFile) {
+ setProperty("certificateKeystoreFile", Type.JSSE);
+ this.certificateKeystoreFile = certificateKeystoreFile;
}
- public String getKeystoreFile() {
- return keystoreFile;
+ public String getCertificateKeystoreFile() {
+ return certificateKeystoreFile;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1677204&r1=1677203&r2=1677204&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Fri May 1 18:31:01 2015
@@ -205,7 +205,7 @@ public class JSSESocketFactory implement
protected KeyStore getKeystore(String type, String provider, String pass)
throws IOException {
- String keystoreFile = sslHostConfig.getKeystoreFile();
+ String keystoreFile = sslHostConfig.getCertificateKeystoreFile();
if (keystoreFile == null)
keystoreFile = defaultKeystoreFile;
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1677204&r1=1677203&r2=1677204&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Fri May 1 18:31:01 2015
@@ -1076,6 +1076,15 @@
RECOMMENDED).</p>
</attribute>
+ <attribute name="certificateKeystoreFile" required="false">
+ <p>JSSE only.</p>
+ <p>The pathname of the keystore file where you have stored the server
+ certificate and key to be loaded. By default, the pathname is the file
+ <code>.keystore</code> in the operating system home directory of the user
+ that is running Tomcat. If your <code>keystoreType</code> doesn't need a
+ file use <code>""</code> (empty string) for this parameter.</p>
+ </attribute>
+
<attribute name="certificateVerification" required="false">
<p>Set to <code>required</code> if you want the SSL stack to require a
valid certificate chain from the client before accepting a connection.
@@ -1134,15 +1143,6 @@
documentation for the default value.</p>
</attribute>
- <attribute name="keystoreFile" required="false">
- <p>JSSE only.</p>
- <p>The pathname of the keystore file where you have stored the server
- certificate and key to be loaded. By default, the pathname is the file
- <code>.keystore</code> in the operating system home directory of the user
- that is running Tomcat. If your <code>keystoreType</code> doesn't need a
- file use <code>""</code> (empty string) for this parameter.</p>
- </attribute>
-
<attribute name="protocols" required="false">
<p>The names of the protocols to support when communicating with clients.
This should be a comma separated list of any combination of the
following:
@@ -1211,8 +1211,8 @@
</attribute>
<attribute name="keystoreFile" required="false">
- <p>This is an alias for the <code>keystoreFile</code> attribute of the
- default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
+ <p>This is an alias for the <code>certificateKeystoreFile</code>
attribute
+ of the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
element.</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
