You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2008/06/11 22:04:10 UTC

svn commit: r666817 - in /geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector: Http11APRConnectorGBean.java Http11APRProtocol.java

Author: linsun
Date: Wed Jun 11 13:04:10 2008
New Revision: 666817

URL: http://svn.apache.org/viewvc?rev=666817&view=rev
Log:
GERONIMO-4114 - newly created APR HTTPS connector failed to start

Modified:
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?rev=666817&r1=666816&r2=666817&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java Wed Jun 11 13:04:10 2008
@@ -114,6 +114,10 @@
         Object value = connector.getAttribute("useSendfile");
         return value == null ? true : new Boolean(value.toString()).booleanValue();
     }
+    
+    public String getSslPassword() {
+        return (String) connector.getAttribute("SSLPassword");
+    }
 
     public void setPollTime(int pollTime) {
         connector.setAttribute("pollTime", pollTime);

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java?rev=666817&r1=666816&r2=666817&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java Wed Jun 11 13:04:10 2008
@@ -39,6 +39,7 @@
     public void setSslCertificateFile(String sslCertificateFile);
     public String getSslCertificateKeyFile();
     public void setSslCertificateKeyFile(String sslCertificateKeyFile);
+    public String getSslPassword();
     public void setSslPassword(String sslPassword);
     public String getSslVerifyClient();
     public void setSslVerifyClient(String sslVerifyClient);