mirror of https://github.com/apache/activemq.git
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:
parent
46c6ff97ac
commit
ebf60bb3ca
|
@ -28,7 +28,9 @@ public class HttpsTransportServer extends HttpTransportServer {
|
||||||
private String keyStorePassword = System.getProperty( "javax.net.ssl.keyStorePassword" );
|
private String keyStorePassword = System.getProperty( "javax.net.ssl.keyStorePassword" );
|
||||||
private String keyStore = System.getProperty( "javax.net.ssl.keyStore" );
|
private String keyStore = System.getProperty( "javax.net.ssl.keyStore" );
|
||||||
private String keyStoreType = null;
|
private String keyStoreType = null;
|
||||||
private String certificateAlgorithm = null;
|
private String secureRandomCertficateAlgorithm = null;
|
||||||
|
private String trustCertificateAlgorithm = null;
|
||||||
|
private String keyCertificateAlgorithm = null;
|
||||||
private String protocol = null;
|
private String protocol = null;
|
||||||
|
|
||||||
public HttpsTransportServer( URI uri ) {
|
public HttpsTransportServer( URI uri ) {
|
||||||
|
@ -47,8 +49,14 @@ public class HttpsTransportServer extends HttpTransportServer {
|
||||||
if ( keyStoreType != null ) {
|
if ( keyStoreType != null ) {
|
||||||
sslConnector.setKeystoreType( keyStoreType );
|
sslConnector.setKeystoreType( keyStoreType );
|
||||||
}
|
}
|
||||||
if ( certificateAlgorithm != null ) {
|
if ( secureRandomCertficateAlgorithm != null ) {
|
||||||
sslConnector.setAlgorithm( certificateAlgorithm );
|
sslConnector.setSecureRandomAlgorithm( secureRandomCertficateAlgorithm );
|
||||||
|
}
|
||||||
|
if ( keyCertificateAlgorithm != null ) {
|
||||||
|
sslConnector.setSslKeyManagerFactoryAlgorithm( keyCertificateAlgorithm );
|
||||||
|
}
|
||||||
|
if ( trustCertificateAlgorithm != null ) {
|
||||||
|
sslConnector.setSslTrustManagerFactoryAlgorithm( trustCertificateAlgorithm );
|
||||||
}
|
}
|
||||||
if ( protocol != null ) {
|
if ( protocol != null ) {
|
||||||
sslConnector.setProtocol( protocol );
|
sslConnector.setProtocol( protocol );
|
||||||
|
@ -62,14 +70,6 @@ public class HttpsTransportServer extends HttpTransportServer {
|
||||||
// Properties
|
// Properties
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
|
|
||||||
public String getCertificateAlgorithm() {
|
|
||||||
return certificateAlgorithm;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCertificateAlgorithm( String certificateAlgorithm ) {
|
|
||||||
this.certificateAlgorithm = certificateAlgorithm;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getKeyStore() {
|
public String getKeyStore() {
|
||||||
return keyStore;
|
return keyStore;
|
||||||
}
|
}
|
||||||
|
@ -110,4 +110,28 @@ public class HttpsTransportServer extends HttpTransportServer {
|
||||||
this.protocol = 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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue