svn commit: r558809 - /incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java

[tterm]

Author: tterm
Date: Mon Jul 23 10:38:42 2007
New Revision: 558809

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

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

Modified: 
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.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/JettyContextManager.java?view=diff&rev=558809&r1=558808&r2=558809
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
 Mon Jul 23 10:38:42 2007
@@ -316,6 +316,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;
         } else {
             String connectorClassName = 
configuration.getJettyConnectorClassName();