jetty-9 work in progress

3 files changed, 5 insertions, 30 deletions

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
index 4facdd3cdd..be1fe2a697 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
@@ -487,6 +487,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
                         }
                         else if (change instanceof ChangeTask)
                         {
+                            LOG.warn("DO WE NEED THIS????");
                             ((Runnable)change).run();
                         }
                         else if (change instanceof Runnable)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/nio/NIOConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/nio/NIOConnector.java
deleted file mode 100644
index 16d27566fa..0000000000
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/nio/NIOConnector.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// ========================================================================
-// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-
-package org.eclipse.jetty.server.nio; 
-
-/** 
- * NIOConnector.
- * A marker interface that indicates that NIOBuffers can be handled (efficiently) by this Connector.
- * 
- * 
- * 
- */
-public interface NIOConnector
-{
-    boolean getUseDirectBuffers();
-}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
index c9f735e544..5e55a5d1e0 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
@@ -247,26 +247,26 @@ public class SelectChannelConnector extends AbstractHttpConnector
         }
 
         @Override
-        protected void endPointClosed(SelectChannelEndPoint endpoint)
+        protected void endPointClosed(AsyncEndPoint endpoint)
         {
             SelectChannelConnector.this.endPointClosed(endpoint);
         }
 
         @Override
-        protected void endPointOpened(SelectChannelEndPoint endpoint)
+        protected void endPointOpened(AsyncEndPoint endpoint)
         {
             // TODO handle max connections and low resources
             connectionOpened(endpoint.getAsyncConnection());
         }
 
         @Override
-        protected void endPointUpgraded(SelectChannelEndPoint endpoint, AsyncConnection oldConnection)
+        protected void endPointUpgraded(AsyncEndPoint endpoint, AsyncConnection oldConnection)
         {            
             connectionUpgraded(oldConnection,endpoint.getAsyncConnection());
         }
 
         @Override
-        public AsyncConnection newConnection(SocketChannel channel, SelectChannelEndPoint endpoint, Object attachment)
+        public AsyncConnection newConnection(SocketChannel channel, AsyncEndPoint endpoint, Object attachment)
         {            
             return SelectChannelConnector.this.newConnection(channel,endpoint);
         }