Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.









git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@438429 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Frederick G. Oconer 2006-08-30 09:12:54 +00:00
parent 46c6ff97ac
commit ebf60bb3ca
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java
View File

@ -28,7 +28,9 @@ public class HttpsTransportServer extends HttpTransportServer {
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 @@ public class HttpsTransportServer extends HttpTransportServer {
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 @@ public class HttpsTransportServer extends HttpTransportServer {
// Properties
//--------------------------------------------------------------------------------
public String getCertificateAlgorithm() {
return certificateAlgorithm;
}
public void setCertificateAlgorithm( String certificateAlgorithm ) {
this.certificateAlgorithm = certificateAlgorithm;
}
public String getKeyStore() {
return keyStore;
}
@ -110,4 +110,28 @@ public class HttpsTransportServer extends HttpTransportServer {
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;
}
}