cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1061997 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java rt/ws/security/
Date Fri, 21 Jan 2011 20:05:15 GMT
Author: dkulp
Date: Fri Jan 21 20:05:14 2011
New Revision: 1061997

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

........
  r1060559 | dkulp | 2011-01-18 15:26:18 -0500 (Tue, 18 Jan 2011) | 1 line
  
  UPdate javadoc
........

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/ws/security/   (props changed)

Propchange: cxf/branches/2.3.x-fixes/
            ('svn:mergeinfo' removed)

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=1061997&r1=1061996&r2=1061997&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
Fri Jan 21 20:05:14 2011
@@ -34,10 +34,9 @@ import org.apache.cxf.transport.https.SS
 import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 
 /**
- * This class extends the Jetty SslSocketConnector, which allows
+ * This class extends the Jetty SslSelectChannelConnector, which allows
  * us to configure it more in tune with the JSSE, using KeyManagers
- * and TrustManagers. Also, Jetty version 6.1.3 has a bug where
- * the Trust store needs a password.
+ * and TrustManagers. 
  */
 public class CXFJettySslSocketConnector extends SslSelectChannelConnector {
     private static final Logger LOG = LogUtils.getL7dLogger(CXFJettySslSocketConnector.class);
   

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/
            ('svn:mergeinfo' removed)



Mime
View raw message