cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r538172 - in /incubator/cxf/trunk/rt/transports/http-jetty: pom.xml src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java
Date Tue, 15 May 2007 13:15:58 GMT
Author: ningjiang
Date: Tue May 15 06:15:58 2007
New Revision: 538172

URL: http://svn.apache.org/viewvc?view=rev&rev=538172
Log:
Reverted the Jetty upgrade, because there are some security tests can't pass with this upgrade

Modified:
    incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
    incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
    incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java

Modified: incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/pom.xml?view=diff&rev=538172&r1=538171&r2=538172
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/pom.xml Tue May 15 06:15:58 2007
@@ -76,12 +76,12 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.3</version>
+            <version>6.1.2rc0</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-sslengine</artifactId>
-            <version>6.1.3</version>
+            <version>6.1.2rc0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java?view=diff&rev=538172&r1=538171&r2=538172
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
(original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
Tue May 15 06:15:58 2007
@@ -30,8 +30,7 @@
 import org.apache.cxf.transport.http_jetty.JettyConnectorFactory;
 import org.apache.cxf.transport.https.SSLUtils;
 import org.mortbay.jetty.AbstractConnector;
-import org.mortbay.jetty.security.SslSelectChannelConnector;
-//import org.mortbay.jetty.security.SslSocketConnector;
+import org.mortbay.jetty.security.SslSocketConnector;
 
 
 public final class JettySslConnectorFactory implements JettyConnectorFactory {
@@ -62,7 +61,7 @@
      * @param p the listen port
      */
     public AbstractConnector createConnector(int port) {
-        SslSelectChannelConnector secureConnector = new SslSelectChannelConnector();
+        SslSocketConnector secureConnector = new SslSocketConnector();
         secureConnector.setPort(port);
         decorate(secureConnector);
         return secureConnector;
@@ -73,7 +72,7 @@
      * 
      * @param listener the secure listener
      */
-    public void decorate(SslSelectChannelConnector secureListener) {
+    public void decorate(SslSocketConnector secureListener) {
         String keyStoreLocation =
             SSLUtils.getKeystore(sslPolicy.getKeystore(), LOG);
         secureListener.setKeystore(keyStoreLocation);
@@ -121,7 +120,7 @@
                                              secureSocketProtocol,
                                              LOG),
                 null);
-            secureListener.setCipherSuites(
+            secureListener.setExcludeCipherSuites(
                 SSLUtils.getCiphersuites(sslPolicy.getCiphersuites(),
                                          SSLUtils.getServerSupportedCipherSuites(ctx),
                                          sslPolicy.getCiphersuiteFilters(),

Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java?view=diff&rev=538172&r1=538171&r2=538172
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java
(original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java
Tue May 15 06:15:58 2007
@@ -37,8 +37,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.mortbay.jetty.security.SslSelectChannelConnector;
-//import org.mortbay.jetty.security.SslSocketConnector;
+import org.mortbay.jetty.security.SslSocketConnector;
 
 
 public class JettySslConnectorFactoryTest extends Assert {
@@ -51,11 +50,11 @@
     private static final String[] NON_EXPORT_CIPHERS =
     {"SSL_RSA_WITH_RC4_128_MD5", "SSL_RSA_WITH_3DES_EDE_CBC_SHA"};
 
-    private SslSelectChannelConnector sslConnector;
+    private SslSocketConnector sslConnector;
     
     @Before
     public void setUp() throws Exception {
-        sslConnector = new SslSelectChannelConnector();
+        sslConnector = new SslSocketConnector();
     }
 
     @After
@@ -238,7 +237,7 @@
                    sslServerPolicy.getKeyPassword().equals("defaultkeypass"));  
         
         assertNull("Ciphersuites is being being read from somewhere unknown", 
-                   sslConnector.getCipherSuites());        
+                   sslConnector.getExcludeCipherSuites());        
  
         assertTrue("Truststore type not being read", 
                    handler.checkLogContainsString("Unsupported SSLServerPolicy property :
"
@@ -288,7 +287,7 @@
         factory.decorate(sslConnector);
         
         assertNotNull("Configured ciphersuites not set on listener", 
-                      sslConnector.getCipherSuites()); 
+                      sslConnector.getExcludeCipherSuites()); 
         assertFalse("Ciphersuites config not picked up", handler
                     .checkLogContainsString("The cipher suites have not been configured,
" 
                                             + "default values will be used."));        



Mime
View raw message