You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gr...@apache.org on 2006/07/13 20:32:58 UTC
svn commit: r421681 - in
/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector:
GeronimoSSLListener.java HTTPSConnector.java
Author: gregw
Date: Thu Jul 13 11:32:58 2006
New Revision: 421681
URL: http://svn.apache.org/viewvc?rev=421681&view=rev
Log:
renamed method
Modified:
geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java
geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java?rev=421681&r1=421680&r2=421681&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java Thu Jul 13 11:32:58 2006
@@ -38,7 +38,7 @@
protected SSLServerSocketFactory createFactory() throws Exception {
// we need the server factory version.
- return manager.createSSLServerFactory(null, getProtocol(), getAlgorithm(), keyStore, keyAlias, trustStore, SslSocketConnector.class.getClassLoader());
+ return manager.createSSLServerFactory(null, getProtocol(), getSslKeyManagerFactoryAlgorithm(), keyStore, keyAlias, trustStore, SslSocketConnector.class.getClassLoader());
}
public String getKeyStore() {
Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java?rev=421681&r1=421680&r2=421681&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java Thu Jul 13 11:32:58 2006
@@ -65,7 +65,7 @@
if ("default".equalsIgnoreCase(algorithm)) {
algorithm = KeyManagerFactory.getDefaultAlgorithm();
}
- https.setAlgorithm(algorithm);
+ https.setSslKeyManagerFactoryAlgorithm(algorithm);
}
public String getSecureProtocol() {