svn commit: r500957 - in /incubator/cxf/trunk/rt/transports/http2: ./ src/main/java/org/apache/cxf/transport/http/

[ningjiang]

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 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.0rc2</version>
+            <version>6.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-sslengine</artifactId>
-            <version>6.1.0rc2</version>
+            <version>6.1.0</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

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;