svn commit: r1079498 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/

[dkulp]

Author: dkulp
Date: Tue Mar  8 19:29:30 2011
New Revision: 1079498

URL: http://svn.apache.org/viewvc?rev=1079498&view=rev
Log:
Merged revisions 1079495 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1079495 | dkulp | 2011-03-08 14:17:21 -0500 (Tue, 08 Mar 2011) | 1 line
  
  Update to not call the deprecated methods
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
    
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java?rev=1079498&r1=1079497&r2=1079498&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
 Tue Mar  8 19:29:30 2011
@@ -87,13 +87,13 @@ public class CXFJettySslSocketConnector 
      * configures an HTTP Destination.
      */
     protected void setClientAuthentication(ClientAuthentication clientAuth) {
-        setWantClientAuth(true);
+        getSslContextFactory().setWantClientAuth(true);
         if (clientAuth != null) {
             if (clientAuth.isSetWant()) {
-                setWantClientAuth(clientAuth.isWant());
+                getSslContextFactory().setWantClientAuth(clientAuth.isWant());
             }
             if (clientAuth.isSetRequired()) {
-                setNeedClientAuth(clientAuth.isRequired());
+                
getSslContextFactory().setNeedClientAuth(clientAuth.isRequired());
             }
         }
     }
@@ -105,13 +105,13 @@ public class CXFJettySslSocketConnector 
     }
     
     protected SSLContext createSSLContext() throws Exception  {
-        String proto = getProtocol() == null
+        String proto = getSslContextFactory().getProtocol() == null
             ? "TLS"
-                : getProtocol();
+                : getSslContextFactory().getProtocol();
  
-        SSLContext context = getProvider() == null
+        SSLContext context = getSslContextFactory().getProvider() == null
             ? SSLContext.getInstance(proto)
-                : SSLContext.getInstance(proto, getProvider());
+                : SSLContext.getInstance(proto, 
getSslContextFactory().getProvider());
             
         context.init(keyManagers, trustManagers, secureRandom);
 
@@ -122,7 +122,7 @@ public class CXFJettySslSocketConnector 
                     cipherSuitesFilter,
                     LOG, true);
         
-        setExcludeCipherSuites(cs);
+        getSslContextFactory().setExcludeCipherSuites(cs);
         
         return context;
     }

Modified: 
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java?rev=1079498&r1=1079497&r2=1079498&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
 Tue Mar  8 19:29:30 2011
@@ -75,8 +75,8 @@ public final class JettySslConnectorFact
         con.setSecureRandom(tlsServerParameters.getSecureRandom());
         con.setClientAuthentication(
                 tlsServerParameters.getClientAuthentication());
-        con.setProtocol(tlsServerParameters.getSecureSocketProtocol());
-        con.setProvider(tlsServerParameters.getJsseProvider());
+        
con.getSslContextFactory().setProtocol(tlsServerParameters.getSecureSocketProtocol());
+        
con.getSslContextFactory().setProvider(tlsServerParameters.getJsseProvider());
         con.setCipherSuites(tlsServerParameters.getCipherSuites());
         con.setCipherSuitesFilter(tlsServerParameters.getCipherSuitesFilter());
     }