Author: ningjiang
Date: Mon May 14 02:00:42 2007
New Revision: 537755
URL: http://svn.apache.org/viewvc?view=rev&rev=537755
Log:
upgrade the jetty version from 6.1.2rc0 to 6.1.3
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=537755&r1=537754&r2=537755
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/pom.xml Mon May 14 02:00:42
2007
@@ -76,12 +76,12 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.2rc0</version>
+ <version>6.1.3</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-sslengine</artifactId>
- <version>6.1.2rc0</version>
+ <version>6.1.3</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=537755&r1=537754&r2=537755
==============================================================================
---
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
Mon May 14 02:00:42 2007
@@ -30,7 +30,8 @@
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.SslSocketConnector;
+import org.mortbay.jetty.security.SslSelectChannelConnector;
+//import org.mortbay.jetty.security.SslSocketConnector;
public final class JettySslConnectorFactory implements JettyConnectorFactory {
@@ -61,7 +62,7 @@
* @param p the listen port
*/
public AbstractConnector createConnector(int port) {
- SslSocketConnector secureConnector = new SslSocketConnector();
+ SslSelectChannelConnector secureConnector = new
SslSelectChannelConnector();
secureConnector.setPort(port);
decorate(secureConnector);
return secureConnector;
@@ -72,7 +73,7 @@
*
* @param listener the secure listener
*/
- public void decorate(SslSocketConnector secureListener) {
+ public void decorate(SslSelectChannelConnector secureListener) {
String keyStoreLocation =
SSLUtils.getKeystore(sslPolicy.getKeystore(), LOG);
secureListener.setKeystore(keyStoreLocation);
@@ -120,7 +121,7 @@
secureSocketProtocol,
LOG),
null);
- secureListener.setExcludeCipherSuites(
+ secureListener.setCipherSuites(
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=537755&r1=537754&r2=537755
==============================================================================
---
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
Mon May 14 02:00:42 2007
@@ -37,7 +37,8 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mortbay.jetty.security.SslSocketConnector;
+import org.mortbay.jetty.security.SslSelectChannelConnector;
+//import org.mortbay.jetty.security.SslSocketConnector;
public class JettySslConnectorFactoryTest extends Assert {
@@ -50,11 +51,11 @@
private static final String[] NON_EXPORT_CIPHERS =
{"SSL_RSA_WITH_RC4_128_MD5", "SSL_RSA_WITH_3DES_EDE_CBC_SHA"};
- private SslSocketConnector sslConnector;
+ private SslSelectChannelConnector sslConnector;
@Before
public void setUp() throws Exception {
- sslConnector = new SslSocketConnector();
+ sslConnector = new SslSelectChannelConnector();
}
@After
@@ -237,7 +238,7 @@
sslServerPolicy.getKeyPassword().equals("defaultkeypass"));
assertNull("Ciphersuites is being being read from somewhere unknown",
- sslConnector.getExcludeCipherSuites());
+ sslConnector.getCipherSuites());
assertTrue("Truststore type not being read",
handler.checkLogContainsString("Unsupported SSLServerPolicy
property : "
@@ -287,7 +288,7 @@
factory.decorate(sslConnector);
assertNotNull("Configured ciphersuites not set on listener",
- sslConnector.getExcludeCipherSuites());
+ sslConnector.getCipherSuites());
assertFalse("Ciphersuites config not picked up", handler
.checkLogContainsString("The cipher suites have not been
configured, "
+ "default values will be
used."));
