svn commit: r438429 - /incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java

[foconer]

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;
        }
 
 }