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

[tterm]

Author: tterm
Date: Thu May 31 05:46:32 2007
New Revision: 543125

URL: http://svn.apache.org/viewvc?view=rev&rev=543125
Log:
SM-959 ssl truststore is not set for unmanaged

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=543125&r1=543124&r2=543125
==============================================================================
--- 
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
 Thu May 31 05:46:32 2007
@@ -330,6 +330,15 @@
         sslConnector.setKeystoreType(ssl.getKeyStoreType());
         sslConnector.setNeedClientAuth(ssl.isNeedClientAuth());
         sslConnector.setWantClientAuth(ssl.isWantClientAuth());
+        // 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;
         return connector;
     }