Author: ningjiang
Date: Thu Aug 26 07:09:45 2010
New Revision: 989477
URL: http://svn.apache.org/viewvc?rev=989477&view=rev
Log:
CAMEL-3083 Switch the SslSocketConnector to SslSelectChannelConnector in
camel-jetty
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=989477&r1=989476&r2=989477&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Thu Aug 26 07:09:45 2010
@@ -21,6 +21,7 @@ import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.management.MBeanServer;
import org.apache.camel.CamelContext;
@@ -50,7 +51,7 @@ import org.eclipse.jetty.server.handler.
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -77,7 +78,7 @@ public class JettyHttpComponent extends
protected String sslKeyPassword;
protected String sslPassword;
protected String sslKeystore;
- protected Map<Integer, SslSocketConnector> sslSocketConnectors;
+ protected Map<Integer, SslSelectChannelConnector> sslSocketConnectors;
protected Map<Integer, SelectChannelConnector> socketConnectors;
protected Map<String, Object> sslSocketConnectorProperties;
protected Map<String, Object> socketConnectorProperties;
@@ -359,8 +360,8 @@ public class JettyHttpComponent extends
return sslKeystore;
}
- protected SslSocketConnector getSslSocketConnector(int port) throws
Exception {
- SslSocketConnector answer = null;
+ protected SslSelectChannelConnector getSslSocketConnector(int port) throws
Exception {
+ SslSelectChannelConnector answer = null;
if (sslSocketConnectors != null) {
answer = sslSocketConnectors.get(port);
}
@@ -370,8 +371,8 @@ public class JettyHttpComponent extends
return answer;
}
- protected SslSocketConnector createSslSocketConnector() throws Exception {
- SslSocketConnector answer = new SslSocketConnector();
+ protected SslSelectChannelConnector createSslSocketConnector() throws
Exception {
+ SslSelectChannelConnector answer = new SslSelectChannelConnector();
// with default null values, jetty ssl system properties
// and console will be read by jetty implementation
@@ -410,11 +411,11 @@ public class JettyHttpComponent extends
return answer;
}
- public Map<Integer, SslSocketConnector> getSslSocketConnectors() {
+ public Map<Integer, SslSelectChannelConnector> getSslSocketConnectors() {
return sslSocketConnectors;
}
- public void setSslSocketConnectors(Map <Integer, SslSocketConnector>
connectors) {
+ public void setSslSocketConnectors(Map <Integer,
SslSelectChannelConnector> connectors) {
sslSocketConnectors = connectors;
}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java?rev=989477&r1=989476&r2=989477&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
Thu Aug 26 07:09:45 2010
@@ -24,13 +24,15 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSocketConnector;
public class ExplicitHttpsRouteTest extends HttpsRouteTest {
// START SNIPPET: e2
- private SslSocketConnector createSslSocketConnector() throws
URISyntaxException {
- SslSocketConnector sslSocketConnector = new SslSocketConnector();
+ private SslSelectChannelConnector createSslSocketConnector() throws
URISyntaxException {
+ // From Camel 2.5.0 Camel-Jetty is using SslSelectChannelConnector
instead of SslSocketConnector
+ SslSelectChannelConnector sslSocketConnector = new
SslSelectChannelConnector();
sslSocketConnector.setKeyPassword(pwd);
sslSocketConnector.setPassword(pwd);
URL keyStoreUrl =
this.getClass().getClassLoader().getResource("jsse/localhost.ks");
@@ -45,8 +47,8 @@ public class ExplicitHttpsRouteTest exte
return new RouteBuilder() {
public void configure() throws URISyntaxException {
// START SNIPPET: e1
- // create SSL socket connectors for port 9080 and 9090
- Map<Integer, SslSocketConnector> connectors = new
HashMap<Integer, SslSocketConnector>();
+ // create SSL select channel connectors for port 9080 and 9090
+ Map<Integer, SslSelectChannelConnector> connectors = new
HashMap<Integer, SslSelectChannelConnector>();
connectors.put(9080, createSslSocketConnector());
connectors.put(9090, createSslSocketConnector());
