[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch je

[genie@xxxxxxxxxxx (Greg Wilkins)]

The branch, jetty-9 has been updated
       via  a7154fcb059f5571a61ccb411d948bcc0304c115 (commit)
       via  2b9ff87e0268f45013365a941221a1e944b8acf1 (commit)
       via  c1011c54a40b08a59f099c74d80162bde256896a (commit)
      from  44d2735a215893519263ace40d2950873d4e11f8 (commit)


- Log -----------------------------------------------------------------
commit a7154fcb059f5571a61ccb411d948bcc0304c115
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date:   Wed May 9 13:30:27 2012 +0200

    jetty-9 work in progress

commit 2b9ff87e0268f45013365a941221a1e944b8acf1
Merge: c1011c5 44d2735
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date:   Wed May 9 11:19:52 2012 +0200

    Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
    
    Conflicts:
    	jetty-io/src/main/java/org/eclipse/jetty/io/AsyncConnection.java

commit c1011c54a40b08a59f099c74d80162bde256896a
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date:   Wed May 9 11:18:20 2012 +0200

    jetty-9 work in progress

-----------------------------------------------------------------------

Summary of changes:
 .../java/org/eclipse/jetty/io/AsyncConnection.java |    9 +-
 .../java/org/eclipse/jetty/io/SelectorManager.java |    1 +
 .../eclipse/jetty/server/AbstractConnector.java    |  631 +-------------------
 .../java/org/eclipse/jetty/server/Connector.java   |  326 ++++------
 .../java/org/eclipse/jetty/server/HttpChannel.java |    5 +-
 .../org/eclipse/jetty/server/HttpConnection.java   |    8 +-
 .../java/org/eclipse/jetty/server/Request.java     |    2 +-
 .../main/java/org/eclipse/jetty/server/Server.java |   47 +-
 .../jetty/server/handler/ContextHandler.java       |    2 +-
 .../jetty/server/nio/AbstractNIOConnector.java     |   47 --
 .../org/eclipse/jetty/server/nio/NIOConnector.java |   26 -
 .../jetty/server/nio/SelectChannelConnector.java   |   45 +--
 .../spdy/http/ServerHTTPSPDYAsyncConnection.java   |    2 +-
 13 files changed, 199 insertions(+), 952 deletions(-)
 delete mode 100644 jetty-server/src/main/java/org/eclipse/jetty/server/nio/AbstractNIOConnector.java
 delete mode 100644 jetty-server/src/main/java/org/eclipse/jetty/server/nio/NIOConnector.java


hooks/post-receive
-- 
Jetty: primary project repository