Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 9020 invoked from network); 29 Jan 2007 07:47:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Jan 2007 07:47:41 -0000 Received: (qmail 75803 invoked by uid 500); 29 Jan 2007 07:47:46 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 75760 invoked by uid 500); 29 Jan 2007 07:47:46 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 75751 invoked by uid 99); 29 Jan 2007 07:47:45 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Jan 2007 23:47:45 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Jan 2007 23:47:37 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 50D4C1A981A; Sun, 28 Jan 2007 23:47:17 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r500957 - in /incubator/cxf/trunk/rt/transports/http2: ./ src/main/java/org/apache/cxf/transport/http/ Date: Mon, 29 Jan 2007 07:47:17 -0000 To: cxf-commits@incubator.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070129074717.50D4C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Sun Jan 28 23:47:16 2007 New Revision: 500957 URL: http://svn.apache.org/viewvc?view=rev&rev=500957 Log: Changed to use AbstractConnector in JettyConnectorFactory to support more connector Modified: incubator/cxf/trunk/rt/transports/http2/pom.xml incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java Modified: incubator/cxf/trunk/rt/transports/http2/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/pom.xml?view=diff&rev=500957&r1=500956&r2=500957 ============================================================================== --- incubator/cxf/trunk/rt/transports/http2/pom.xml (original) +++ incubator/cxf/trunk/rt/transports/http2/pom.xml Sun Jan 28 23:47:16 2007 @@ -65,12 +65,12 @@ org.mortbay.jetty jetty - 6.1.0rc2 + 6.1.0 org.mortbay.jetty jetty-sslengine - 6.1.0rc2 + 6.1.0 commons-logging Modified: incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java?view=diff&rev=500957&r1=500956&r2=500957 ============================================================================== --- incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java (original) +++ incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java Sun Jan 28 23:47:16 2007 @@ -53,6 +53,8 @@ import org.apache.cxf.transport.https.JettySslConnectorFactory; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.wsdl11.WSDLEndpointFactory; +import org.mortbay.jetty.AbstractConnector; +//import org.mortbay.jetty.bio.SocketConnector; import org.mortbay.jetty.nio.SelectChannelConnector; import org.xmlsoap.schemas.wsdl.http.AddressType; @@ -174,8 +176,9 @@ protected static JettyConnectorFactory getConnectorFactory(SSLServerPolicy policy) { return policy == null ? new JettyConnectorFactory() { - public SelectChannelConnector createConnector(int port) { + public AbstractConnector createConnector(int port) { SelectChannelConnector result = new SelectChannelConnector(); + //SocketConnector result = new SocketConnector(); result.setPort(port); return result; } Modified: incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java?view=diff&rev=500957&r1=500956&r2=500957 ============================================================================== --- incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java (original) +++ incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java Sun Jan 28 23:47:16 2007 @@ -19,7 +19,8 @@ package org.apache.cxf.transport.http; -import org.mortbay.jetty.nio.SelectChannelConnector; +import org.mortbay.jetty.AbstractConnector; + /** * Encapsulates creation of Jetty listener. @@ -31,5 +32,5 @@ * * @param port the listen port */ - SelectChannelConnector createConnector(int port); + AbstractConnector createConnector(int port); } Modified: incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java?view=diff&rev=500957&r1=500956&r2=500957 ============================================================================== --- incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java (original) +++ incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java Sun Jan 28 23:47:16 2007 @@ -31,12 +31,13 @@ import org.apache.cxf.transport.HttpUriMapper; import org.apache.cxf.transport.http.listener.HTTPListenerConfigBean; import org.apache.cxf.transports.http.configuration.HTTPListenerPolicy; +import org.mortbay.jetty.AbstractConnector; import org.mortbay.jetty.Handler; import org.mortbay.jetty.Server; import org.mortbay.jetty.handler.AbstractHandler; import org.mortbay.jetty.handler.ContextHandler; import org.mortbay.jetty.handler.ContextHandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; + @@ -50,7 +51,7 @@ private int servantCount; private Server server; - private SelectChannelConnector connector; + private AbstractConnector connector; private JettyConnectorFactory connectorFactory; private ContextHandlerCollection contexts; private final int port;