svn commit: r474434 - /incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java

[gn...@apache.org]

Author: gnodet
Date: Mon Nov 13 10:50:18 2006
New Revision: 474434

URL: http://svn.apache.org/viewvc?view=rev&rev=474434
Log:
SM-746: JettyContextManager does not set the truststore parameters for unmanaged ssl endpoints

Modified:
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java

Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java?view=diff&rev=474434&r1=474433&r2=474434
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java Mon Nov 13 10:50:18 2006
@@ -263,10 +263,18 @@
             sslConnector.setConfidentialPort(url.getPort());
             sslConnector.setKeystore(keyStore);
             sslConnector.setKeyAlias(ssl.getKeyAlias());
-            sslConnector.setTrustStore(ssl.getTrustStore());
             sslConnector.setNeedClientAuth(ssl.isNeedClientAuth());
             sslConnector.setWantClientAuth(ssl.isWantClientAuth());
             sslConnector.setKeystoreManager(getConfiguration().getKeystoreManager());
+            // important to set this values for selfsigned keys 
+            // otherwise the standard truststore of the jre is used
+            sslConnector.setTruststore(ssl.getTrustStore());
+            if (ssl.getTrustStorePassword() != null) {
+                // check is necessary because if a null password is set
+                // jetty would ask for a password on the comandline
+                sslConnector.setTrustPassword(ssl.getTrustStorePassword());
+            }
+            sslConnector.setTruststoreType(ssl.getTrustStoreType());
             connector = sslConnector;
         } else if (isSsl) {
             String keyStore = ssl.getKeyStore();