You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/09/06 18:27:30 UTC
svn commit: r573313 -
/incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
Author: gnodet
Date: Thu Sep 6 09:27:29 2007
New Revision: 573313
URL: http://svn.apache.org/viewvc?rev=573313&view=rev
Log:
SM-1029: problem with trust store
Modified:
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
Modified: incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java?rev=573313&r1=573312&r2=573313&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java (original)
+++ incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java Thu Sep 6 09:27:29 2007
@@ -23,8 +23,6 @@
public class ServiceMixSslSocketConnector extends SslSocketConnector {
- private String trustStore;
-
private String keyAlias;
private KeystoreManager keystoreManager;
@@ -57,27 +55,8 @@
this.keyAlias = keyAlias;
}
- /**
- * @return the trustStore
- */
- public String getTrustStore() {
- return trustStore;
- }
-
- /**
- * @param trustStore the trustStore to set
- */
- public void setTrustStore(String trustStore) {
- this.trustStore = trustStore;
- }
-
protected SSLServerSocketFactory createFactory() throws Exception {
- return keystoreManager.createSSLServerFactory(
- getProvider(),
- getProtocol(),
- getSslKeyManagerFactoryAlgorithm(),
- getKeystore(),
- getKeyAlias(),
- getTrustStore());
+ return keystoreManager.createSSLServerFactory(getProvider(), getProtocol(), getSslKeyManagerFactoryAlgorithm(),
+ getKeystore(), getKeyAlias(), getTruststore());
}
}