You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2005/09/17 05:10:54 UTC
svn commit: r289691 - in /geronimo/trunk/modules: assembly/src/plan/
jetty/src/java/org/apache/geronimo/jetty/connector/
tomcat/src/java/org/apache/geronimo/tomcat/
Author: jboynes
Date: Fri Sep 16 20:10:49 2005
New Revision: 289691
URL: http://svn.apache.org/viewcvs?rev=289691&view=rev
Log:
specifically initialize the SSL algorithm to the JVM's default
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml?rev=289691&r1=289690&r2=289691&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml Fri Sep 16 20:10:49 2005
@@ -71,6 +71,7 @@
<attribute name="keystorePassword">secret</attribute>
<attribute name="keyPassword">secret</attribute>
<attribute name="clientAuthRequired">false</attribute>
+ <attribute name="algorithm">Default</attribute>
<attribute name="secureProtocol">TLS</attribute>
<attribute name="maxThreads">50</attribute>
<attribute name="minThreads">10</attribute>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml?rev=289691&r1=289690&r2=289691&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml Fri Sep 16 20:10:49 2005
@@ -155,6 +155,7 @@
<attribute name="acceptQueueSize">100</attribute>
<attribute name="uploadTimeoutEnabled">false</attribute>
<attribute name="clientAuthRequired">false</attribute>
+ <attribute name="algorithm">Default</attribute>
<attribute name="secureProtocol">TLS</attribute>
<attribute name="keystoreFileName">var/security/keystore</attribute>
<attribute name="keystorePassword">secret</attribute>
Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java?rev=289691&r1=289690&r2=289691&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java Fri Sep 16 20:10:49 2005
@@ -70,15 +70,14 @@
/**
* Algorithm to use.
- * As different JVMs have different implementations available, the default
- * algorithm can be used by supplying a null value.
+ * As different JVMs have different implementations available, the default algorithm can be used by supplying the value "Default".
*
- * @param algorithm the algorithm to use, or null to use the default from {@link javax.net.ssl.KeyManagerFactory#getDefaultAlgorithm()}
+ * @param algorithm the algorithm to use, or "Default" to use the default from {@link javax.net.ssl.KeyManagerFactory#getDefaultAlgorithm()}
*/
public void setAlgorithm(String algorithm) {
- // cache the value so the null
+ // cache the value so the null
this.algorithm = algorithm;
- if (algorithm == null) {
+ if ("default".equalsIgnoreCase(algorithm)) {
algorithm = KeyManagerFactory.getDefaultAlgorithm();
}
https.setAlgorithm(algorithm);
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java?rev=289691&r1=289690&r2=289691&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java Fri Sep 16 20:10:49 2005
@@ -1,6 +1,8 @@
package org.apache.geronimo.tomcat;
import java.util.Map;
+import javax.net.ssl.KeyManagerFactory;
+
import org.apache.geronimo.management.geronimo.SecureConnector;
import org.apache.geronimo.management.geronimo.WebManager;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -18,6 +20,7 @@
private final ServerInfo serverInfo;
private String keystoreFileName;
private String truststoreFileName;
+ private String algorithm;
public HttpsConnectorGBean(String name, String protocol, String host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception {
super(name, protocol, host, port, container);
@@ -127,7 +130,7 @@
* changed otherwise.
*/
public String getAlgorithm() {
- return (String)connector.getAttribute("algorithm");
+ return algorithm;
}
/**
@@ -136,6 +139,10 @@
* changed otherwise.
*/
public void setAlgorithm(String algorithm) {
+ this.algorithm = algorithm;
+ if ("default".equalsIgnoreCase(algorithm)) {
+ algorithm = KeyManagerFactory.getDefaultAlgorithm();
+ }
connector.setAttribute("algorithm", algorithm);
}