Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 99396 invoked from network); 30 Aug 2006 09:13:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Aug 2006 09:13:17 -0000 Received: (qmail 68981 invoked by uid 500); 30 Aug 2006 09:13:16 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 68961 invoked by uid 500); 30 Aug 2006 09:13:16 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 68952 invoked by uid 99); 30 Aug 2006 09:13:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2006 02:13:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2006 02:13:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 900421A981A; Wed, 30 Aug 2006 02:12:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r438429 - /incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java Date: Wed, 30 Aug 2006 09:12:55 -0000 To: activemq-commits@geronimo.apache.org From: foconer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060830091255.900421A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: foconer Date: Wed Aug 30 02:12:54 2006 New Revision: 438429 URL: http://svn.apache.org/viewvc?rev=438429&view=rev Log: https://issues.apache.org/activemq/browse/AMQ-902 Bug: Compilation error on class HttpsTransportServer because setAlgorithm(String) was replaced in jetty-6.0.0rc2. Fix: Modified setting of algorithm with new methods. Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java?rev=438429&r1=438428&r2=438429&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java (original) +++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java Wed Aug 30 02:12:54 2006 @@ -28,7 +28,9 @@ private String keyStorePassword = System.getProperty( "javax.net.ssl.keyStorePassword" ); private String keyStore = System.getProperty( "javax.net.ssl.keyStore" ); private String keyStoreType = null; - private String certificateAlgorithm = null; + private String secureRandomCertficateAlgorithm = null; + private String trustCertificateAlgorithm = null; + private String keyCertificateAlgorithm = null; private String protocol = null; public HttpsTransportServer( URI uri ) { @@ -47,8 +49,14 @@ if ( keyStoreType != null ) { sslConnector.setKeystoreType( keyStoreType ); } - if ( certificateAlgorithm != null ) { - sslConnector.setAlgorithm( certificateAlgorithm ); + if ( secureRandomCertficateAlgorithm != null ) { + sslConnector.setSecureRandomAlgorithm( secureRandomCertficateAlgorithm ); + } + if ( keyCertificateAlgorithm != null ) { + sslConnector.setSslKeyManagerFactoryAlgorithm( keyCertificateAlgorithm ); + } + if ( trustCertificateAlgorithm != null ) { + sslConnector.setSslTrustManagerFactoryAlgorithm( trustCertificateAlgorithm ); } if ( protocol != null ) { sslConnector.setProtocol( protocol ); @@ -62,14 +70,6 @@ // Properties //-------------------------------------------------------------------------------- - public String getCertificateAlgorithm() { - return certificateAlgorithm; - } - - public void setCertificateAlgorithm( String certificateAlgorithm ) { - this.certificateAlgorithm = certificateAlgorithm; - } - public String getKeyStore() { return keyStore; } @@ -108,6 +108,30 @@ public void setProtocol( String protocol ) { this.protocol = protocol; + } + + public String getSecureRandomCertficateAlgorithm() { + return secureRandomCertficateAlgorithm; + } + + public void setSecureRandomCertficateAlgorithm(String secureRandomCertficateAlgorithm) { + this.secureRandomCertficateAlgorithm = secureRandomCertficateAlgorithm; + } + + public String getKeyCertificateAlgorithm() { + return keyCertificateAlgorithm; + } + + public void setKeyCertificateAlgorithm(String keyCertificateAlgorithm) { + this.keyCertificateAlgorithm = keyCertificateAlgorithm; + } + + public String getTrustCertificateAlgorithm() { + return trustCertificateAlgorithm; + } + + public void setTrustCertificateAlgorithm(String trustCertificateAlgorithm) { + this.trustCertificateAlgorithm = trustCertificateAlgorithm; } }