From 6058e595d504118aa4c30cdded6c2c63e6f301bf Mon Sep 17 00:00:00 2001
From: Michael Gorovoy <michael@webtide.com>
Date: Tue, 17 May 2011 04:12:47 +0000
Subject: [PATCH] 345873 Update jetty-ssl.xml to new style

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3159 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt                                    |  1 +
 jetty-server/src/main/config/etc/jetty-ssl.xml | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 90501b20c6e..ee78aee1d64 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -2,6 +2,7 @@ jetty-7.4.2-SNAPSHOT
  + 345729 binding for managing server and system classes globally
  + 345615 Enable SSL Session caching
  + 345763 Source file is updated during the build
+ + 345873 Update jetty-ssl.xml to new style
  + 346014 Fixed full HttpGenerator
 
 jetty-7.4.1.v20110513
diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml
index 25225ba099e..4c0c9ff2aec 100644
--- a/jetty-server/src/main/config/etc/jetty-ssl.xml
+++ b/jetty-server/src/main/config/etc/jetty-ssl.xml
@@ -12,19 +12,23 @@
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- if NIO is not available, use org.eclipse.jetty.server.ssl.SslSocketConnector -->
+  
+  <New id="sslContextFactory" class="org.eclipse.jetty.http.ssl.SslContextFactory">
+    <Set name="KeyStore"><Property name="jetty.home" default="." />/etc/keystore</Set>
+    <Set name="KeyStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
+    <Set name="KeyManagerPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
+    <Set name="TrustStore"><Property name="jetty.home" default="." />/etc/keystore</Set>
+    <Set name="TrustStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
+  </New>
 
   <Call name="addConnector">
     <Arg>
       <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
-	<Set name="Port">8443</Set>
-	<Set name="maxIdleTime">30000</Set>
+        <Arg><Ref id="sslContextFactory" /></Arg>
+        <Set name="Port">8443</Set>
+        <Set name="maxIdleTime">30000</Set>
         <Set name="Acceptors">2</Set>
         <Set name="AcceptQueueSize">100</Set>
-	<Set name="Keystore"><Property name="jetty.home" default="." />/etc/keystore</Set>
-	<Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-	<Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
-        <Set name="truststore"><Property name="jetty.home" default="." />/etc/keystore</Set>
-        <Set name="trustPassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
       </New>
     </Arg>
   </Call>