Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 27259 invoked from network); 11 Jun 2008 20:02:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jun 2008 20:02:28 -0000 Received: (qmail 95571 invoked by uid 500); 11 Jun 2008 20:02:31 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 95520 invoked by uid 500); 11 Jun 2008 20:02:31 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 95511 invoked by uid 99); 11 Jun 2008 20:02:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2008 13:02:30 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2008 20:01:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D971023889BA; Wed, 11 Jun 2008 13:01:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r666816 - in /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector: Http11APRConnectorGBean.java Http11APRProtocol.java Date: Wed, 11 Jun 2008 20:01:37 -0000 To: scm@geronimo.apache.org From: linsun@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080611200137.D971023889BA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: linsun Date: Wed Jun 11 13:01:37 2008 New Revision: 666816 URL: http://svn.apache.org/viewvc?rev=666816&view=rev Log: GERONIMO-4114 - newly created APR HTTPS connector failed to start - hopefully i got the svn property right this time! Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?rev=666816&r1=666815&r2=666816&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java Wed Jun 11 13:01:37 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/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java?rev=666816&r1=666815&r2=666816&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java Wed Jun 11 13:01:37 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);